Skip to content

Commit e41b1f9

Browse files
committed
Fix pre-1.13 startup problem without breaking 1.13.1...
1 parent 7d72dc4 commit e41b1f9

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ public class BukkitVersionHelperSpigot113_1 extends BukkitVersionHelperCB {
4747
protected Class<?> datapalettearray;
4848
private Field blockid_field;
4949

50+
@Override
51+
protected boolean isBlockIdNeeded() {
52+
return false;
53+
}
54+
5055
public BukkitVersionHelperSpigot113_1() {
5156
datapalettearray = getNMSClass("[Lnet.minecraft.server.DataPaletteBlock;");
5257
blockid_field = getPrivateField(craftchunksnapshot, new String[] { "blockids" }, datapalettearray);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ public class BukkitVersionHelperSpigot113 extends BukkitVersionHelperCB {
4646
protected Class<?> datapalettearray;
4747
private Field blockid_field;
4848

49+
@Override
50+
protected boolean isBlockIdNeeded() {
51+
return false;
52+
}
53+
4954
public BukkitVersionHelperSpigot113() {
5055
datapalettearray = getNMSClass("[Lnet.minecraft.server.DataPaletteBlock;");
5156
blockid_field = getPrivateField(craftchunksnapshot, new String[] { "blockids" }, datapalettearray);

bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public abstract class BukkitVersionHelper {
2222

2323
public static DynmapBlockState[] stateByID;
2424

25-
protected boolean blockidsneeded = true;
25+
protected boolean isBlockIdNeeded() {
26+
return true;
27+
}
2628

2729
protected BukkitVersionHelper() {
2830

bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,11 @@ protected void loadNMS() {
6969
nmsblock = getNMSClass("net.minecraft.server.Block");
7070
nmsblockarray = getNMSClass("[Lnet.minecraft.server.Block;");
7171
nmsmaterial = getNMSClass("net.minecraft.server.Material");
72-
Log.info("blockidsneeded=" + blockidsneeded);
73-
if (blockidsneeded) { // Not needed for 1.13+
72+
if (isBlockIdNeeded()) { // Not needed for 1.13+
7473
blockbyid = getFieldNoFail(nmsblock, new String[] { "byId" }, nmsblockarray);
7574
if (blockbyid == null) {
7675
blockbyidfunc = getMethod(nmsblock, new String[] { "getById", "e" }, new Class[] { int.class });
77-
Log.info("blockbyidfunc found = " + (blockbyidfunc != null));
7876
}
79-
Log.info("blockbyid found = " + (blockbyid != null));
8077
}
8178
material = getPrivateField(nmsblock, new String[] { "material" }, nmsmaterial);
8279

0 commit comments

Comments
 (0)