Skip to content

Commit a66c4e3

Browse files
authored
[#475] Add ClientboundSetChunkCacheCenterPacket to respawn related packet list (#477)
* fix: add SetChunkCacheCenterPacket to respawn packet list * ci: fix build error * chore: change asnyc obfuscation future warning to debug
1 parent 8ae7219 commit a66c4e3

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

orebfuscator-nms/orebfuscator-nms-v26_1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.spigotmc</groupId>
2525
<artifactId>spigot</artifactId>
26-
<version>26.1-R0.1-SNAPSHOT</version>
26+
<version>26.1.2-R0.1-SNAPSHOT</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>

orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationAsyncListener.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package net.imprex.orebfuscator.obfuscation;
22

3+
import java.util.List;
4+
import java.util.concurrent.CompletableFuture;
5+
import java.util.stream.Stream;
6+
import org.jspecify.annotations.NullMarked;
37
import com.comphenix.protocol.AsynchronousManager;
48
import com.comphenix.protocol.PacketType;
59
import com.comphenix.protocol.ProtocolLibrary;
@@ -11,16 +15,11 @@
1115
import dev.imprex.orebfuscator.logging.OfcLogger;
1216
import dev.imprex.orebfuscator.obfuscation.ObfuscationPipeline;
1317
import dev.imprex.orebfuscator.statistics.InjectorStatistics;
14-
import java.util.List;
15-
import java.util.concurrent.CompletableFuture;
16-
import java.util.concurrent.atomic.AtomicInteger;
17-
import java.util.stream.Stream;
1818
import net.imprex.orebfuscator.Orebfuscator;
1919
import net.imprex.orebfuscator.iterop.BukkitChunkPacketAccessor;
2020
import net.imprex.orebfuscator.iterop.BukkitPlayerAccessor;
2121
import net.imprex.orebfuscator.iterop.BukkitPlayerAccessorManager;
2222
import net.imprex.orebfuscator.iterop.BukkitWorldAccessor;
23-
import org.jspecify.annotations.NullMarked;
2423

2524
@NullMarked
2625
public class ObfuscationAsyncListener extends PacketAdapter {
@@ -102,7 +101,7 @@ public void onPacketSending(PacketEvent event) {
102101
if (packet.isEmpty()) {
103102
future = CompletableFuture.completedFuture(null);
104103
} else {
105-
OfcLogger.throttle(LogLevel.WARN, "Processing chunk packet async without an obfuscation future, that shouldn't happen!");
104+
OfcLogger.throttle(LogLevel.DEBUG, "Processing chunk packet async without an obfuscation future");
106105
future = pipeline.request(world, player, packet, null).toCompletableFuture();
107106
}
108107
}

orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSyncListener.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
package net.imprex.orebfuscator.obfuscation;
22

3+
import java.util.List;
4+
import java.util.stream.Stream;
5+
import org.jspecify.annotations.NullMarked;
36
import com.comphenix.protocol.PacketType;
47
import com.comphenix.protocol.ProtocolLibrary;
58
import com.comphenix.protocol.ProtocolManager;
69
import com.comphenix.protocol.events.PacketAdapter;
710
import com.comphenix.protocol.events.PacketEvent;
811
import dev.imprex.orebfuscator.PermissionRequirements;
9-
import dev.imprex.orebfuscator.logging.OfcLogger;
1012
import dev.imprex.orebfuscator.obfuscation.ObfuscationPipeline;
1113
import dev.imprex.orebfuscator.statistics.InjectorStatistics;
12-
import java.util.Arrays;
13-
import java.util.HashSet;
14-
import java.util.List;
15-
import java.util.Objects;
16-
import java.util.stream.Stream;
1714
import net.imprex.orebfuscator.Orebfuscator;
1815
import net.imprex.orebfuscator.iterop.BukkitChunkPacketAccessor;
1916
import net.imprex.orebfuscator.iterop.BukkitPlayerAccessor;
2017
import net.imprex.orebfuscator.iterop.BukkitPlayerAccessorManager;
2118
import net.imprex.orebfuscator.iterop.BukkitWorldAccessor;
22-
import org.jspecify.annotations.NullMarked;
2319

2420
@NullMarked
2521
public class ObfuscationSyncListener extends PacketAdapter {
2622

23+
@SuppressWarnings("deprecation")
2724
public static final List<PacketType> PACKET_TYPES_RESPAWN = Stream.of(
2825
// 1.16.5
2926
PacketType.Play.Server.RESPAWN,
3027
PacketType.Play.Server.VIEW_DISTANCE,
28+
PacketType.Play.Server.VIEW_CENTRE,
3129
PacketType.Play.Server.POSITION,
3230
PacketType.Play.Server.SPAWN_POSITION,
3331
PacketType.Play.Server.SERVER_DIFFICULTY,

0 commit comments

Comments
 (0)