From 70d853f6710494da88d2ea5ba807ef25a2d5cb62 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Mon, 31 Mar 2025 05:27:52 +0800 Subject: [PATCH] improve api --- .../bukkit/api/event/CustomBlockAttemptPlaceEvent.java | 2 +- .../bukkit/api/event/CustomBlockBreakEvent.java | 2 +- .../bukkit/api/event/CustomBlockInteractEvent.java | 2 +- .../bukkit/api/event/CustomBlockPlaceEvent.java | 2 +- .../bukkit/api/event/FurnitureAttemptPlaceEvent.java | 2 +- .../craftengine/bukkit/api/event/FurnitureBreakEvent.java | 6 ++++++ .../bukkit/api/event/FurnitureInteractEvent.java | 7 ++++++- .../craftengine/bukkit/api/event/FurniturePlaceEvent.java | 2 +- .../bukkit/entity/furniture/LoadedFurniture.java | 4 ++-- 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockAttemptPlaceEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockAttemptPlaceEvent.java index 3a15366d0..af3683f71 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockAttemptPlaceEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockAttemptPlaceEvent.java @@ -64,7 +64,7 @@ public class CustomBlockAttemptPlaceEvent extends PlayerEvent implements Cancell @NotNull public Location location() { - return this.location; + return this.location.clone(); } @NotNull diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockBreakEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockBreakEvent.java index 041a8fc0b..03c0cc3b3 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockBreakEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockBreakEvent.java @@ -56,7 +56,7 @@ public class CustomBlockBreakEvent extends PlayerEvent implements Cancellable { @NotNull public Location location() { - return this.location; + return this.location.clone(); } @NotNull diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockInteractEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockInteractEvent.java index 6c7407690..71e55cb5d 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockInteractEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockInteractEvent.java @@ -81,7 +81,7 @@ public class CustomBlockInteractEvent extends PlayerEvent implements Cancellable @NotNull public Location location() { - return this.location; + return this.location.clone(); } @NotNull diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockPlaceEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockPlaceEvent.java index 1ebafc030..53ce67e2a 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockPlaceEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/CustomBlockPlaceEvent.java @@ -50,7 +50,7 @@ public class CustomBlockPlaceEvent extends PlayerEvent implements Cancellable { @NotNull public Location location() { - return this.location; + return this.location.clone(); } @NotNull diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureAttemptPlaceEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureAttemptPlaceEvent.java index dffa1872c..f77c77e12 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureAttemptPlaceEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureAttemptPlaceEvent.java @@ -65,7 +65,7 @@ public class FurnitureAttemptPlaceEvent extends PlayerEvent implements Cancellab @NotNull public Location location() { - return location; + return location.clone(); } @NotNull diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureBreakEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureBreakEvent.java index 824167492..013a25e7a 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureBreakEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureBreakEvent.java @@ -1,6 +1,7 @@ package net.momirealms.craftengine.bukkit.api.event; import net.momirealms.craftengine.bukkit.entity.furniture.LoadedFurniture; +import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; @@ -28,6 +29,11 @@ public class FurnitureBreakEvent extends PlayerEvent implements Cancellable { return this.furniture; } + @NotNull + public Location location() { + return this.furniture.location(); + } + @NotNull public static HandlerList getHandlerList() { return HANDLER_LIST; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureInteractEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureInteractEvent.java index 10b553242..053fa45f6 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureInteractEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureInteractEvent.java @@ -28,7 +28,7 @@ public class FurnitureInteractEvent extends PlayerEvent implements Cancellable { @NotNull public Location interactionPoint() { - return interactionPoint; + return this.interactionPoint.clone(); } @NotNull @@ -46,6 +46,11 @@ public class FurnitureInteractEvent extends PlayerEvent implements Cancellable { return this.furniture; } + @NotNull + public Location location() { + return this.furniture.location(); + } + @NotNull public static HandlerList getHandlerList() { return HANDLER_LIST; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurniturePlaceEvent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurniturePlaceEvent.java index 76b63d0fb..5c373aa03 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurniturePlaceEvent.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurniturePlaceEvent.java @@ -38,7 +38,7 @@ public class FurniturePlaceEvent extends PlayerEvent implements Cancellable { @NotNull public Location location() { - return this.location; + return this.location.clone(); } @NotNull diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java index 129ac2182..392c51e64 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java @@ -27,7 +27,7 @@ public class LoadedFurniture { private final CustomFurniture furniture; private final AnchorType anchorType; // location - private Location location; + private final Location location; // base entity private final WeakReference baseEntity; private final int baseEntityId; @@ -86,7 +86,7 @@ public class LoadedFurniture { @NotNull public Location location() { - return this.location; + return this.location.clone(); } @NotNull