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

37 lines
1.7 KiB
Diff
Raw Normal View History

2017-07-17 02:36:27 +02:00
From aa6a5903956d14c43ff5c5871306a1cfb3b089a6 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
2017-07-17 02:36:27 +02:00
index b9920a5fc..b90407d18 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
2017-07-17 02:36:27 +02:00
@@ -110,6 +110,21 @@ public abstract class PlayerList {
2015-12-23 05:06:19 +01:00
}
// CraftBukkit end
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();
+ entityplayer.dimension = ((CraftWorld) newLoc.getWorld()).getHandle().dimension;
2016-03-01 00:09:49 +01:00
+ // Paper end
2015-12-23 05:06:19 +01:00
+
entityplayer.spawnIn(this.server.getWorldServer(entityplayer.dimension));
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
String s1 = "local";
--
2017-05-14 20:05:01 +02:00
2.13.0
2015-12-23 05:06:19 +01:00