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

Remove debug

This commit is contained in:
tastybento 2022-01-02 11:16:27 -08:00
parent 8d56a4078a
commit 886c6c5fa5
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/world/bentobox/limits/listeners/JoinListener.java
View File

@ -18,9 +18,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.permissions.PermissionAttachmentInfo;
import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.api.events.island.IslandEvent;
import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
import world.bentobox.bentobox.api.events.team.TeamSetownerEvent; import world.bentobox.bentobox.api.events.team.TeamSetownerEvent;
@ -84,19 +82,25 @@ public class JoinListener implements Listener {
} }
// Get the value // Get the value
int value = Integer.parseInt(split[4]); int value = Integer.parseInt(split[4]);
addon.log("Setting login limit via perm for " + player.getName() + "...");
// Fire perm check event // Fire perm check event
LimitsPermCheckEvent l = new LimitsPermCheckEvent(player, islandId, ibc, entgroup, et, m, value); LimitsPermCheckEvent l = new LimitsPermCheckEvent(player, islandId, ibc, entgroup, et, m, value);
Bukkit.getPluginManager().callEvent(l); Bukkit.getPluginManager().callEvent(l);
if (l.isCancelled()) continue; if (l.isCancelled()) {
addon.log("Permissions not set because another addon/plugin canceled setting.");
continue;
}
// Use event values // Use event values
ibc = l.getIbc(); ibc = l.getIbc();
// Make an ibc if required
if (ibc == null) {
ibc = new IslandBlockCount(islandId, gameMode);
}
// Run null checks and set ibc // Run null checks and set ibc
runNullCheckAndSet(ibc, l); runNullCheckAndSet(ibc, l);
} }
// Check removed permissions // Check removed permissions
if (ibc == null) {
BentoBox.getInstance().logDebug("IBC is still null");
}
// If any changes have been made then store it - don't make files unless they are needed // If any changes have been made then store it - don't make files unless they are needed
if (ibc != null) addon.getBlockLimitListener().setIsland(islandId, ibc); if (ibc != null) addon.getBlockLimitListener().setIsland(islandId, ibc);
} }
@ -122,30 +126,37 @@ public class JoinListener implements Listener {
return false; return false;
} }
private void runNullCheckAndSet(@Nullable IslandBlockCount ibc, @NonNull LimitsPermCheckEvent l) { private void runNullCheckAndSet(@NonNull IslandBlockCount ibc, @NonNull LimitsPermCheckEvent l) {
if (ibc == null) {
return;
}
EntityGroup entgroup = l.getEntityGroup(); EntityGroup entgroup = l.getEntityGroup();
EntityType et = l.getEntityType(); EntityType et = l.getEntityType();
Material m = l.getMaterial(); Material m = l.getMaterial();
int value = l.getValue(); int value = l.getValue();
if (entgroup != null) { if (entgroup != null) {
// Entity group limit // Entity group limit
ibc.setEntityGroupLimit(entgroup.getName(), Math.max(ibc.getEntityGroupLimit(entgroup.getName()), value)); int v = Math.max(ibc.getEntityGroupLimit(entgroup.getName()), value);
ibc.setEntityGroupLimit(entgroup.getName(), v);
addon.log("Setting group limit " + entgroup.getName() + " " + v);
} else if (et != null && m == null) { } else if (et != null && m == null) {
// Entity limit // Entity limit
ibc.setEntityLimit(et, Math.max(ibc.getEntityLimit(et), value)); int v = Math.max(ibc.getEntityLimit(et), value);
ibc.setEntityLimit(et, v);
addon.log("Setting entity limit " + et + " " + v);
} else if (m != null && et == null) { } else if (m != null && et == null) {
// Material limit // Block limit
ibc.setBlockLimit(m, Math.max(ibc.getBlockLimit(m), value)); int v = Math.max(ibc.getBlockLimit(m), value);
addon.log("Setting block limit " + m + " " + v);
ibc.setBlockLimit(m, v);
} else { } else {
if (m != null && m.isBlock()) { if (m != null && m.isBlock()) {
int v = Math.max(ibc.getBlockLimit(m), value);
addon.log("Setting block limit " + m + " " + v);
// Material limit // Material limit
ibc.setBlockLimit(m, Math.max(ibc.getBlockLimit(m), value)); ibc.setBlockLimit(m, v);
} else if (et != null){ } else if (et != null){
int v = Math.max(ibc.getEntityLimit(et), value);
addon.log("Setting entity limit " + et + " " + v);
// This is an entity setting // This is an entity setting
ibc.setEntityLimit(et, Math.max(ibc.getEntityLimit(et), value)); ibc.setEntityLimit(et, v);
} }
} }
@ -191,6 +202,13 @@ public class JoinListener implements Listener {
}); });
} }
/**
* Fire event so other addons can cancel this permissions change
* @param player player
* @param islandId island id
* @param ibc island block count
* @return true if canceled
*/
private boolean joinEventCheck(Player player, String islandId, IslandBlockCount ibc) { private boolean joinEventCheck(Player player, String islandId, IslandBlockCount ibc) {
// Fire event, so other addons can cancel this permissions change // Fire event, so other addons can cancel this permissions change
LimitsJoinPermCheckEvent e = new LimitsJoinPermCheckEvent(player, islandId, ibc); LimitsJoinPermCheckEvent e = new LimitsJoinPermCheckEvent(player, islandId, ibc);