Optimize ServerVersion

This commit is contained in:
DefineOutside committed 2021-09-21 15:02:20 -05:00
1 parent 91916d0eaf
commit 5d1371c479
2 files changed
+8 -9

No files matched your search

@@ -39,6 +39,7 @@ public class PacketType {
*/
public static final byte INVALID = -128;
public static final Map<Class<?>, Byte> packetIDMap = new IdentityHashMap<>();
private static final boolean isNine = ServerVersion.getVersion().isNewerThanOrEquals(ServerVersion.v_1_9);
private static void insertPacketID(Class<?> cls, byte packetID) {
if (cls != null) {
@@ -286,10 +287,7 @@ public class PacketType {
* @return Has the client placed a block?
*/
public static boolean isBlockPlace(final byte packetID) {
final ServerVersion version = PacketEvents.get().getServerUtils().getVersion();
return version.isNewerThan(ServerVersion.v_1_8_8) ?
packetID == PacketType.Play.Client.USE_ITEM
: packetID == PacketType.Play.Client.BLOCK_PLACE;
return isNine ? packetID == PacketType.Play.Client.USE_ITEM : packetID == PacketType.Play.Client.BLOCK_PLACE;
}
}
}
@@ -49,7 +49,7 @@ public enum ServerVersion {
.replace(".", ",").split(",")[3];
private static final ServerVersion[] VALUES = values();
public static ServerVersion[] reversedValues = new ServerVersion[VALUES.length];
private static ServerVersion cachedVersion;
private static final ServerVersion cachedVersion;
private final short protocolVersion;
ServerVersion(short protocolId) {
@@ -91,15 +91,16 @@ public enum ServerVersion {
* If PacketEvents has already attempted resolving, return the cached version.
* If PacketEvents hasn't already attempted resolving, it will resolve it, cache it and return the version.
*
* @return Server Version. (possibly cached)
* @return Server Version. (always cached)
*/
public static ServerVersion getVersion() {
if (cachedVersion == null) {
cachedVersion = getVersionNoCache();
}
return cachedVersion;
}
static {
cachedVersion = getVersionNoCache();
}
/**
* The values in this enum in reverse.
*