mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 00:10:32 +01:00
71c84c8132
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
317 lines
9.1 KiB
Diff
317 lines
9.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Mon, 4 Jan 2021 22:40:26 -0800
|
|
Subject: [PATCH] Add worldborder events
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeEvent.java b/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..02ac479840c137ca5afcec149ef884e5a5d62928
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeEvent.java
|
|
@@ -0,0 +1,117 @@
|
|
+package io.papermc.paper.event.world.border;
|
|
+
|
|
+import org.bukkit.World;
|
|
+import org.bukkit.WorldBorder;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a world border changes its bounds, either over time, or instantly.
|
|
+ */
|
|
+public class WorldBorderBoundsChangeEvent extends WorldBorderEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private Type type;
|
|
+ private final double oldSize;
|
|
+ private double newSize;
|
|
+ private long duration;
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public WorldBorderBoundsChangeEvent(@NotNull World world, @NotNull WorldBorder worldBorder, @NotNull Type type, double oldSize, double newSize, long duration) {
|
|
+ super(world, worldBorder);
|
|
+ this.type = type;
|
|
+ this.oldSize = oldSize;
|
|
+ this.newSize = newSize;
|
|
+ this.duration = duration;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets if this change is an instant change or over-time change.
|
|
+ *
|
|
+ * @return the change type
|
|
+ */
|
|
+ @NotNull
|
|
+ public Type getType() {
|
|
+ return this.type;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the old size or the world border.
|
|
+ *
|
|
+ * @return the old size
|
|
+ */
|
|
+ public double getOldSize() {
|
|
+ return this.oldSize;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the new size of the world border.
|
|
+ *
|
|
+ * @return the new size
|
|
+ */
|
|
+ public double getNewSize() {
|
|
+ return this.newSize;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the new size of the world border.
|
|
+ *
|
|
+ * @param newSize the new size
|
|
+ */
|
|
+ public void setNewSize(double newSize) {
|
|
+ this.newSize = Math.min(this.worldBorder.getMaxSize(), Math.max(1.0D, newSize));
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the time in milliseconds for the change. Will be 0 if instant.
|
|
+ *
|
|
+ * @return the time in milliseconds for the change
|
|
+ */
|
|
+ public long getDuration() {
|
|
+ return this.duration;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the time in milliseconds for the change. Will change {@link #getType()} to return
|
|
+ * {@link Type#STARTED_MOVE}.
|
|
+ *
|
|
+ * @param duration the time in milliseconds for the change
|
|
+ */
|
|
+ public void setDuration(long duration) {
|
|
+ // PAIL: TODO: Magic Values
|
|
+ this.duration = Math.min(9223372036854775L, Math.max(0L, duration));
|
|
+ if (duration >= 0 && this.type == Type.INSTANT_MOVE) {
|
|
+ this.type = Type.STARTED_MOVE;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ public enum Type {
|
|
+ STARTED_MOVE,
|
|
+ INSTANT_MOVE
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeFinishEvent.java b/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeFinishEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..a44964593b7f78c5086dc4928e75ad892e624671
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeFinishEvent.java
|
|
@@ -0,0 +1,67 @@
|
|
+package io.papermc.paper.event.world.border;
|
|
+
|
|
+import org.bukkit.World;
|
|
+import org.bukkit.WorldBorder;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a moving world border has finished its move.
|
|
+ */
|
|
+public class WorldBorderBoundsChangeFinishEvent extends WorldBorderEvent {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final double oldSize;
|
|
+ private final double newSize;
|
|
+ private final double duration;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public WorldBorderBoundsChangeFinishEvent(@NotNull World world, @NotNull WorldBorder worldBorder, double oldSize, double newSize, double duration) {
|
|
+ super(world, worldBorder);
|
|
+ this.oldSize = oldSize;
|
|
+ this.newSize = newSize;
|
|
+ this.duration = duration;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the old size of the worldborder.
|
|
+ *
|
|
+ * @return the old size
|
|
+ */
|
|
+ public double getOldSize() {
|
|
+ return this.oldSize;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the new size of the worldborder.
|
|
+ *
|
|
+ * @return the new size
|
|
+ */
|
|
+ public double getNewSize() {
|
|
+ return this.newSize;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the duration this worldborder took to make the change.
|
|
+ * <p>
|
|
+ * Can be 0 if handlers for {@link WorldBorderCenterChangeEvent} set the duration to 0.
|
|
+ *
|
|
+ * @return the duration of the transition
|
|
+ */
|
|
+ public double getDuration() {
|
|
+ return this.duration;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java b/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..a90f67e902c6ae35b2399e6f72a3ff8a5c15d05a
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java
|
|
@@ -0,0 +1,79 @@
|
|
+package io.papermc.paper.event.world.border;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.World;
|
|
+import org.bukkit.WorldBorder;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a world border's center is changed.
|
|
+ */
|
|
+public class WorldBorderCenterChangeEvent extends WorldBorderEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final Location oldCenter;
|
|
+ private Location newCenter;
|
|
+
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public WorldBorderCenterChangeEvent(@NotNull World world, @NotNull WorldBorder worldBorder, @NotNull Location oldCenter, @NotNull Location newCenter) {
|
|
+ super(world, worldBorder);
|
|
+ this.oldCenter = oldCenter;
|
|
+ this.newCenter = newCenter;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the original center location of the world border.
|
|
+ *
|
|
+ * @return the old center
|
|
+ */
|
|
+ @NotNull
|
|
+ public Location getOldCenter() {
|
|
+ return this.oldCenter;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the new center location for the world border.
|
|
+ *
|
|
+ * @return the new center
|
|
+ */
|
|
+ @NotNull
|
|
+ public Location getNewCenter() {
|
|
+ return this.newCenter;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the new center location for the world border. Y coordinate is ignored.
|
|
+ *
|
|
+ * @param newCenter the new center
|
|
+ */
|
|
+ public void setNewCenter(@NotNull Location newCenter) {
|
|
+ this.newCenter = newCenter;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/io/papermc/paper/event/world/border/WorldBorderEvent.java b/src/main/java/io/papermc/paper/event/world/border/WorldBorderEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..adb244f9be35c43ff99dbc3a771e1fdfb21da68c
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/world/border/WorldBorderEvent.java
|
|
@@ -0,0 +1,23 @@
|
|
+package io.papermc.paper.event.world.border;
|
|
+
|
|
+import org.bukkit.World;
|
|
+import org.bukkit.WorldBorder;
|
|
+import org.bukkit.event.world.WorldEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+public abstract class WorldBorderEvent extends WorldEvent {
|
|
+
|
|
+ protected final WorldBorder worldBorder;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ protected WorldBorderEvent(@NotNull World world, @NotNull WorldBorder worldBorder) {
|
|
+ super(world);
|
|
+ this.worldBorder = worldBorder;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public WorldBorder getWorldBorder() {
|
|
+ return this.worldBorder;
|
|
+ }
|
|
+}
|