From 10d03ef2ee6d18ecc1e23dca1dc4c3563e6f16a3 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 15 Dec 2019 01:08:31 -0600 Subject: [PATCH] More PR merge fixes... --- .../org/dynmap/forge_1_10_2/DynmapPlugin.java | 17 ----------------- .../org/dynmap/forge_1_11_2/DynmapPlugin.java | 14 -------------- .../org/dynmap/forge_1_12_2/DynmapPlugin.java | 17 ----------------- .../org/dynmap/forge_1_13_2/DynmapPlugin.java | 8 -------- .../org/dynmap/forge_1_8_9/DynmapPlugin.java | 17 ----------------- .../org/dynmap/forge_1_9_4/DynmapPlugin.java | 17 ----------------- .../java/org/dynmap/bukkit/DynmapPlugin.java | 16 ---------------- 7 files changed, 106 deletions(-) diff --git a/forge-1.10.2/src/main/java/org/dynmap/forge_1_10_2/DynmapPlugin.java b/forge-1.10.2/src/main/java/org/dynmap/forge_1_10_2/DynmapPlugin.java index fd3821c2..fe1b8d23 100644 --- a/forge-1.10.2/src/main/java/org/dynmap/forge_1_10_2/DynmapPlugin.java +++ b/forge-1.10.2/src/main/java/org/dynmap/forge_1_10_2/DynmapPlugin.java @@ -149,9 +149,6 @@ public class DynmapPlugin private static final int SIGNPOST_ID = 63; private static final int WALLSIGN_ID = 68; - private static final int SIGNPOST_ID = 63; - private static final int WALLSIGN_ID = 68; - private static final String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" }; private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -530,20 +527,6 @@ public class DynmapPlugin } } - @Override - public int isSignAt(String wname, int x, int y, int z) { - int blkid = this.getBlockIDAt(wname, x, y, z); - - if (blkid == -1) - return -1; - - if((blkid == WALLSIGN_ID) || (blkid == SIGNPOST_ID)) { - return 1; - } else { - return 0; - } - } - @Override public void scheduleServerTask(Runnable run, long delay) { diff --git a/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java b/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java index 7ae7e25e..5d2dd76f 100644 --- a/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java +++ b/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java @@ -535,20 +535,6 @@ public class DynmapPlugin } } - @Override - public int isSignAt(String wname, int x, int y, int z) { - int blkid = this.getBlockIDAt(wname, x, y, z); - - if (blkid == -1) - return -1; - - if((blkid == WALLSIGN_ID) || (blkid == SIGNPOST_ID)) { - return 1; - } else { - return 0; - } - } - @Override public void scheduleServerTask(Runnable run, long delay) { diff --git a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java index ef7fee51..5942c19b 100644 --- a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java +++ b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java @@ -149,9 +149,6 @@ public class DynmapPlugin private static final int SIGNPOST_ID = 63; private static final int WALLSIGN_ID = 68; - private static final int SIGNPOST_ID = 63; - private static final int WALLSIGN_ID = 68; - private static final String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" }; private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -543,20 +540,6 @@ public class DynmapPlugin } } - @Override - public int isSignAt(String wname, int x, int y, int z) { - int blkid = this.getBlockIDAt(wname, x, y, z); - - if (blkid == -1) - return -1; - - if((blkid == WALLSIGN_ID) || (blkid == SIGNPOST_ID)) { - return 1; - } else { - return 0; - } - } - @Override public void scheduleServerTask(Runnable run, long delay) { diff --git a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java index 6d66b926..f9542d69 100644 --- a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java +++ b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java @@ -160,9 +160,6 @@ public class DynmapPlugin private static final int SIGNPOST_ID = 63; private static final int WALLSIGN_ID = 68; - private static final int SIGNPOST_ID = 63; - private static final int WALLSIGN_ID = 68; - private static final String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" }; private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -520,11 +517,6 @@ public class DynmapPlugin return -1; } - @Override - public int isSignAt(String wname, int x, int y, int z) { - return -1; - } - @Override public int isSignAt(String wname, int x, int y, int z) { return -1; diff --git a/forge-1.8.9/src/main/java/org/dynmap/forge_1_8_9/DynmapPlugin.java b/forge-1.8.9/src/main/java/org/dynmap/forge_1_8_9/DynmapPlugin.java index d4f06ba6..076248be 100644 --- a/forge-1.8.9/src/main/java/org/dynmap/forge_1_8_9/DynmapPlugin.java +++ b/forge-1.8.9/src/main/java/org/dynmap/forge_1_8_9/DynmapPlugin.java @@ -144,9 +144,6 @@ public class DynmapPlugin private static final int SIGNPOST_ID = 63; private static final int WALLSIGN_ID = 68; - private static final int SIGNPOST_ID = 63; - private static final int WALLSIGN_ID = 68; - private static final String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" }; private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -514,20 +511,6 @@ public class DynmapPlugin } } - @Override - public int isSignAt(String wname, int x, int y, int z) { - int blkid = this.getBlockIDAt(wname, x, y, z); - - if (blkid == -1) - return -1; - - if((blkid == WALLSIGN_ID) || (blkid == SIGNPOST_ID)) { - return 1; - } else { - return 0; - } - } - @Override public void scheduleServerTask(Runnable run, long delay) { diff --git a/forge-1.9.4/src/main/java/org/dynmap/forge_1_9_4/DynmapPlugin.java b/forge-1.9.4/src/main/java/org/dynmap/forge_1_9_4/DynmapPlugin.java index 6544d866..be2d42a2 100644 --- a/forge-1.9.4/src/main/java/org/dynmap/forge_1_9_4/DynmapPlugin.java +++ b/forge-1.9.4/src/main/java/org/dynmap/forge_1_9_4/DynmapPlugin.java @@ -142,9 +142,6 @@ public class DynmapPlugin private static final int SIGNPOST_ID = 63; private static final int WALLSIGN_ID = 68; - private static final int SIGNPOST_ID = 63; - private static final int WALLSIGN_ID = 68; - private static final String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" }; private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -517,20 +514,6 @@ public class DynmapPlugin } } - @Override - public int isSignAt(String wname, int x, int y, int z) { - int blkid = this.getBlockIDAt(wname, x, y, z); - - if (blkid == -1) - return -1; - - if((blkid == WALLSIGN_ID) || (blkid == SIGNPOST_ID)) { - return 1; - } else { - return 0; - } - } - @Override public void scheduleServerTask(Runnable run, long delay) { diff --git a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java index 94121029..d10a7e6a 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java +++ b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java @@ -214,22 +214,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { return -1; } - @Override - public int isSignAt(String wname, int x, int y, int z) { - World w = getServer().getWorld(wname); - if((w != null) && w.isChunkLoaded(x >> 4, z >> 4)) { - Block b = w.getBlockAt(x, y, z); - BlockState s = b.getState(); - - if (s instanceof Sign) { - return 1; - } else { - return 0; - } - } - return -1; - } - @Override public int isSignAt(String wname, int x, int y, int z) { World w = getServer().getWorld(wname);