[UP] listener from joinPermsCheck event to PermsCheck event

#29

Author: Guillaume-Lebegue

src/main/java/world/bentobox/upgrades/UpgradesAddon.java

@@ -110,7 +110,7 @@ public void onEnable() {
 			this.registerListener(new IslandChangeListener(this));
 
 			if (this.isLimitsProvided())
-				this.registerListener(new JoinPermCheckListener());
+				this.registerListener(new JoinPermCheckListener(this));
 
 			getPlugin().getFlagsManager().registerFlag(UpgradesAddon.UPGRADES_RANK_RIGHT);
 

src/main/java/world/bentobox/upgrades/listeners/JoinPermCheckListener.java

@@ -1,20 +1,48 @@
 package world.bentobox.upgrades.listeners;
 
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import world.bentobox.limits.events.LimitsJoinPermCheckEvent;
+import world.bentobox.limits.Settings.EntityGroup;
+import world.bentobox.limits.events.LimitsPermCheckEvent;
+import world.bentobox.upgrades.UpgradesAddon;
 
 public class JoinPermCheckListener implements Listener {
 
-	public JoinPermCheckListener() {
+	public JoinPermCheckListener(UpgradesAddon addon) {
+		this.addon = addon;
 	}
 
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
-	public void onLimitsJoinPermCheckEvent(LimitsJoinPermCheckEvent e) {
-		// Stop LimitsJoinPermCheck else reset limits upgrades when player join
-		e.setCancelled(true);
+	public void onLimitsPermCheckEvent(LimitsPermCheckEvent e) {
+		Material block = e.getMaterial();
+		EntityType et = e.getEntityType();
+		EntityGroup entgroup = e.getEntityGroup();
+		World world = e.getPlayer().getWorld();
+		
+		if (block != null) {
+			if (this.addon.getUpgradesManager().getAllBlockLimitsUpgradeTiers(world).containsKey(block)) {
+				e.setCancelled(true);
+			}
+		}
+		
+		if (et != null) {
+			if (this.addon.getUpgradesManager().getAllEntityLimitsUpgradeTiers(world).containsKey(et)) {
+				e.setCancelled(true);
+			}
+		}
+		
+		if (entgroup != null) {
+			if (this.addon.getUpgradesManager().getAllEntityGroupLimitsUpgradeTiers(world).containsKey(entgroup.getName())) {
+				e.setCancelled(true);
+			}
+		}
 	}
 
+	UpgradesAddon addon;
+	
 }