Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SPIGOT-5536: Material.values() causes legacy data init

This commit is contained in:
md_5 2020-01-23 08:53:36 +11:00
parent a81f6ed397
commit a0e88fb362
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
View File

@ -248,20 +248,6 @@ public final class CraftLegacy {
return name(material);
}
public static Material[] modern_values() {
Material[] values = Material.values();
return Arrays.copyOfRange(values, 0, Material.LEGACY_AIR.ordinal());
}
public static int modern_ordinal(Material material) {
if (material.isLegacy()) {
// SPIGOT-4002: Fix for eclipse compiler manually compiling in default statements to lookupswitch
throw new NoSuchFieldError("Legacy field ordinal: " + material);
}
return material.ordinal();
}
public static void init() {
//
}

4
src/main/java/org/bukkit/craftbukkit/util/Commodore.java
View File

@ -243,10 +243,10 @@ public class Commodore
switch ( name )
{
case "values":
super.visitMethodInsn( opcode, "org/bukkit/craftbukkit/legacy/CraftLegacy", "modern_" + name, desc, itf );
super.visitMethodInsn( opcode, "org/bukkit/craftbukkit/util/CraftLegacy", "modern_" + name, desc, itf );
return;
case "ordinal":
super.visitMethodInsn( Opcodes.INVOKESTATIC, "org/bukkit/craftbukkit/legacy/CraftLegacy", "modern_" + name, "(Lorg/bukkit/Material;)I", false );
super.visitMethodInsn( Opcodes.INVOKESTATIC, "org/bukkit/craftbukkit/util/CraftLegacy", "modern_" + name, "(Lorg/bukkit/Material;)I", false );
return;
}
}

15
src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
View File

@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.util;
import java.util.Arrays;
import org.bukkit.Material;
import org.bukkit.material.MaterialData;
@ -24,4 +25,18 @@ public final class CraftLegacy {
public static Material fromLegacy(MaterialData materialData) {
return org.bukkit.craftbukkit.legacy.CraftLegacy.fromLegacy(materialData);
}
public static Material[] modern_values() {
Material[] values = Material.values();
return Arrays.copyOfRange(values, 0, Material.LEGACY_AIR.ordinal());
}
public static int modern_ordinal(Material material) {
if (material.isLegacy()) {
// SPIGOT-4002: Fix for eclipse compiler manually compiling in default statements to lookupswitch
throw new NoSuchFieldError("Legacy field ordinal: " + material);
}
return material.ordinal();
}
}

2
src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java
View File

@ -99,7 +99,7 @@ public class LegacyTest extends AbstractTestingBase {
Assert.assertTrue("Must iterate only legacy materials", material.isLegacy());
}
for (Material material : CraftLegacy.modern_values()) {
for (Material material : org.bukkit.craftbukkit.util.CraftLegacy.modern_values()) {
Assert.assertFalse("Must iterate only modern materials", material.isLegacy());
}
}