Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2025-01-24 09:11:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix multi block change cloning

Browse Source 
Fixes #990
This commit is contained in:
Dan Mulloy 2020-10-19 11:04:11 -04:00
parent 553e4b6813
commit f381f0a2f7
No known key found for this signature in database
GPG Key ID: 2B62F7DACFF133E8
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java
View File

@ -82,6 +82,7 @@ public class BukkitCloner implements Cloner {
fromWrapper(MinecraftReflection::getNBTBaseClass, NbtFactory::fromNMS); fromWrapper(MinecraftReflection::getNBTBaseClass, NbtFactory::fromNMS);
fromWrapper(MinecraftReflection::getIChatBaseComponentClass, WrappedChatComponent::fromHandle); fromWrapper(MinecraftReflection::getIChatBaseComponentClass, WrappedChatComponent::fromHandle);
fromWrapper(WrappedVillagerData::getNmsClass, WrappedVillagerData::fromHandle); fromWrapper(WrappedVillagerData::getNmsClass, WrappedVillagerData::fromHandle);
fromConverter(MinecraftReflection::getSectionPositionClass, BukkitConverters.getSectionPositionConverter());
try { try {
fromManual(ComponentConverter::getBaseComponentArrayClass, source -> fromManual(ComponentConverter::getBaseComponentArrayClass, source ->

4
src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java
View File

@ -1872,6 +1872,10 @@ public class MinecraftReflection {
return getCraftBukkitClass("CraftSound"); return getCraftBukkitClass("CraftSound");
} }
public static Class<?> getSectionPositionClass() {
return getMinecraftClass("SectionPosition");
}
// ---- ItemStack conversions // ---- ItemStack conversions
private static Object itemStackAir = null; private static Object itemStackAir = null;
private static Method asNMSCopy = null; private static Method asNMSCopy = null;

3
src/test/java/com/comphenix/protocol/events/PacketContainerTest.java
View File

@ -560,6 +560,9 @@ public class PacketContainerTest {
packet.getSectionPositions().writeSafely(0, new BlockPosition(42, 43, 44)); packet.getSectionPositions().writeSafely(0, new BlockPosition(42, 43, 44));
assertEquals(new BlockPosition(42, 43, 44), packet.getSectionPositions().readSafely(0)); assertEquals(new BlockPosition(42, 43, 44), packet.getSectionPositions().readSafely(0));
PacketContainer clone = packet.deepClone();
assertNotSame(clone, packet);
} }
/** /**