core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't fire worldborder events for virtual borders (#7749) 

Fixes #7748
This commit is contained in:
Nassim Jahnke 2022-04-18 11:26:18 +02:00 committed by GitHub
parent af943641e2
commit 6b9f7a073e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
patches/server/0602-Add-worldborder-events.patch
View File

@ -5,85 +5,68 @@ Subject: [PATCH] Add worldborder events
diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
index 2442c287a7f26cfee10a19e9015558cdebdcf3ac..3063a45e5d124d4405e940daff24877866165d3f 100644 index 2442c287a7f26cfee10a19e9015558cdebdcf3ac..7a12a4da4864306ec6589ca81368e84718825047 100644
--- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java --- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
+++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java +++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
@@ -123,15 +123,19 @@ public class WorldBorder { @@ -123,6 +123,14 @@ public class WorldBorder {
} }
public void setCenter(double x, double z) { public void setCenter(double x, double z) {
- this.centerX = x;
- this.centerZ = z;
+ // Paper start + // Paper start
+ io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), new org.bukkit.Location(world.getWorld(), this.getCenterX(), 0, this.getCenterZ()), new org.bukkit.Location(world.getWorld(), x, 0, z)); + if (this.world != null) {
+ if (!event.callEvent()) return; + io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), new org.bukkit.Location(world.getWorld(), this.getCenterX(), 0, this.getCenterZ()), new org.bukkit.Location(world.getWorld(), x, 0, z));
+ this.centerX = event.getNewCenter().getX(); + if (!event.callEvent()) return;
+ this.centerZ = event.getNewCenter().getZ(); + x = event.getNewCenter().getX();
+ z = event.getNewCenter().getZ();
+ }
+ // Paper end + // Paper end
this.centerX = x;
this.centerZ = z;
this.extent.onCenterChange(); this.extent.onCenterChange();
Iterator iterator = this.getListeners().iterator(); @@ -149,6 +157,17 @@ public class WorldBorder {
while (iterator.hasNext()) {
BorderChangeListener iworldborderlistener = (BorderChangeListener) iterator.next();
- iworldborderlistener.onBorderCenterSet(this, x, z);
+ iworldborderlistener.onBorderCenterSet(this, event.getNewCenter().getX(), event.getNewCenter().getZ()); // Paper
}
}
@@ -149,25 +153,43 @@ public class WorldBorder {
} }
public void setSize(double size) { public void setSize(double size) {
- this.extent = new WorldBorder.StaticBorderExtent(size);
+ // Paper start + // Paper start
+ io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE, getSize(), size, 0); + if (this.world != null) {
+ if (!event.callEvent()) return; + io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE, getSize(), size, 0);
+ if (event.getType() == io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE && event.getDuration() > 0) { // If changed to a timed transition + if (!event.callEvent()) return;
+ lerpSizeBetween(event.getOldSize(), event.getNewSize(), event.getDuration()); + if (event.getType() == io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE && event.getDuration() > 0) { // If changed to a timed transition
+ return; + lerpSizeBetween(event.getOldSize(), event.getNewSize(), event.getDuration());
+ return;
+ }
+ size = event.getNewSize();
+ } + }
+ this.extent = new WorldBorder.StaticBorderExtent(event.getNewSize());
+ // Paper end + // Paper end
this.extent = new WorldBorder.StaticBorderExtent(size);
Iterator iterator = this.getListeners().iterator(); Iterator iterator = this.getListeners().iterator();
while (iterator.hasNext()) { @@ -161,6 +180,20 @@ public class WorldBorder {
BorderChangeListener iworldborderlistener = (BorderChangeListener) iterator.next();
- iworldborderlistener.onBorderSizeSet(this, size);
+ iworldborderlistener.onBorderSizeSet(this, event.getNewSize()); // Paper
}
} }
public void lerpSizeBetween(double fromSize, double toSize, long time) { public void lerpSizeBetween(double fromSize, double toSize, long time) {
- this.extent = (WorldBorder.BorderExtent) (fromSize == toSize ? new WorldBorder.StaticBorderExtent(toSize) : new WorldBorder.MovingBorderExtent(fromSize, toSize, time));
+ // Paper start + // Paper start
+ io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type type; + if (this.world != null) {
+ if (fromSize == toSize) { // new size = old size + io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type type;
+ type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE; // Use INSTANT_MOVE because below it creates a Static border if they are equal. + if (fromSize == toSize) { // new size = old size
+ } else { + type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE; // Use INSTANT_MOVE because below it creates a Static border if they are equal.
+ type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE; + } else {
+ type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE;
+ }
+ io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), type, fromSize, toSize, time);
+ if (!event.callEvent()) return;
+ toSize = event.getNewSize();
+ time = event.getDuration();
+ } + }
+ io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), type, fromSize, toSize, time);
+ if (!event.callEvent()) return;
+ this.extent = (WorldBorder.BorderExtent) (fromSize == event.getNewSize() ? new WorldBorder.StaticBorderExtent(event.getNewSize()) : new WorldBorder.MovingBorderExtent(fromSize, event.getNewSize(), event.getDuration()));
+ // Paper end + // Paper end
this.extent = (WorldBorder.BorderExtent) (fromSize == toSize ? new WorldBorder.StaticBorderExtent(toSize) : new WorldBorder.MovingBorderExtent(fromSize, toSize, time));
Iterator iterator = this.getListeners().iterator(); Iterator iterator = this.getListeners().iterator();
while (iterator.hasNext()) { @@ -472,6 +505,7 @@ public class WorldBorder {
BorderChangeListener iworldborderlistener = (BorderChangeListener) iterator.next();
- iworldborderlistener.onBorderSizeLerping(this, fromSize, toSize, time);
+ iworldborderlistener.onBorderSizeLerping(this, fromSize, event.getNewSize(), event.getDuration()); // Paper
}
}
@@ -472,6 +494,7 @@ public class WorldBorder {
@Override @Override
public WorldBorder.BorderExtent update() { public WorldBorder.BorderExtent update() {
+ if (this.getLerpRemainingTime() <= 0L) new io.papermc.paper.event.world.border.WorldBorderBoundsChangeFinishEvent(world.getWorld(), world.getWorld().getWorldBorder(), this.from, this.to, this.lerpDuration).callEvent(); // Paper + if (world != null && this.getLerpRemainingTime() <= 0L) new io.papermc.paper.event.world.border.WorldBorderBoundsChangeFinishEvent(world.getWorld(), world.getWorld().getWorldBorder(), this.from, this.to, this.lerpDuration).callEvent(); // Paper
return (WorldBorder.BorderExtent) (this.getLerpRemainingTime() <= 0L ? WorldBorder.this.new StaticBorderExtent(this.to) : this); return (WorldBorder.BorderExtent) (this.getLerpRemainingTime() <= 0L ? WorldBorder.this.new StaticBorderExtent(this.to) : this);
} }