aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch')
-rw-r--r--patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
new file mode 100644
index 0000000000..47d790e9ed
--- /dev/null
+++ b/patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+Date: Sat, 22 Aug 2020 23:36:21 +0200
+Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index df623f10def1ecf071971119f449a773063b3ce1..f079192644e3b366dc58c4a77c10cbbe65c25eca 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -1668,7 +1668,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+ float f1 = this.levelData.getSpawnAngle();
+
+ if (!blockposition1.equals(pos) || f1 != angle) {
++ org.bukkit.Location prevSpawnLoc = this.getWorld().getSpawnLocation(); // Paper - Call SpawnChangeEvent
+ this.levelData.setSpawn(pos, angle);
++ new org.bukkit.event.world.SpawnChangeEvent(this.getWorld(), prevSpawnLoc).callEvent(); // Paper - Call SpawnChangeEvent
+ this.getServer().getPlayerList().broadcastAll(new ClientboundSetDefaultSpawnPositionPacket(pos, angle));
+ }
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 630b3e9a9a89016846dba1b18ff68c11f1815685..2436d66fb3be1611885bf05b793975dc2aa1a2e8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -269,12 +269,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+ @Override
+ public boolean setSpawnLocation(int x, int y, int z, float angle) {
+ try {
+- Location previousLocation = this.getSpawnLocation();
+- this.world.levelData.setSpawn(new BlockPos(x, y, z), angle);
++ // Location previousLocation = this.getSpawnLocation(); // Paper - Call SpawnChangeEvent; moved to nms.ServerLevel
++ this.world.setDefaultSpawnPos(new BlockPos(x, y, z), angle); // Paper - use ServerLevel#setDefaultSpawnPos
+
++ // Paper start - Call SpawnChangeEvent; move to nms.ServerLevel
+ // Notify anyone who's listening.
+- SpawnChangeEvent event = new SpawnChangeEvent(this, previousLocation);
+- this.server.getPluginManager().callEvent(event);
++ // SpawnChangeEvent event = new SpawnChangeEvent(this, previousLocation);
++ // server.getPluginManager().callEvent(event);
++ // Paper end - Call SpawnChangeEvent
+
+ return true;
+ } catch (Exception e) {