Cleanup events further.

DenizenScript · Feb 13, 2016 · a5258cd · a5258cd
1 parent c0452e8
commit a5258cd
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 36 deletions.
diff --git a/.../gnomeffinway/depenizen/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java b/.../gnomeffinway/depenizen/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java
@@ -39,7 +39,7 @@
 
 public class PlayerCompletesSkyBlockChallengeScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public PlayerCompletesSkyBlockChallengeScriptEvent instance;
+    public static PlayerCompletesSkyBlockChallengeScriptEvent instance;
     public ChallengeCompleteEvent event;
     public Element challenge;
     public Element xp_reward;

diff --git a/...main/java/net/gnomeffinway/depenizen/events/askyblock/PlayerExitsSkyBlockScriptEvent.java b/...main/java/net/gnomeffinway/depenizen/events/askyblock/PlayerExitsSkyBlockScriptEvent.java
@@ -35,7 +35,7 @@
 
 public class PlayerExitsSkyBlockScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public PlayerExitsSkyBlockScriptEvent instance;
+    public static PlayerExitsSkyBlockScriptEvent instance;
     public IslandExitEvent event;
     public dLocation location;
     public dLocation island_location;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/askyblock/SkyBlockCreatedScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/askyblock/SkyBlockCreatedScriptEvent.java
@@ -36,7 +36,7 @@
 
 public class SkyBlockCreatedScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public SkyBlockCreatedScriptEvent instance;
+    public static SkyBlockCreatedScriptEvent instance;
     public IslandNewEvent event;
     public dLocation location;
     public Element schematic;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/askyblock/SkyBlockResetScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/askyblock/SkyBlockResetScriptEvent.java
@@ -34,7 +34,7 @@
 
 public class SkyBlockResetScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public SkyBlockResetScriptEvent instance;
+    public static SkyBlockResetScriptEvent instance;
     public IslandResetEvent event;
     public dLocation location;
     public dPlayer owner;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/essentials/PlayerAFKStatusScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/essentials/PlayerAFKStatusScriptEvent.java
@@ -35,7 +35,7 @@
 
 public class PlayerAFKStatusScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public PlayerAFKStatusScriptEvent instance;
+    public static PlayerAFKStatusScriptEvent instance;
     public AfkStatusChangeEvent event;
     public Element afk;
 

diff --git a/...ain/java/net/gnomeffinway/depenizen/events/essentials/PlayerGodModeStatusScriptEvent.java b/...ain/java/net/gnomeffinway/depenizen/events/essentials/PlayerGodModeStatusScriptEvent.java
@@ -35,7 +35,7 @@
 
 public class PlayerGodModeStatusScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public PlayerGodModeStatusScriptEvent instance;
+    public static PlayerGodModeStatusScriptEvent instance;
     public GodStatusChangeEvent event;
     public Element god;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/essentials/PlayerJailStatusScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/essentials/PlayerJailStatusScriptEvent.java
@@ -36,7 +36,7 @@
 
 public class PlayerJailStatusScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public PlayerJailStatusScriptEvent instance;
+    public static PlayerJailStatusScriptEvent instance;
     public JailStatusChangeEvent event;
     public Element jailed;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/essentials/PlayerMuteStatusScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/essentials/PlayerMuteStatusScriptEvent.java
@@ -36,7 +36,7 @@
 
 public class PlayerMuteStatusScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public PlayerMuteStatusScriptEvent instance;
+    public static PlayerMuteStatusScriptEvent instance;
     public MuteStatusChangeEvent event;
     public Element muted;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java
@@ -45,8 +45,7 @@ public mcMMOPlayerGainsXPScriptEvent() {
     }
 
     public static mcMMOPlayerGainsXPScriptEvent instance;
-
-    public static McMMOPlayerXpGainEvent event;
+    public McMMOPlayerXpGainEvent event;
     public dPlayer player;
     public Element skill;
     public Element xp;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java
@@ -44,8 +44,7 @@ public mcMMOPlayerLevelChangeScriptEvent() {
     }
 
     public static mcMMOPlayerLevelChangeScriptEvent instance;
-
-    public static McMMOPlayerLevelChangeEvent event;
+    public McMMOPlayerLevelChangeEvent event;
     public dPlayer player;
     public Element skill;
     public int level;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java
@@ -48,8 +48,7 @@ public mcMMOPlayerLevelDownScriptEvent() {
     }
 
     public static mcMMOPlayerLevelDownScriptEvent instance;
-
-    public static McMMOPlayerLevelDownEvent event;
+    public McMMOPlayerLevelDownEvent event;
     public dPlayer player;
     public Element skill;
     public int new_level;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java
@@ -49,7 +49,7 @@ public mcMMOPlayerLevelUpScriptEvent() {
     }
 
     public static mcMMOPlayerLevelUpScriptEvent instance;
-    public static McMMOPlayerLevelUpEvent event;
+    public McMMOPlayerLevelUpEvent event;
     public dPlayer player;
     public Element skill;
     public int new_level;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mobarena/MobArenaEndsScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mobarena/MobArenaEndsScriptEvent.java
@@ -39,7 +39,7 @@ public MobArenaEndsScriptEvent() {
         instance = this;
     }
 
-    public MobArenaEndsScriptEvent instance;
+    public static MobArenaEndsScriptEvent instance;
     public ArenaEndEvent event;
     public MobArenaArena arena;
     public Element wave;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mobarena/MobArenaStartsScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mobarena/MobArenaStartsScriptEvent.java
@@ -37,7 +37,7 @@ public MobArenaStartsScriptEvent() {
         instance = this;
     }
 
-    public MobArenaStartsScriptEvent instance;
+    public static MobArenaStartsScriptEvent instance;
     public ArenaStartEvent event;
     public MobArenaArena arena;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mobarena/MobArenaWaveChangesScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mobarena/MobArenaWaveChangesScriptEvent.java
@@ -39,7 +39,7 @@ public MobArenaWaveChangesScriptEvent() {
         instance = this;
     }
 
-    public MobArenaWaveChangesScriptEvent instance;
+    public static MobArenaWaveChangesScriptEvent instance;
     public NewWaveEvent event;
     public MobArenaArena arena;
     public Element wave;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/mythicmobs/MythicMobsDeathEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/mythicmobs/MythicMobsDeathEvent.java
@@ -54,15 +54,15 @@ public MythicMobsDeathEvent() {
         instance = this;
     }
 
-    MythicMobsDeathEvent instance;
-    MythicMobDeathEvent event;
-    MythicMobsMob mob;
-    dEntity entity;
-    dEntity killer;
-    Element level;
-    dList oldDrops;
-    Element experience;
-    List<ItemStack> newDrops;
+    public static MythicMobsDeathEvent instance;
+    public MythicMobDeathEvent event;
+    public MythicMobsMob mob;
+    public dEntity entity;
+    public dEntity killer;
+    public Element level;
+    public dList oldDrops;
+    public Element experience;
+    public List<ItemStack> newDrops;
 
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/pvparena/PVPArenaStartsScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/pvparena/PVPArenaStartsScriptEvent.java
@@ -35,7 +35,7 @@
 
 public class PVPArenaStartsScriptEvent extends BukkitScriptEvent implements Listener {
 
-    public PVPArenaStartsScriptEvent instance;
+    public static PVPArenaStartsScriptEvent instance;
     public PAStartEvent event;
     public dList fighters;
     public PVPArenaArena arena;

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/shopkeepers/ShopKeeperTradeScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/shopkeepers/ShopKeeperTradeScriptEvent.java
@@ -42,11 +42,11 @@ public ShopKeeperTradeScriptEvent() {
         instance = this;
     }
 
-    ShopKeeperTradeScriptEvent instance;
-    ShopkeeperTradeEvent event;
-    ShopKeeper keeper;
-    dPlayer player;
-    dList recipe;
+    public static ShopKeeperTradeScriptEvent instance;
+    public ShopkeeperTradeEvent event;
+    public ShopKeeper keeper;
+    public dPlayer player;
+    public dList recipe;
 
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/towny/PlayerEntersTownScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/towny/PlayerEntersTownScriptEvent.java
@@ -40,7 +40,7 @@ public PlayerEntersTownScriptEvent() {
         instance = this;
     }
 
-    public PlayerEntersTownScriptEvent instance;
+    public static PlayerEntersTownScriptEvent instance;
     public PlayerChangePlotEvent event;
     public dTown town;
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/events/towny/PlayerExitsTownScriptEvent.java b/src/main/java/net/gnomeffinway/depenizen/events/towny/PlayerExitsTownScriptEvent.java
@@ -40,7 +40,7 @@ public PlayerExitsTownScriptEvent() {
         instance = this;
     }
 
-    public PlayerExitsTownScriptEvent instance;
+    public static PlayerExitsTownScriptEvent instance;
     public PlayerChangePlotEvent event;
     public dTown town;
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ authors: [GnomeffinWay, Morphan1]
 version: ${project.version} (build ${BUILD_NUMBER})
 main: net.gnomeffinway.depenizen.Depenizen
 depend: [Denizen]
-softdepend: [ASkyBlock, BattleNight, Dynmap, Essentials, Factions, GriefPrevention, Heroes, HyperConomy, Jobs, MobArena, MythicMobs, NoCheatPlus, PlotMe, Prism, Quests, ShopKeepers, SimpleClans, SkillAPI, TerrainControl, Towny, Votifier, WorldEditWorldGuard, mcMMO, pvparena, pvpstats]
+softdepend: [ASkyBlock, BattleNight, Dynmap, Essentials, Factions, GriefPrevention, Heroes, HyperConomy, Jobs, mcMMO, MobArena, MythicMobs, NoCheatPlus, PlotMe, Prism, pvparena, pvpstats, Quests, ShopKeepers, SimpleClans, SkillAPI, TerrainControl, Towny, Votifier, WorldEdit, WorldGuard]
 
 commands:
     depenizen: