Skip to content

Commit f381f0a

Browse files
committed
Fix multi block change cloning
Fixes #990
1 parent 553e4b6 commit f381f0a

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ private static void fromManual(Supplier<Class<?>> getClass, Function<Object, Obj
8282
fromWrapper(MinecraftReflection::getNBTBaseClass, NbtFactory::fromNMS);
8383
fromWrapper(MinecraftReflection::getIChatBaseComponentClass, WrappedChatComponent::fromHandle);
8484
fromWrapper(WrappedVillagerData::getNmsClass, WrappedVillagerData::fromHandle);
85+
fromConverter(MinecraftReflection::getSectionPositionClass, BukkitConverters.getSectionPositionConverter());
8586

8687
try {
8788
fromManual(ComponentConverter::getBaseComponentArrayClass, source ->

src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,6 +1872,10 @@ public static Class<?> getCraftSoundClass() {
18721872
return getCraftBukkitClass("CraftSound");
18731873
}
18741874

1875+
public static Class<?> getSectionPositionClass() {
1876+
return getMinecraftClass("SectionPosition");
1877+
}
1878+
18751879
// ---- ItemStack conversions
18761880
private static Object itemStackAir = null;
18771881
private static Method asNMSCopy = null;

src/test/java/com/comphenix/protocol/events/PacketContainerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,9 @@ public void testMultiBlockChange() {
560560

561561
packet.getSectionPositions().writeSafely(0, new BlockPosition(42, 43, 44));
562562
assertEquals(new BlockPosition(42, 43, 44), packet.getSectionPositions().readSafely(0));
563+
564+
PacketContainer clone = packet.deepClone();
565+
assertNotSame(clone, packet);
563566
}
564567

565568
/**

0 commit comments

Comments
 (0)