Merge branch 'v3.0' into v3.0
This commit is contained in:
commit
bf404ee626
42 changed files with 2125 additions and 179 deletions
|
|
@ -138,6 +138,9 @@ public class DynmapPlugin
|
|||
private boolean isMCPC = false;
|
||||
private boolean useSaveFolder = true;
|
||||
private Field displayName = null; // MCPC+ display name
|
||||
|
||||
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;
|
||||
|
|
@ -499,6 +502,20 @@ public class DynmapPlugin
|
|||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int isSignAt(String wname, int x, int y, int z) {
|
||||
int blkid = plugin.getServer().getBlockIDAt(r.wname, r.x, r.y, r.z);
|
||||
|
||||
if (blkid == -1)
|
||||
return -1;
|
||||
|
||||
if((blkid == WALLSIGN_ID) || (blkid == SIGNPOST_ID)) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int isSignAt(String wname, int x, int y, int z) {
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ components:
|
|||
messagettl: 5
|
||||
# Optional: set number of lines in scrollable message history: if set, messagettl is not used to age out messages
|
||||
#scrollback: 100
|
||||
# Optiona; set maximum number of lines visible for chatbox
|
||||
# Optional: set maximum number of lines visible for chatbox
|
||||
#visiblelines: 10
|
||||
# Optional: send push button
|
||||
sendbutton: false
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue