spigot/CraftBukkit-Patches/0067-Implement-PlayerSpawnLocationEvent.patch

35 lines
1.6 KiB
Diff
Raw Normal View History

2021-03-09 08:47:45 +11:00
From a862285f9138685c47633a2a783966f57213b288 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:05:19 +0200
Subject: [PATCH] Implement PlayerSpawnLocationEvent.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2021-03-09 08:47:45 +11:00
index c8c4b0438..705cdd7ed 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2021-03-09 08:47:45 +11:00
@@ -134,6 +134,20 @@ public abstract class PlayerList {
s1 = networkmanager.getSocketAddress().toString();
}
+ // Spigot start - spawn location event
+ Player bukkitPlayer = entityplayer.getBukkitEntity();
2021-03-09 08:47:45 +11:00
+ org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new org.spigotmc.event.player.PlayerSpawnLocationEvent(bukkitPlayer, bukkitPlayer.getLocation());
+ cserver.getPluginManager().callEvent(ev);
+
+ Location loc = ev.getSpawnLocation();
+ worldserver1 = ((CraftWorld) loc.getWorld()).getHandle();
+
+ entityplayer.spawnIn(worldserver1);
+ entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
+ entityplayer.setPosition(loc.getX(), loc.getY(), loc.getZ());
+ entityplayer.setYawPitch(loc.getYaw(), loc.getPitch());
+ // Spigot end
+
// CraftBukkit - Moved message to after join
2019-12-11 09:00:00 +11:00
// PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX(), entityplayer.locY(), entityplayer.locZ());
2020-06-25 10:00:00 +10:00
WorldData worlddata = worldserver1.getWorldData();
--
2.25.1