Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

More PR merge fixes...

Browse source
This commit is contained in:
Mike Primm 2019-12-15 01:08:31 -06:00
parent eb8c1e0b63
commit 36e883abaf
7 changed files with 0 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

17
forge-1.10.2/src/main/java/org/dynmap/forge_1_10_2/DynmapPlugin.java
View file

@ -149,9 +149,6 @@ public class DynmapPlugin
private static final int SIGNPOST_ID = 63; private static final int SIGNPOST_ID = 63;
private static final int WALLSIGN_ID = 68; 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 String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" };
private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); 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 @Override
public void scheduleServerTask(Runnable run, long delay) public void scheduleServerTask(Runnable run, long delay)
{ {

14
forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java
View file

@ -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 @Override
public void scheduleServerTask(Runnable run, long delay) public void scheduleServerTask(Runnable run, long delay)
{ {

17
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View file

@ -149,9 +149,6 @@ public class DynmapPlugin
private static final int SIGNPOST_ID = 63; private static final int SIGNPOST_ID = 63;
private static final int WALLSIGN_ID = 68; 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 String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" };
private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); 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 @Override
public void scheduleServerTask(Runnable run, long delay) public void scheduleServerTask(Runnable run, long delay)
{ {

8
forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
View file

@ -160,9 +160,6 @@ public class DynmapPlugin
private static final int SIGNPOST_ID = 63; private static final int SIGNPOST_ID = 63;
private static final int WALLSIGN_ID = 68; 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 String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" };
private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]");
@ -520,11 +517,6 @@ public class DynmapPlugin
return -1; return -1;
} }
@Override
public int isSignAt(String wname, int x, int y, int z) {
return -1;
}
@Override @Override
public int isSignAt(String wname, int x, int y, int z) { public int isSignAt(String wname, int x, int y, int z) {
return -1; return -1;

17
forge-1.8.9/src/main/java/org/dynmap/forge_1_8_9/DynmapPlugin.java
View file

@ -144,9 +144,6 @@ public class DynmapPlugin
private static final int SIGNPOST_ID = 63; private static final int SIGNPOST_ID = 63;
private static final int WALLSIGN_ID = 68; 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 String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" };
private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); 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 @Override
public void scheduleServerTask(Runnable run, long delay) public void scheduleServerTask(Runnable run, long delay)
{ {

17
forge-1.9.4/src/main/java/org/dynmap/forge_1_9_4/DynmapPlugin.java
View file

@ -142,9 +142,6 @@ public class DynmapPlugin
private static final int SIGNPOST_ID = 63; private static final int SIGNPOST_ID = 63;
private static final int WALLSIGN_ID = 68; 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 String[] TRIGGER_DEFAULTS = { "blockupdate", "chunkpopulate", "chunkgenerate" };
private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); 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 @Override
public void scheduleServerTask(Runnable run, long delay) public void scheduleServerTask(Runnable run, long delay)
{ {

16
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View file

@ -214,22 +214,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
return -1; 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 @Override
public int isSignAt(String wname, int x, int y, int z) { public int isSignAt(String wname, int x, int y, int z) {
World w = getServer().getWorld(wname); World w = getServer().getWorld(wname);