mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 15:47:44 +01:00
5b6dfb3463
This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
From 53913c2c055fcc06fd10b3a19756ba50b7db68f9 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 1e3dd22e5..23562388a 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -110,6 +110,21 @@ public abstract class PlayerList {
|
|
}
|
|
// CraftBukkit end
|
|
|
|
+ // 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(this.server.getWorldServer(entityplayer.dimension));
|
|
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
|
|
String s1 = "local";
|
|
--
|
|
2.18.0
|
|
|