2019-05-28 06:30:00 +10:00
From 7e579d85157d7fae3a68c26e06223912e7759a2a Mon Sep 17 00:00:00 2001
2014-04-08 14:06:25 +02:00
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
2019-05-28 06:30:00 +10:00
index e9293e932..8f9049b4f 100644
2014-04-08 14:06:25 +02:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2019-04-25 12:00:00 +10:00
@@ -38,6 +38,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
2014-04-08 14:06:25 +02:00
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.util.Vector;
+import org.spigotmc.event.player.PlayerSpawnLocationEvent;
// CraftBukkit end
public abstract class PlayerList {
2019-04-25 12:00:00 +10:00
@@ -114,6 +115,19 @@ public abstract class PlayerList {
2014-04-08 14:06:25 +02:00
s1 = networkmanager.getSocketAddress().toString();
}
+ // Spigot start - spawn location event
+ Player bukkitPlayer = entityplayer.getBukkitEntity();
+ PlayerSpawnLocationEvent ev = new PlayerSpawnLocationEvent(bukkitPlayer, bukkitPlayer.getLocation());
+ Bukkit.getPluginManager().callEvent(ev);
+
+ Location loc = ev.getSpawnLocation();
+ WorldServer world = ((CraftWorld) loc.getWorld()).getHandle();
+
+ entityplayer.spawnIn(world);
+ entityplayer.setPosition(loc.getX(), loc.getY(), loc.getZ());
2019-04-23 14:06:57 +10:00
+ entityplayer.setYawPitch(loc.getYaw(), loc.getPitch());
2014-04-08 14:06:25 +02:00
+ // Spigot end
+
// CraftBukkit - Moved message to after join
2019-04-25 12:00:00 +10:00
// PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
2019-04-23 12:00:00 +10:00
WorldData worlddata = worldserver.getWorldData();
2014-04-08 14:06:25 +02:00
--
2019-04-23 09:33:25 +10:00
2.20.1
2014-04-08 14:06:25 +02:00