Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-25 01:31:29 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-6205: Rewrite enum to/from NMS type methods

Browse Source 
The methods would otherwise cache wrong enum types for specific enums.
This would result in a `ClassCastException` at the caller location,
which obviously is no fun. This broke API with `Switch#getFace` and
`FaceAttachable#getAttachedFace`.

The existing implementation was also stupid.

By: Mariell Hoversholm <proximyst@proximyst.com>
This commit is contained in:
CraftBukkit/Spigot 2020-11-03 18:15:08 +11:00
parent 97af585bf8
commit 11227b2076
1 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
View File

@ -137,7 +137,7 @@ public class CraftBlockData implements BlockData {
return exactMatch;
}
private static final Map<Class, BiMap<Enum<?>, Enum<?>>> classMappings = new HashMap<>();
private static final Map<Class<? extends Enum<?>>, Enum<?>[]> ENUM_VALUES = new HashMap<>();
/**
* Convert an NMS Enum (usually a BlockStateEnum) to its appropriate Bukkit
@ -147,32 +147,10 @@ public class CraftBlockData implements BlockData {
*/
@SuppressWarnings("unchecked")
private static <B extends Enum<B>> B toBukkit(Enum<?> nms, Class<B> bukkit) {
Enum<?> converted;
BiMap<Enum<?>, Enum<?>> nmsToBukkit = classMappings.get(nms.getClass());
if (nmsToBukkit != null) {
converted = nmsToBukkit.get(nms);
if (converted != null) {
return (B) converted;
}
}
if (nms instanceof EnumDirection) {
converted = CraftBlock.notchToBlockFace((EnumDirection) nms);
} else {
converted = bukkit.getEnumConstants()[nms.ordinal()];
return (B) CraftBlock.notchToBlockFace((EnumDirection) nms);
}
Preconditions.checkState(converted != null, "Could not convert enum %s->%s", nms, bukkit);
if (nmsToBukkit == null) {
nmsToBukkit = HashBiMap.create();
classMappings.put(nms.getClass(), nmsToBukkit);
}
nmsToBukkit.put(nms, converted);
return (B) converted;
return (B) ENUM_VALUES.computeIfAbsent(bukkit, Class::getEnumConstants)[nms.ordinal()];
}
/**
@ -185,32 +163,10 @@ public class CraftBlockData implements BlockData {
*/
@SuppressWarnings("unchecked")
private static <N extends Enum<N> & INamable> N toNMS(Enum<?> bukkit, Class<N> nms) {
Enum<?> converted;
BiMap<Enum<?>, Enum<?>> nmsToBukkit = classMappings.get(nms);
if (nmsToBukkit != null) {
converted = nmsToBukkit.inverse().get(bukkit);
if (converted != null) {
return (N) converted;
}
}
if (bukkit instanceof BlockFace) {
converted = CraftBlock.blockFaceToNotch((BlockFace) bukkit);
} else {
converted = nms.getEnumConstants()[bukkit.ordinal()];
return (N) CraftBlock.blockFaceToNotch((BlockFace) bukkit);
}
Preconditions.checkState(converted != null, "Could not convert enum %s->%s", nms, bukkit);
if (nmsToBukkit == null) {
nmsToBukkit = HashBiMap.create();
classMappings.put(nms, nmsToBukkit);
}
nmsToBukkit.put(converted, bukkit);
return (N) converted;
return (N) ENUM_VALUES.computeIfAbsent(nms, Class::getEnumConstants)[bukkit.ordinal()];
}
/**