events fire() cleaning

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopExpiresScriptEvent.java

@@ -86,6 +86,6 @@ public void onAreaShopExpires(UnrentedRegionEvent event) {
         }
         areaShop = new dAreaShop(event.getRegion());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java

@@ -103,7 +103,7 @@ public void onPlayerCompletesSkyBlockChallenge(ChallengeCompleteEvent event) {
             }
         }
         this.event = event;
-        fire();
+        fire(event);
     }
 
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerEntersSkyBlockScriptEvent.java

@@ -88,6 +88,6 @@ public void onPlayerEntersSkyblock(IslandEnterEvent event) {
         location = new dLocation(event.getLocation());
         owner = new dPlayer(event.getIslandOwner());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerExitsSkyBlockScriptEvent.java

@@ -88,6 +88,6 @@ public void onPlayerExitsSkyblock(IslandExitEvent event) {
         location = new dLocation(event.getLocation());
         owner = new dPlayer(event.getIslandOwner());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockCreatedScriptEvent.java

@@ -89,7 +89,7 @@ public void onSkyBlockCreated(IslandNewEvent event) {
         schematic = new Element(event.getSchematicName().getName());
         owner = dPlayer.mirrorBukkitPlayer(event.getPlayer());
         this.event = event;
-        fire();
+        fire(event);
     }
 
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockResetScriptEvent.java

@@ -82,7 +82,7 @@ public void onSkyBlockReset(IslandResetEvent event) {
         location = new dLocation(event.getLocation());
         owner = dPlayer.mirrorBukkitPlayer(event.getPlayer());
         this.event = event;
-        fire();
+        fire(event);
     }
 
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerAFKStatusScriptEvent.java

@@ -90,7 +90,7 @@ public void onPlayerAFKStatus(AfkStatusChangeEvent event) {
         afk = new Element(event.getValue());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerGodModeStatusScriptEvent.java

@@ -88,7 +88,7 @@ public void onPlayerAFKStatus(GodStatusChangeEvent event) {
         god = new Element(event.getValue());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerJailStatusScriptEvent.java

@@ -92,7 +92,7 @@ public void onPlayerAFKStatus(JailStatusChangeEvent event) {
         jailed = new Element(event.getValue());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerMuteStatusScriptEvent.java

@@ -92,7 +92,7 @@ public void onPlayerAFKStatus(MuteStatusChangeEvent event) {
         muted = new Element(event.getValue());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/griefprevention/GPClaimEnterEvent.java

@@ -124,7 +124,7 @@ public void onPlayerEntersExitsGPClaim(PlayerMoveEvent event) {
         old_claim = fclaim == null ? null : new GriefPreventionClaim(fclaim);
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityDisguisesScriptEvent.java

@@ -96,7 +96,7 @@ public void onDisguise(DisguiseEvent event) {
 
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityUndisguisesScriptEvent.java

@@ -96,7 +96,7 @@ public void onUndisguise(UndisguiseEvent event) {
 
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java

@@ -115,8 +115,8 @@ public void onmcMMOPlayerLevelChanges(McMMOPlayerXpGainEvent event) {
         xp = new Element(event.getRawXpGained());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
         event.setRawXpGained(xp.asFloat());
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java

@@ -114,7 +114,7 @@ public void onmcMMOPlayerLevelChanges(McMMOPlayerLevelChangeEvent event) {
         skill = new Element(event.getSkill().getName());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java

@@ -125,8 +125,8 @@ public void onmcMMOPlayerLevelDown(McMMOPlayerLevelDownEvent event) {
         skill = new Element(event.getSkill().getName());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
         event.setLevelsLost(levels_lost);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java

@@ -126,8 +126,8 @@ public void onmcMMOPlayerLevelUp(McMMOPlayerLevelUpEvent event) {
         skill = new Element(event.getSkill().getName());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
         event.setLevelsGained(levels_gained);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java

@@ -86,6 +86,6 @@ public void onMobArenaEnds(ArenaEndEvent event) {
         arena = new MobArenaArena(event.getArena());
         wave = new Element(event.getArena().getWaveManager().getWaveNumber());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java

@@ -80,7 +80,7 @@ public void onMobArenaStarts(ArenaStartEvent event) {
         arena = new MobArenaArena(event.getArena());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaWaveChangesScriptEvent.java

@@ -89,6 +89,6 @@ public void onMobArenaWaveChanges(NewWaveEvent event) {
         arena = new MobArenaArena(event.getArena());
         wave = new Element(event.getWaveNumber());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java

@@ -164,7 +164,7 @@ public void onMythicMobDeath(MythicMobDeathEvent event) {
             oldDrops.add(new dItem(i).identify());
         }
         this.event = event;
-        fire();
+        fire(event);
         if (!newDrops.isEmpty()) {
             event.setDrops(newDrops);
         }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerEntersPlotScriptEvent.java

@@ -89,6 +89,6 @@ public void onPlotEnter(PlayerEnterPlotEvent event) {
         player = dPlayer.mirrorBukkitPlayer(event.getPlayer());
         plot = new dPlotSquaredPlot(event.getPlot());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerLeavePlotScriptEvent.java

@@ -91,6 +91,6 @@ public void onPlotLeave(PlayerLeavePlotEvent event) {
         player = dPlayer.mirrorBukkitPlayer(event.getPlayer());
         plot = new dPlotSquaredPlot(event.getPlot());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlotClearScriptEvent.java

@@ -86,7 +86,7 @@ public void onPlotClear(PlotClearEvent event) {
 
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PVPArenaStartsScriptEvent.java

@@ -87,7 +87,7 @@ public void onPVPArenaStart(PAStartEvent event) {
         arena = new PVPArenaArena(event.getArena());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerExitsPVPArenaScriptEvent.java

@@ -77,6 +77,6 @@ public void onPlayerExitsPVPArena(PAExitEvent event) {
         arena = new PVPArenaArena(event.getArena());
         cancelled = false;
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerJoinsPVPArenaScriptEvent.java

@@ -77,7 +77,7 @@ public void onPlayerJoinsPVPArena(PAJoinEvent event) {
         arena = new PVPArenaArena(event.getArena());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerLeavesPVPArenaScriptEvent.java

@@ -77,6 +77,6 @@ public void onPlayerLeavesPVPArena(PALeaveEvent event) {
         arena = new PVPArenaArena(event.getArena());
         cancelled = false;
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerEntersResidenceScriptEvent.java

@@ -90,6 +90,6 @@ public void onResidencePlayerEntersResidence(ResidenceChangedEvent event) {
         }
         residence = new dResidence(event.getTo());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerExitsResidenceScriptEvent.java

@@ -90,6 +90,6 @@ public void onResidencePlayerExitsResidence(ResidenceChangedEvent event) {
         }
         residence = new dResidence(event.getFrom());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/sentinel/SentinelAttackScriptEvent.java

@@ -81,7 +81,7 @@ public void onSentinelAttack(SentinelAttackEvent event) {
         entity = new dEntity(event.getNPC().getTrait(SentinelTrait.class).chasing).getDenizenObject();
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/shopkeepers/ShopKeeperTradeScriptEvent.java

@@ -86,7 +86,7 @@ public void onShopKeeperTrade(ShopkeeperTradeEvent event) {
         recipe = ShopKeeper.wrapTradingRecipe(event.getTradingRecipe());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerDowngradesSkillScriptEvent.java

@@ -109,7 +109,7 @@ public void onSkillAPIPlayerDowngradesSkill(PlayerSkillDowngradeEvent event) {
         skill = new Element(event.getDowngradedSkill().getData().getName());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerLevelsUpScriptEvent.java

@@ -103,6 +103,6 @@ public void onSkillAPIPlayerLevelsUp(PlayerLevelUpEvent event) {
         gained = event.getAmount();
         skillAPIClass = new SkillAPIClass(event.getPlayerClass().getData());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUnlocksSkillScriptEvent.java

@@ -96,6 +96,6 @@ public void onSkillAPIPlayerUnlocksSkill(PlayerSkillUnlockEvent event) {
         player = dPlayer.mirrorBukkitPlayer(event.getPlayerData().getPlayer());
         skill = new Element(event.getUnlockedSkill().getData().getName());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUpgradesSkillScriptEvent.java

@@ -109,7 +109,7 @@ public void onSkillAPIPlayerUpgradesSkill(PlayerSkillUpgradeEvent event) {
         skill = new Element(event.getUpgradedSkill().getData().getName());
         cancelled = event.isCancelled();
         this.event = event;
-        fire();
-        event.setCancelled(cancelled);
+        fire(event);
+         fire(event);;
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerEntersTownScriptEvent.java

@@ -93,6 +93,6 @@ public void onTownyPlayerEntersTown(PlayerEnterTownEvent event) {
         }
         town = dTown.fromWorldCoord(event.getTo());
         this.event = event;
-        fire();
+        fire(event);
     }
 }

bukkit/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerExitsTownScriptEvent.java

@@ -93,6 +93,6 @@ public void onTownyPlayerExitsTown(PlayerLeaveTownEvent event) {
         }
         town = dTown.fromWorldCoord(event.getFrom());
         this.event = event;
-        fire();
+        fire(event);
     }
 }