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

Add workaround for PaperMC's broken Ban API

Browse source
This commit is contained in:
Michael Primm 2023-07-08 15:11:02 -05:00
parent e5fd546998
commit 19447f942d
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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 * Server access abstraction class
*/ */
@ -315,12 +316,22 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
return getServer().getMotd(); 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 @Override
public boolean isPlayerBanned(String pid) { public boolean isPlayerBanned(String pid) {
OfflinePlayer p = getServer().getOfflinePlayer(pid); OfflinePlayer p = getServer().getOfflinePlayer(pid);
if((p != null) && p.isBanned()) return isBanned(p);
return true;
return false;
} }
@Override @Override
public boolean isServerThread() { public boolean isServerThread() {
@ -464,7 +475,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@Override @Override
public Set<String> checkPlayerPermissions(String player, Set<String> perms) { public Set<String> checkPlayerPermissions(String player, Set<String> perms) {
OfflinePlayer p = getServer().getOfflinePlayer(player); OfflinePlayer p = getServer().getOfflinePlayer(player);
if(p.isBanned()) if (isBanned(p))
return new HashSet<String>(); return new HashSet<String>();
Set<String> rslt = permissions.hasOfflinePermissions(player, perms); Set<String> rslt = permissions.hasOfflinePermissions(player, perms);
if (rslt == null) { if (rslt == null) {
@ -478,7 +489,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@Override @Override
public boolean checkPlayerPermission(String player, String perm) { public boolean checkPlayerPermission(String player, String perm) {
OfflinePlayer p = getServer().getOfflinePlayer(player); OfflinePlayer p = getServer().getOfflinePlayer(player);
if(p.isBanned()) if (isBanned(p))
return false; return false;
boolean rslt = permissions.hasOfflinePermission(player, perm); boolean rslt = permissions.hasOfflinePermission(player, perm);
return rslt; return rslt;