Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-09-24 20:02:35 +02:00
Code Issues Projects Releases Wiki Activity

Fix pre-1.13 startup problem without breaking 1.13.1...

Browse Source
This commit is contained in:
Mike Primm 2018-08-27 08:51:13 -05:00
parent 7d72dc4bbd
commit e41b1f9a54
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bukkit-helper-113-1/src/main/java/org/dynmap/bukkit/helper/v113_1/BukkitVersionHelperSpigot113_1.java
View File

@ -47,6 +47,11 @@ public class BukkitVersionHelperSpigot113_1 extends BukkitVersionHelperCB {
protected Class<?> datapalettearray; protected Class<?> datapalettearray;
private Field blockid_field; private Field blockid_field;
@Override
protected boolean isBlockIdNeeded() {
return false;
}
public BukkitVersionHelperSpigot113_1() { public BukkitVersionHelperSpigot113_1() {
datapalettearray = getNMSClass("[Lnet.minecraft.server.DataPaletteBlock;"); datapalettearray = getNMSClass("[Lnet.minecraft.server.DataPaletteBlock;");
blockid_field = getPrivateField(craftchunksnapshot, new String[] { "blockids" }, datapalettearray); blockid_field = getPrivateField(craftchunksnapshot, new String[] { "blockids" }, datapalettearray);

5
bukkit-helper-113/src/main/java/org/dynmap/bukkit/helper/v113/BukkitVersionHelperSpigot113.java
View File

@ -46,6 +46,11 @@ public class BukkitVersionHelperSpigot113 extends BukkitVersionHelperCB {
protected Class<?> datapalettearray; protected Class<?> datapalettearray;
private Field blockid_field; private Field blockid_field;
@Override
protected boolean isBlockIdNeeded() {
return false;
}
public BukkitVersionHelperSpigot113() { public BukkitVersionHelperSpigot113() {
datapalettearray = getNMSClass("[Lnet.minecraft.server.DataPaletteBlock;"); datapalettearray = getNMSClass("[Lnet.minecraft.server.DataPaletteBlock;");
blockid_field = getPrivateField(craftchunksnapshot, new String[] { "blockids" }, datapalettearray); blockid_field = getPrivateField(craftchunksnapshot, new String[] { "blockids" }, datapalettearray);

4
bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java
View File

@ -22,7 +22,9 @@ public abstract class BukkitVersionHelper {
public static DynmapBlockState[] stateByID; public static DynmapBlockState[] stateByID;
protected boolean blockidsneeded = true; protected boolean isBlockIdNeeded() {
return true;
}
protected BukkitVersionHelper() { protected BukkitVersionHelper() {

5
bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java
View File

@ -69,14 +69,11 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
nmsblock = getNMSClass("net.minecraft.server.Block"); nmsblock = getNMSClass("net.minecraft.server.Block");
nmsblockarray = getNMSClass("[Lnet.minecraft.server.Block;"); nmsblockarray = getNMSClass("[Lnet.minecraft.server.Block;");
nmsmaterial = getNMSClass("net.minecraft.server.Material"); nmsmaterial = getNMSClass("net.minecraft.server.Material");
Log.info("blockidsneeded=" + blockidsneeded); if (isBlockIdNeeded()) { // Not needed for 1.13+
if (blockidsneeded) { // Not needed for 1.13+
blockbyid = getFieldNoFail(nmsblock, new String[] { "byId" }, nmsblockarray); blockbyid = getFieldNoFail(nmsblock, new String[] { "byId" }, nmsblockarray);
if (blockbyid == null) { if (blockbyid == null) {
blockbyidfunc = getMethod(nmsblock, new String[] { "getById", "e" }, new Class[] { int.class }); blockbyidfunc = getMethod(nmsblock, new String[] { "getById", "e" }, new Class[] { int.class });
Log.info("blockbyidfunc found = " + (blockbyidfunc != null));
} }
Log.info("blockbyid found = " + (blockbyid != null));
} }
material = getPrivateField(nmsblock, new String[] { "material" }, nmsmaterial); material = getPrivateField(nmsblock, new String[] { "material" }, nmsmaterial);