From 78357165a29884aa69db57c4c88c94956f5c9ac8 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:54:25 -0600 Subject: [PATCH] Marked events that can be cancelled as cancellable if they didn't have the annotation. --- src/api | 2 +- src/main/java/noppes/npcs/scripted/event/ItemEvent.java | 7 +++++++ src/main/java/noppes/npcs/scripted/event/PlayerEvent.java | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/api b/src/api index 1e10eb3b5..64a6d4695 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 1e10eb3b5217bf8c64ee1f364b0edc127f0e6643 +Subproject commit 64a6d4695824b1f7b3651a324412f9d455add10a diff --git a/src/main/java/noppes/npcs/scripted/event/ItemEvent.java b/src/main/java/noppes/npcs/scripted/event/ItemEvent.java index 925282dd7..c5196c78c 100644 --- a/src/main/java/noppes/npcs/scripted/event/ItemEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/ItemEvent.java @@ -168,6 +168,7 @@ public class ItemEvent extends CustomNPCsEvent implements IItemEvent { } } + @Cancelable public static class StartUsingItem extends ItemEvent implements IItemEvent.StartUsingItem { public final IPlayer player; public final int duration; @@ -190,6 +191,8 @@ public class ItemEvent extends CustomNPCsEvent implements IItemEvent { return duration; } } + + @Cancelable public static class UsingItem extends ItemEvent implements IItemEvent.UsingItem { public final IPlayer player; public final int duration; @@ -212,6 +215,8 @@ public class ItemEvent extends CustomNPCsEvent implements IItemEvent { return duration; } } + + @Cancelable public static class StopUsingItem extends ItemEvent implements IItemEvent.StopUsingItem { public final IPlayer player; public final int duration; @@ -234,6 +239,8 @@ public class ItemEvent extends CustomNPCsEvent implements IItemEvent { return duration; } } + + @Cancelable public static class FinishUsingItem extends ItemEvent implements IItemEvent.FinishUsingItem { public final IPlayer player; public final int duration; diff --git a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java index 2caedacaa..82160b963 100644 --- a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java @@ -665,6 +665,7 @@ public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { } } + @Cancelable public static class StartUsingItem extends PlayerEvent implements IPlayerEvent.StartUsingItem { public final IItemStack item; public final int duration; @@ -688,6 +689,8 @@ public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { return duration; } } + + @Cancelable public static class UsingItem extends PlayerEvent implements IPlayerEvent.UsingItem { public final IItemStack item; public final int duration; @@ -711,6 +714,8 @@ public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { return duration; } } + + @Cancelable public static class StopUsingItem extends PlayerEvent implements IPlayerEvent.StopUsingItem { public final IItemStack item; public final int duration; @@ -734,6 +739,7 @@ public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { return duration; } } + public static class FinishUsingItem extends PlayerEvent implements IPlayerEvent.FinishUsingItem { public final IItemStack item; public final int duration; @@ -938,6 +944,7 @@ public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { } } + @Cancelable public static class RangedChargeEvent extends PlayerEvent implements IPlayerEvent.RangedChargeEvent { public RangedChargeEvent(IPlayer player) { super(player);