PaperMC/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch

39 lines
1.8 KiB
Diff
Raw Normal View History

From 00076452a7fc4bedb2f956fdbde185911cb712e6 Mon Sep 17 00:00:00 2001
2015-12-23 05:06:19 +01:00
From: Steve Anton <anxuiz.nx@gmail.com>
2016-03-01 00:09:49 +01:00
Date: Thu, 3 Mar 2016 00:09:38 -0600
2015-12-23 05:06:19 +01:00
Subject: [PATCH] Add PlayerInitialSpawnEvent
For modifying a player's initial spawn location as they join the server
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index fc3422cca3..00bab3f758 100644
2015-12-23 05:06:19 +01:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2019-04-25 08:53:51 +02:00
@@ -109,7 +109,22 @@ public abstract class PlayerList {
2015-12-23 05:06:19 +01:00
}
// CraftBukkit end
2019-04-25 08:53:51 +02:00
- entityplayer.spawnIn(worldserver);
2016-03-01 00:09:49 +01:00
+ // Paper start - support PlayerInitialSpawnEvent
2015-12-23 05:06:19 +01:00
+ Location originalLoc = new Location(entityplayer.world.getWorld(), entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
2016-03-01 00:09:49 +01:00
+ com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent event = new com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent(entityplayer.getBukkitEntity(), originalLoc);
2015-12-23 05:06:19 +01:00
+ this.server.server.getPluginManager().callEvent(event);
+
+ Location newLoc = event.getSpawnLocation();
+ entityplayer.world = ((CraftWorld) newLoc.getWorld()).getHandle();
+ entityplayer.locX = newLoc.getX();
+ entityplayer.locY = newLoc.getY();
+ entityplayer.locZ = newLoc.getZ();
+ entityplayer.yaw = newLoc.getYaw();
+ entityplayer.pitch = newLoc.getPitch();
2019-05-14 04:20:58 +02:00
+ entityplayer.dimension = ((CraftWorld) newLoc.getWorld()).getHandle().worldProvider.getDimensionManager();
2016-03-01 00:09:49 +01:00
+ // Paper end
2015-12-23 05:06:19 +01:00
+
2019-04-25 08:53:51 +02:00
+ entityplayer.spawnIn(((CraftWorld) newLoc.getWorld()).getHandle());
2015-12-23 05:06:19 +01:00
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
String s1 = "local";
2019-04-25 08:53:51 +02:00
2015-12-23 05:06:19 +01:00
--
2019-04-23 06:47:07 +02:00
2.21.0
2015-12-23 05:06:19 +01:00