From 083c8e1481629ef44a3552958858daddeb8842bb Mon Sep 17 00:00:00 2001 From: Dan Mulloy Date: Sat, 22 Sep 2018 12:17:02 -0400 Subject: [PATCH] Mark ParticleTypes as immutable, update tested version --- .../java/com/comphenix/protocol/ProtocolLibrary.java | 6 +++--- .../protocol/reflect/cloning/ImmutableDetector.java | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java b/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java index 0a3d53e4..57a84cf4 100644 --- a/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java +++ b/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java @@ -39,12 +39,12 @@ public class ProtocolLibrary { /** * The maximum version ProtocolLib has been tested with. */ - public static final String MAXIMUM_MINECRAFT_VERSION = "1.12.2"; + public static final String MAXIMUM_MINECRAFT_VERSION = "1.13.1"; /** - * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.12.2) was released. + * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.13.1) was released. */ - public static final String MINECRAFT_LAST_RELEASE_DATE = "2017-09-18"; + public static final String MINECRAFT_LAST_RELEASE_DATE = "2018-08-22"; /** * Plugins that are currently incompatible with ProtocolLib. diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java b/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java index 243db955..b129d2e2 100644 --- a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java +++ b/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java @@ -33,6 +33,7 @@ import java.util.function.Supplier; import javax.crypto.SecretKey; import com.comphenix.protocol.utility.MinecraftReflection; +import com.comphenix.protocol.utility.MinecraftVersion; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.primitives.Primitives; @@ -62,8 +63,12 @@ public class ImmutableDetector implements Cloner { add(() -> MinecraftReflection.getMinecraftClass("SoundEffect")); add(MinecraftReflection::getBlockClass); add(MinecraftReflection::getItemClass); - add(MinecraftReflection::getFluidTypeClass); - add(MinecraftReflection::getParticleTypeClass); + + if (MinecraftVersion.atOrAbove(MinecraftVersion.AQUATIC_UPDATE)) { + add(() -> MinecraftReflection.getMinecraftClass("Particle")); + add(MinecraftReflection::getFluidTypeClass); + add(MinecraftReflection::getParticleTypeClass); + } } private static void add(Supplier> getClass) {