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

42 lines
1.9 KiB
Diff
Raw Normal View History

From 4510314cc31ddd479cc96a32804bd8e2846bc528 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
2016-07-08 11:22:17 +10:00
index f5c48a1..330b8ab 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2016-05-10 21:48:25 +10:00
@@ -37,6 +37,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
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 {
2016-05-10 21:48:25 +10:00
@@ -106,6 +107,19 @@ public abstract class PlayerList {
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());
+ entityplayer.setYawPitch(loc.getYaw(), loc.getPitch());
+ // Spigot end
+
// CraftBukkit - Moved message to after join
2016-06-09 11:43:56 +10:00
// PlayerList.f.info("{}[{}] logged in with entity id {} at ({}, {}, {})", new Object[] { entityplayer.getName(), s1, Integer.valueOf(entityplayer.getId()), Double.valueOf(entityplayer.locX), Double.valueOf(entityplayer.locY), Double.valueOf(entityplayer.locZ)});
WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
--
2016-05-10 21:48:25 +10:00
2.7.4