remove redundant "cancelled = false" lines

DenizenScript · Jan 24, 2023 · 6eabf01 · 6eabf01
1 parent 1603d42
commit 6eabf01
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 14 deletions.
diff --git a/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java b/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java
@@ -108,7 +108,6 @@ public void onPlayerItemBreak(PlayerItemBreakEvent event) {
         }
         item = new ItemTag(event.getBrokenItem());
         this.event = event;
-        cancelled = false;
         fire(event);
     }
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java
@@ -94,7 +94,6 @@ public void onPlayerChangesXP(PlayerExpChangeEvent event) {
         }
         player = PlayerTag.mirrorBukkitPlayer(event.getPlayer());
         this.event = event;
-        cancelled = false;
         fire(event);
     }
 }
diff --git a/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerCraftsItemScriptEvent.java b/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerCraftsItemScriptEvent.java
@@ -156,7 +156,6 @@ public void onCraftItem(CraftItemEvent event) {
             result = new ItemTag(event.getRecipe().getResult());
         }
         this.player = EntityTag.getPlayerFrom(humanEntity);
-        this.cancelled = false;
         fire(event);
     }
 }
diff --git a/...ain/java/com/denizenscript/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java b/...ain/java/com/denizenscript/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java
@@ -116,7 +116,6 @@ public void onCraftItem(PrepareAnvilEvent event) {
         this.event = event;
         result = new ItemTag(event.getResult());
         this.player = EntityTag.getPlayerFrom(humanEntity);
-        this.cancelled = false;
         fire(event);
     }
 }
diff --git a/...rc/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java b/...rc/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java
@@ -39,7 +39,7 @@ public class PlayerRaiseLowerItemScriptEvent extends BukkitScriptEvent implement
     //
     // @Warning For 'lowers', the item may be tracked incorrectly. Prefer 'player lowers item' (the generic item form) for a 'lowers' event (similar for 'toggles').
     // Also be aware this event may misfire in some cases.
-    // This event and it's data are more accurate on Paper servers.
+    // This event and its data are more accurate on Paper servers.
     //
     // @Context
     // <context.state> returns an ElementTag(Boolean) of whether the player raised or lowered the item.
@@ -112,7 +112,6 @@ public void destroy() {
     }
 
     public void run(Player pl) {
-        cancelled = false;
         player = new PlayerTag(pl);
         if (raisableItems.contains(player.getHeldItem().getBukkitMaterial()) || !raisableItems.contains(player.getOffhandItem().getBukkitMaterial())) {
             item = player.getHeldItem();

diff --git a/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerSmithsItemScriptEvent.java b/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerSmithsItemScriptEvent.java
@@ -101,7 +101,6 @@ public void onCraftItem(SmithItemEvent event) {
         this.event = event;
         result = new ItemTag(event.getInventory().getResult());
         this.player = EntityTag.getPlayerFrom(humanEntity);
-        this.cancelled = false;
         fire(event);
     }
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java
@@ -101,7 +101,6 @@ public void onPlayerThrowsEgg(PlayerEggThrowEvent event) {
         EntityTag.rememberEntity(eggEntity);
         egg = new EntityTag(event.getEgg());
         this.event = event;
-        cancelled = false;
         fire(event);
         EntityTag.forgetEntity(eggEntity);
     }

diff --git a/.../java/com/denizenscript/denizen/events/player/PlayersPrepareSmithingTableScriptEvent.java b/.../java/com/denizenscript/denizen/events/player/PlayersPrepareSmithingTableScriptEvent.java
@@ -104,7 +104,6 @@ public void onCraftItem(PrepareSmithingEvent event) {
         this.event = event;
         result = new ItemTag(event.getResult());
         this.player = EntityTag.getPlayerFrom(humanEntity);
-        this.cancelled = false;
         fire(event);
     }
 }
diff --git a/...n/src/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptHelper.java b/...n/src/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptHelper.java
@@ -35,7 +35,6 @@ public void onEntityDeath(EntityDeathEvent event) {
         EntityTag.rememberEntity(entity);
         EntityDespawnScriptEvent.instance.entity = new EntityTag(entity);
         EntityDespawnScriptEvent.instance.cause = new ElementTag("DEATH");
-        EntityDespawnScriptEvent.instance.cancelled = false;
         EntityDespawnScriptEvent.instance.fire();
         EntityTag.forgetEntity(entity);
     }
@@ -53,7 +52,6 @@ public void onChunkUnload(ChunkUnloadEvent event) {
                 EntityTag.rememberEntity(ent);
                 EntityDespawnScriptEvent.instance.entity = new EntityTag(ent);
                 EntityDespawnScriptEvent.instance.cause = new ElementTag("CHUNK_UNLOAD");
-                EntityDespawnScriptEvent.instance.cancelled = false;
                 EntityDespawnScriptEvent.instance.fire();
                 EntityTag.forgetEntity(ent);
             }

diff --git a/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java b/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java
@@ -102,7 +102,6 @@ public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
         if (fakeSignExpected != null && packet.getPos().equals(fakeSignExpected)) {
             fakeSignExpected = null;
             PlayerChangesSignScriptEvent evt = (PlayerChangesSignScriptEvent) PlayerChangesSignScriptEvent.instance.clone();
-            evt.cancelled = false;
             evt.material = new MaterialTag(org.bukkit.Material.OAK_WALL_SIGN);
             evt.location = new LocationTag(player.getBukkitEntity().getLocation());
             LocationTag loc = evt.location.clone();

diff --git a/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenPacketListenerImpl.java b/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenPacketListenerImpl.java
@@ -102,7 +102,6 @@ public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
         if (fakeSignExpected != null && packet.getPos().equals(fakeSignExpected)) {
             fakeSignExpected = null;
             PlayerChangesSignScriptEvent evt = (PlayerChangesSignScriptEvent) PlayerChangesSignScriptEvent.instance.clone();
-            evt.cancelled = false;
             evt.material = new MaterialTag(org.bukkit.Material.OAK_WALL_SIGN);
             evt.location = new LocationTag(player.getBukkitEntity().getLocation());
             LocationTag loc = evt.location.clone();

diff --git a/.../com/denizenscript/denizen/nms/v1_19/impl/network/handlers/DenizenPacketListenerImpl.java b/.../com/denizenscript/denizen/nms/v1_19/impl/network/handlers/DenizenPacketListenerImpl.java
@@ -102,7 +102,6 @@ public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
         if (fakeSignExpected != null && packet.getPos().equals(fakeSignExpected)) {
             fakeSignExpected = null;
             PlayerChangesSignScriptEvent evt = (PlayerChangesSignScriptEvent) PlayerChangesSignScriptEvent.instance.clone();
-            evt.cancelled = false;
             evt.material = new MaterialTag(org.bukkit.Material.OAK_WALL_SIGN);
             evt.location = new LocationTag(player.getBukkitEntity().getLocation());
             LocationTag loc = evt.location.clone();