39 Zeilen
1.8 KiB
Diff
39 Zeilen
1.8 KiB
Diff
From 5edd0028e03561e889fdde9dcea3cdd732dc6ba3 Mon Sep 17 00:00:00 2001
|
|
From: Steve Anton <anxuiz.nx@gmail.com>
|
|
Date: Thu, 3 Mar 2016 00:09:38 -0600
|
|
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 7939208a5a..f904e1c28d 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -109,7 +109,22 @@ public abstract class PlayerList {
|
|
}
|
|
// CraftBukkit end
|
|
|
|
- entityplayer.spawnIn(worldserver);
|
|
+ // Paper start - support PlayerInitialSpawnEvent
|
|
+ Location originalLoc = new Location(entityplayer.world.getWorld(), entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
|
|
+ com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent event = new com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent(entityplayer.getBukkitEntity(), originalLoc);
|
|
+ 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();
|
|
+ entityplayer.dimension = ((CraftWorld) newLoc.getWorld()).getHandle().dimension;
|
|
+ // Paper end
|
|
+
|
|
+ entityplayer.spawnIn(((CraftWorld) newLoc.getWorld()).getHandle());
|
|
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
|
|
String s1 = "local";
|
|
|
|
--
|
|
2.21.0
|
|
|