Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3988 from webbukkit/v3.0 

v3.6 release
This commit is contained in:
mikeprimm 2023-07-08 16:08:41 -05:00 committed by GitHub
parent ab8039b5f6 cee25bc518
commit f7d09281d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DynmapCore/src/main/java/org/dynmap/DynmapCore.java
View File

@ -1359,7 +1359,7 @@ public class DynmapCore implements DynmapCommonAPI {
new CommandInfo("dmap", "mapadd", "<world>:<map> <attrib>:<value> <attrib>:<value>", "Create map for world <world> with name <map> using provided attributes."),
new CommandInfo("dmap", "mapset", "<world>:<map> <attrib>:<value> <attrib>:<value>", "Update map <map> of world <world> with new attribute values."),
new CommandInfo("dmap", "worldreset", "<world>", "Reset world <world> to default template for world type"),
new CommandInfo("dmap", "worldreset", "<world> <templatename>", "Reset world <world> to temaplte <templatename>."),
new CommandInfo("dmap", "worldreset", "<world> <templatename>", "Reset world <world> to template <templatename>."),
new CommandInfo("dmap", "worldgetlimits", "<world>", "List visibity and hidden limits for world"),
new CommandInfo("dmap", "worldaddlimit", "<world> corner1:<x>/<z> corner2:<x>/<z>", "Add rectangular visibilty limit"),
new CommandInfo("dmap", "worldaddlimit", "<world> type:round center:<x>/<z> radius:<radius>", "Add round visibilty limit"),

2
build.gradle
View File

@ -39,7 +39,7 @@ allprojects {
apply plugin: 'java'
group = 'us.dynmap'
version = '3.6-beta-2'
version = '3.6'
}

2
oldbuilds/build.gradle
View File

@ -25,7 +25,7 @@ allprojects {
apply plugin: 'java'
group = 'us.dynmap'
version = '3.6-beta-2'
version = '3.6'
}

21
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -238,6 +238,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
}
}
private boolean banBrokenMsg = false;
/**
* Server access abstraction class
*/
@ -315,12 +316,22 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
}
return getServer().getMotd();
}
private boolean isBanned(OfflinePlayer p) {
try {
if ((!banBrokenMsg) && (p != null) && p.isBanned()) {
return true;
}
} catch (Exception x) {
Log.severe("Server error - broken Ban API - ban check disabled - this may allow banned players to log in!!!", x);
Log.severe("REPORT ERROR TO "+ Bukkit.getServer().getVersion() + " DEVELOPERS - THIS IS NOT DYNMAP ISSUE");
banBrokenMsg = true;
}
return false;
}
@Override
public boolean isPlayerBanned(String pid) {
OfflinePlayer p = getServer().getOfflinePlayer(pid);
if((p != null) && p.isBanned())
return true;
return false;
return isBanned(p);
}
@Override
public boolean isServerThread() {
@ -464,7 +475,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@Override
public Set<String> checkPlayerPermissions(String player, Set<String> perms) {
OfflinePlayer p = getServer().getOfflinePlayer(player);
if(p.isBanned())
if (isBanned(p))
return new HashSet<String>();
Set<String> rslt = permissions.hasOfflinePermissions(player, perms);
if (rslt == null) {
@ -478,7 +489,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@Override
public boolean checkPlayerPermission(String player, String perm) {
OfflinePlayer p = getServer().getOfflinePlayer(player);
if(p.isBanned())
if (isBanned(p))
return false;
boolean rslt = permissions.hasOfflinePermission(player, perm);
return rslt;