diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java index 6d27e14358..4e6fc37f5b 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java @@ -82,14 +82,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - if (lightning != null) { - context.put("lightning", lightning); + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; } - context.put("entity", entity); - context.put("cause", cause); - return context; + else if ((name.equals("lightning")) && (lightning != null)) { + return lightning; + } + else if (name.equals("cause")) { + return cause; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java index a63bcb94b7..80fbcd13e1 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java @@ -113,15 +113,26 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("cause", cause); - context.put("entity", breaker); // NOTE: Deprecated - context.put("breaker", breaker); - context.put("hanging", hanging); - context.put("cuboids", cuboids); - context.put("location", location); - return context; + public dObject getContext(String name) { + if (name.equals("cause")) { + return cause; + } + else if (name.equals("entity")) { // NOTE: Deprecated + return breaker; + } + else if (name.equals("breaker")) { + return breaker; + } + else if (name.equals("hanging")) { + return hanging; + } + else if (name.equals("cuboids")) { // NOTE: Deprecated + return cuboids; + } + else if (name.equals("location")) { + return location; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java index 6ef21eaf96..f5a986446f 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java @@ -120,14 +120,23 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("cuboids", cuboids); //DEPRECATED - context.put("location", location); - context.put("new_material", new_material); - context.put("old_material", old_material); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("cuboids")) { // NOTE: Deprecated + return cuboids; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("new_material")) { + return new_material; + } + else if (name.equals("old_material")) { + return old_material; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java index 1edaba85dd..dada8e1ddb 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java @@ -92,11 +92,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("duration", duration); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("duration")) { + return duration; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java index c34490fbbe..7422f59247 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java @@ -91,12 +91,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("portal_type", portal_type); -// context.put("blocks", blocks); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("portal_type")) { + return portal_type; + } +// else if (name.equals("blocks")) { +// return blocks; +// } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java index 563c65b73e..eeb1d88e99 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java @@ -156,23 +156,31 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("damage", damage); - context.put("final_damage", final_damage); - context.put("cause", cause); - if (damager != null) { - context.put("damager", damager); + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; } - if (projectile != null) { - context.put("projectile", projectile); + else if (name.equals("damage")) { + return damage; + } + else if (name.equals("final_damage")) { + return final_damage; + } + else if (name.equals("cause")) { + return cause; + } + else if ((name.equals("damager")) && (damager != null)) { + return damager; + } + else if ((name.equals("projectile")) && (projectile != null)) { + return projectile; } for (EntityDamageEvent.DamageModifier dm : EntityDamageEvent.DamageModifier.values()) { - context.put("damage_" + dm.name(), new Element(event.getDamage(dm))); + if (name.equals("damage_" + dm.name())) { + return new Element(event.getDamage(dm)); + } } - - return context; + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java index 8f54b122b5..b0a97c4106 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java @@ -156,25 +156,26 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - if (damager != null) { - context.put("damager", damager); + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; } - if (message != null) { - context.put("message", message); + else if ((name.equals("damager")) && (damager != null)) { + return damager; } - if (inventory != null) { - context.put("inventory", inventory); + else if ((name.equals("message")) && (message != null)) { + return message; } - if (cause != null) { - context.put("cause", cause); + else if ((name.equals("inventory")) && (inventory != null)) { + return inventory; } - if (drops != null) { - context.put("drops", drops); + else if ((name.equals("cause")) && (cause != null)) { + return cause; } - return context; + else if ((name.equals("drops")) && (drops != null)) { + return drops; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java index 338d3e5d4d..370bbd4b73 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java @@ -9,6 +9,7 @@ import net.aufdemrand.denizencore.scripts.containers.ScriptContainer; import net.aufdemrand.denizencore.utilities.CoreUtilities; +import javax.annotation.OverridingMethodsMustInvokeSuper; import java.util.HashMap; public class EntityDespawnScriptEvent extends BukkitScriptEvent { @@ -80,10 +81,13 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("cause", cause); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("cause")) { + return cause; + } + return super.getContext(name); } } diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java index 2e531de354..1ff84cffa0 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java @@ -83,11 +83,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("location", location); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("location")) { + return location; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java index bae2b4dd3a..dbcbe24913 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java @@ -89,11 +89,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("vehicle", vehicle); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("vehicle")) { + return vehicle; + } + else if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java index 137b831486..b655d0883b 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java @@ -83,11 +83,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("location", location); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("location")) { + return location; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java index 6c503fb3f1..a0a2f43751 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java @@ -89,11 +89,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("vehicle", vehicle); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("vehicle")) { + return vehicle; + } + else if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java index d5b1b367ed..ac4b9dcf99 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java @@ -115,13 +115,20 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("location", location); - context.put("blocks", blocks); - context.put("strength", new Element(strength)); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("blocks")) { + return blocks; + } + else if (name.equals("strength")) { + return new Element(strength); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java index b7768d3f5c..1fbcc0f2d3 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java @@ -86,12 +86,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("radius", new Element(radius)); - context.put("fire", new Element(fire)); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("radius")) { + return new Element(radius); + } + else if (name.equals("fire")) { + return new Element(fire); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java index 896eb2ea83..d7d3ea44cc 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java @@ -91,11 +91,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("food", new Element(food)); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("food")) { + return new Element(food); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java index 8926b7a25b..df955a8886 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java @@ -103,12 +103,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("material", material); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("material")) { + return material; + } + else if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java index 89cc0228af..98068d824a 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java @@ -100,12 +100,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("reason", reason); - context.put("amount", amount); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("reason")) { + return reason; + } + else if (name.equals("amount")) { + return amount; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java index 354e942ec7..ba1d5f1a5f 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java @@ -104,12 +104,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("location", location); - context.put("cuboids", cuboids); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("cuboids")) { // NOTE: Deprecated + return cuboids; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java index 4ca38f0d53..acf6df6839 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java @@ -146,23 +146,31 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("damage", damage); - context.put("final_damage", final_damage); - context.put("cause", cause); - if (damager != null) { - context.put("damager", damager); + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; } - if (projectile != null) { - context.put("projectile", projectile); + else if (name.equals("damage")) { + return damage; + } + else if (name.equals("final_damage")) { + return final_damage; + } + else if (name.equals("cause")) { + return cause; + } + else if ((name.equals("damager")) && (damager != null)) { + return damager; + } + else if ((name.equals("projectile")) && (projectile != null)) { + return projectile; } for (EntityDamageEvent.DamageModifier dm : EntityDamageEvent.DamageModifier.values()) { - context.put("damage_" + dm.name(), new Element(event.getDamage(dm))); + if (name.equals("damage_" + dm.name())) { + return new Element(event.getDamage(dm)); + } } - - return context; + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java index f6fa15552e..f13c933338 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java @@ -140,13 +140,20 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("force", new Element(force)); - context.put("bow", bow); - context.put("projectile", projectile); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("force")) { + return new Element(force); + } + else if (name.equals("bow")) { + return bow; + } + else if (name.equals("projectile")) { + return projectile; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java index 1ebeea09f9..63fc85589a 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java @@ -108,13 +108,20 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("location", location); - context.put("cuboids", cuboids); - context.put("reason", reason); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("cuboids")) { // NOTE: Deprecated + return cuboids; + } + else if (name.equals("reason")) { + return reason; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java index af9b5b60ce..858228603f 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java @@ -102,11 +102,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("owner", owner); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("owner")) { + return owner; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java index 3b9a98eb66..3ad031988c 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java @@ -120,15 +120,20 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("reason", reason); - if (target != null) { - context.put("target", target); + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; } - context.put("cuboids", cuboids); - return context; + else if (name.equals("reason")) { + return reason; + } + else if (name.equals("cuboids")) { + return cuboids; + } + else if ((name.equals("target")) && (target != null)) { + return target; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java index 879c539005..f448faac2f 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java @@ -119,13 +119,20 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("origin", from); - context.put("destination", to); - context.put("entity", entity.getDenizenObject()); - context.put("cause", new Element(cause)); - return context; + public dObject getContext(String name) { + if (name.equals("origin")) { + return from; + } + else if (name.equals("destination")) { + return to; + } + else if (name.equals("entity")) { + return entity.getDenizenObject(); + } + else if (name.equals("cause")) { + return new Element(cause); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java index fcffc8ffce..823bf8bc3f 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java @@ -88,11 +88,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("reason", reason); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("reason")) { + return reason; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java index 3f37a4e9d3..a1c67c29a5 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java @@ -112,14 +112,23 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("cause", cause); - context.put("entity", entity); - context.put("hanging", hanging); - context.put("cuboids", cuboids); - context.put("location", location); - return context; + public dObject getContext(String name) { + if (name.equals("cause")) { + return cause; + } + else if (name.equals("entity")) { // NOTE: Deprecated + return entity; + } + else if (name.equals("hanging")) { + return hanging; + } + else if (name.equals("cuboids")) { // NOTE: Deprecated + return cuboids; + } + else if (name.equals("location")) { + return location; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java index 2baedc8fbe..9da668699f 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java @@ -102,13 +102,20 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("color", color); - context.put("variant", variant); - context.put("power", new Element(power)); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("color")) { + return color; + } + else if (name.equals("variant")) { + return variant; + } + else if (name.equals("power")) { + return new Element(power); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java index 7942d4a5dc..c57dbbe24a 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java @@ -91,12 +91,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("item", item); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("item")) { + return item; + } + else if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java index 02ac958999..e998fcf069 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java @@ -112,15 +112,26 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("location", location); - context.put("inventory", inventory); - context.put("item", item); - context.put("button", button); - context.put("cost", new Element(cost)); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("inventory")) { + return inventory; + } + else if (name.equals("item")) { + return item; + } + else if (name.equals("button")) { + return button; + } + else if (name.equals("cost")) { + return new Element(cost); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java index 548b224261..7c66a2b322 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java @@ -96,13 +96,20 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("item", item); - context.put("entity", entity); - context.put("target", new dEntity(event.getTarget())); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("item")) { + return item; + } + else if (name.equals("entity")) { + return entity; + } + else if (name.equals("target")) { + return new dEntity(event.getTarget()); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java index 99b19bb17a..287041980d 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java @@ -93,12 +93,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("item", item); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("item")) { + return item; + } + else if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/PigZappedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/PigZappedScriptEvent.java index 70e8043a37..ed39b0aae1 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/PigZappedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/PigZappedScriptEvent.java @@ -74,12 +74,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("pig", pig); - context.put("pig_zombie", pig_zombie); - context.put("lightning", lightning); - return context; + public dObject getContext(String name) { + if (name.equals("pig")) { + return pig; + } + else if (name.equals("pig_zombie")) { + return pig_zombie; + } + else if (name.equals("lightning")) { + return lightning; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java index cf1ac7f4e2..5fa1a6d6fa 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java @@ -127,14 +127,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("projectile", projectile); - context.put("location", location); - if (shooter != null) { - context.put("shooter", shooter); + public dObject getContext(String name) { + if (name.equals("projectile")) { + return projectile; } - return context; + else if (name.equals("location")) { + return location; + } + else if ((name.equals("shooter")) && (shooter != null)) { + return shooter; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java index 4ee3381785..9f6b206264 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java @@ -84,10 +84,11 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java index 1da2d8e7be..67dd2ad7f6 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java @@ -110,11 +110,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("color", new Element(color.toString())); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("color")) { + return new Element(color.toString()); + } + else if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java index 60c7736de1..f3241927c4 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java @@ -74,10 +74,11 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java index 2645b54a7f..cddc7e398d 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java @@ -94,11 +94,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("count", new Element(count)); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("count")) { + return new Element(count); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java index 11b6ae84e2..fac00291b1 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java @@ -93,11 +93,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("vehicle", vehicle); - context.put("location", location); - return context; + public dObject getContext(String name) { + if (name.equals("vehicle")) { + return vehicle; + } + else if (name.equals("location")) { + return location; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java index c2ad4245bd..c158414767 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java @@ -108,12 +108,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("vehicle", vehicle); - context.put("entity", entity); - context.put("pickup", new Element(!pickup_cancel)); - return context; + public dObject getContext(String name) { + if (name.equals("vehicle")) { + return vehicle; + } + else if (name.equals("entity")) { + return entity; + } + else if (name.equals("pickup")) { + return new Element(!pickup_cancel); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java index dbb3e27f8e..47a703069d 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java @@ -83,10 +83,11 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("vehicle", vehicle); - return context; + public dObject getContext(String name) { + if (name.equals("vehicle")) { + return vehicle; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java index 72c2ea4fc3..32f83f5b8d 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java @@ -110,13 +110,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("vehicle", vehicle); - if (entity != null) { - context.put("entity", entity); + public dObject getContext(String name) { + if (name.equals("vehicle")) { + return vehicle; + } + else if ((name.equals("entity")) && (entity != null)) { + return entity; } - return context; + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java index b6cc6de414..3ebd0de1d5 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java @@ -101,13 +101,14 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("vehicle", vehicle); - if (entity != null) { - context.put("entity", entity); + public dObject getContext(String name) { + if (name.equals("vehicle")) { + return vehicle; + } + else if ((name.equals("entity")) && (entity != null)) { + return entity; } - return context; + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java index 86594451ae..eaa8dd00ba 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java @@ -88,12 +88,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("from", from); - context.put("to", to); - context.put("vehicle", vehicle); - return context; + public dObject getContext(String name) { + if (name.equals("from")) { + return from; + } + else if (name.equals("to")) { + return to; + } + else if (name.equals("vehicle")) { + return vehicle; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java index d060a5f334..1477f5fb2d 100644 --- a/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java @@ -150,16 +150,21 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("message", message); - context.put("format", format); + public dObject getContext(String name) { dList list = new dList(); for (Player tplayer : recipients) { list.add(dPlayer.mirrorBukkitPlayer(tplayer).identify()); } - context.put("recipients", list); - return context; + if (name.equals("message")) { + return message; + } + else if (name.equals("format")) { + return format; + } + if (name.equals("recipients")) { + return list; + } + return super.getContext(name); } class SyncChatHandler implements Listener { diff --git a/src/main/java/net/aufdemrand/denizen/events/world/BrewsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/BrewsScriptEvent.java index a69dbd81ef..307e5dd0a1 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/BrewsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/BrewsScriptEvent.java @@ -70,11 +70,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("inventory", inventory); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("inventory")) { + return inventory; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/BucketEmptyScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/BucketEmptyScriptEvent.java index 3e222a2fef..d1d3ada357 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/BucketEmptyScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/BucketEmptyScriptEvent.java @@ -91,12 +91,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("relative", relative); - context.put("item", item); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("relative")) { + return relative; + } + else if (name.equals("item")) { + return item; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/BucketFillScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/BucketFillScriptEvent.java index 984269ef7c..fd0131fbdd 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/BucketFillScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/BucketFillScriptEvent.java @@ -93,12 +93,17 @@ public ScriptEntryData getScriptEntryData() { } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("item", item); - context.put("material", material); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("item")) { + return item; + } + else if (name.equals("material")) { + return material; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java index 9a2adcb924..3619e3cbee 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java @@ -74,11 +74,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("chunk", chunk); - context.put("world", world); // Deprecated in favor of context.chunk.world - return context; + public dObject getContext(String name) { + if (name.equals("chunk")) { + return chunk; + } + else if (name.equals("world")) { // Deprecated in favor of context.chunk.world + return world; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java index 50b34c2c2b..1559479ec0 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java @@ -75,11 +75,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("chunk", chunk); - context.put("world", world); // Deprecated in favor of context.chunk.world - return context; + public dObject getContext(String name) { + if (name.equals("chunk")) { + return chunk; + } + else if (name.equals("world")) { // Deprecated in favor of context.chunk.world + return world; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java index 014679b907..d02eb33873 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java @@ -83,11 +83,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("item", item); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("item")) { + return item; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java index 40360f71d9..52c9f8462b 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java @@ -92,12 +92,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("source_item", source_item); - context.put("result_item", result_item); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("source_item")) { + return source_item; + } + else if (name.equals("result_item")) { + return result_item; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/InvPicksUpItemScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/InvPicksUpItemScriptEvent.java index e8f4d00a66..d9e9bda4ec 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/InvPicksUpItemScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/InvPicksUpItemScriptEvent.java @@ -87,11 +87,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("inventory", inventory); - context.put("item", item); - return context; + public dObject getContext(String name) { + if (name.equals("item")) { + return item; + } + else if (name.equals("inventory")) { + return inventory; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java index 7750fab6d1..9c82196842 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java @@ -106,13 +106,20 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("origin", origin); - context.put("destination", destination); - context.put("initiator", initiator); - context.put("item", item); - return context; + public dObject getContext(String name) { + if (name.equals("origin")) { + return origin; + } + else if (name.equals("destination")) { + return destination; + } + else if (name.equals("initiator")) { + return initiator; + } + else if (name.equals("item")) { + return item; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java index d9bbb0610d..84db45b6ec 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java @@ -75,11 +75,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("material", material); - return context; + public dObject getContext(String name) { + if (name.equals("location")){ + return location; + } + else if (name.equals("material")) { + return material; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/LightningStrikesScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/LightningStrikesScriptEvent.java index 4c0d386438..36e1f00bda 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/LightningStrikesScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/LightningStrikesScriptEvent.java @@ -73,12 +73,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("lightning", lightning); - context.put("world", new dWorld(location.getWorld())); - context.put("location", location); - return context; + public dObject getContext(String name) { + if (name.equals("lightning")) { + return lightning; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("world")) { // NOTE: Deprecated in favor of context.location.world + return new dWorld(location.getWorld()); + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java index 2904029652..c1c3f86277 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java @@ -79,12 +79,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("destination", destination); - context.put("material", material); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("destination")) { + return destination; + } + else if (name.equals("material")) { + return material; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java index 25502b1fc8..1a2959ec15 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java @@ -87,15 +87,26 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("material", material); - context.put("sticky", sticky); - context.put("relative", relative); - context.put("blocks", blocks); - context.put("length", length); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("material")) { + return material; + } + else if (name.equals("sticky")) { + return sticky; + } + else if (name.equals("relative")) { + return relative; + } + else if (name.equals("blocks")) { + return blocks; + } + else if (name.equals("length")) { + return length; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java index 079c6bf2d3..0944ee3693 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java @@ -89,15 +89,26 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("material", material); - context.put("sticky", sticky); - context.put("relative", relative); - context.put("blocks", blocks); - context.put("retract_location", retract_location); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("material")) { + return material; + } + else if (name.equals("sticky")) { + return sticky; + } + else if (name.equals("relative")) { + return relative; + } + else if (name.equals("blocks")) { + return blocks; + } + else if (name.equals("retract_location")) { + return retract_location; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java index f8f63f2383..938caa5b8e 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java @@ -81,12 +81,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - context.put("reason", reason); - context.put("blocks", blocks); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + else if (name.equals("reason")) { + return reason; + } + else if (name.equals("blocks")) { + return blocks; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java index 38c4d7d419..34d2834624 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java @@ -82,13 +82,20 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("entity", entity); - context.put("entities", entities); - context.put("location", location); - context.put("potion", potion); - return context; + public dObject getContext(String name) { + if (name.equals("entity")) { + return entity; + } + else if (name.equals("entities")) { + return entities; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("potion")) { + return potion; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/RedstoneScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/RedstoneScriptEvent.java index 1e250f8b7f..b9a092ccd7 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/RedstoneScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/RedstoneScriptEvent.java @@ -82,12 +82,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("location", location); - context.put("old_current", old_current); - context.put("new_current", new_current); - return context; + public dObject getContext(String name) { + if (name.equals("location")) { + return location; + } + else if (name.equals("old_current")) { + return old_current; + } + else if (name.equals("new_current")) { + return new_current; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java index cecfb5a52d..e81b6c1afd 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java @@ -71,12 +71,17 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - context.put("old_location", old_location); - context.put("new_location", new_location); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + else if (name.equals("old_location")) { + return old_location; + } + else if (name.equals("new_location")) { + return new_location; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java index ef19ad744f..de6c265cca 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java @@ -101,14 +101,23 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - context.put("location", location); - context.put("structure", structure); - context.put("blocks", blocks); - context.put("new_materials", new_materials); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + else if (name.equals("location")) { + return location; + } + else if (name.equals("structure")) { + return structure; + } + else if (name.equals("blocks")) { + return blocks; + } + else if (name.equals("new_materials")) { + return new_materials; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java index 0d849e5a4d..2ffd958f0e 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java @@ -80,11 +80,14 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - context.put("weather", weather); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + else if (name.equals("weather")) { + return weather; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/WorldInitsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/WorldInitsScriptEvent.java index 8a7fddf6d3..27fa86eb6d 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/WorldInitsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/WorldInitsScriptEvent.java @@ -71,10 +71,11 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/WorldLoadsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/WorldLoadsScriptEvent.java index dadc7c3454..6042964a2d 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/WorldLoadsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/WorldLoadsScriptEvent.java @@ -71,10 +71,11 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/WorldSavesScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/WorldSavesScriptEvent.java index aabb048771..222f710b2f 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/WorldSavesScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/WorldSavesScriptEvent.java @@ -73,10 +73,11 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true) diff --git a/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java index 768c80299b..3351e5d4e6 100644 --- a/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java @@ -73,10 +73,11 @@ public boolean applyDetermination(ScriptContainer container, String determinatio } @Override - public HashMap getContext() { - HashMap context = super.getContext(); - context.put("world", world); - return context; + public dObject getContext(String name) { + if (name.equals("world")) { + return world; + } + return super.getContext(name); } @EventHandler(ignoreCancelled = true)