From 9fdd2c667eaed14f251090d9721506d7f8dbf918 Mon Sep 17 00:00:00 2001 From: luisc Date: Tue, 24 Sep 2024 13:16:06 -0500 Subject: [PATCH] Fixed changes from api-changes being dragged into the dev branch. Created a new api-changes branch in the api repo. --- java/noppes/npcs/api/entity/ICustomNpc.java | 8 ++++---- java/noppes/npcs/api/event/IDialogEvent.java | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/java/noppes/npcs/api/entity/ICustomNpc.java b/java/noppes/npcs/api/entity/ICustomNpc.java index ddcc35d..d298ae7 100644 --- a/java/noppes/npcs/api/entity/ICustomNpc.java +++ b/java/noppes/npcs/api/entity/ICustomNpc.java @@ -890,19 +890,19 @@ public interface ICustomNpc extends IEntityLiving { void setFlySpeed(double flySpeed); - double getFlySpeed(); + double getFlySpeed(double unused); void setFlyGravity(double flyGravity); - double getFlyGravity(); + double getFlyGravity(double unused); void setFlyHeightLimit(int flyHeightLimit); - int getFlyHeightLimit(); + int getFlyHeightLimit(int unused); void limitFlyHeight(boolean limit); - boolean isFlyHeightLimited(); + boolean isFlyHeightLimited(boolean unused); void setSpeed(double speed); diff --git a/java/noppes/npcs/api/event/IDialogEvent.java b/java/noppes/npcs/api/event/IDialogEvent.java index f373254..691a730 100644 --- a/java/noppes/npcs/api/event/IDialogEvent.java +++ b/java/noppes/npcs/api/event/IDialogEvent.java @@ -13,14 +13,8 @@ public interface IDialogEvent extends IPlayerEvent { @Cancelable interface DialogOption extends IDialogEvent { - - int getOptionId(); - - void setOptionId(int optionId); } interface DialogClosed extends IDialogEvent { - - int getOptionId(); } }