mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
Fix PlayerRespawnEvent for multi-worlds
This commit is contained in:
parent
96435cfc76
commit
a124bfdab5
@ -15,6 +15,7 @@ import java.util.logging.Logger;
|
|||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
|
import org.bukkit.craftbukkit.CraftWorld;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.Event;
|
import org.bukkit.event.Event;
|
||||||
import org.bukkit.event.Event.Type;
|
import org.bukkit.event.Event.Type;
|
||||||
@ -168,11 +169,15 @@ public class ServerConfigurationManager {
|
|||||||
Location respawnLocation = new Location(respawnPlayer.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
|
Location respawnLocation = new Location(respawnPlayer.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
|
||||||
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(Event.Type.PLAYER_RESPAWN, respawnPlayer, respawnLocation );
|
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(Event.Type.PLAYER_RESPAWN, respawnPlayer, respawnLocation );
|
||||||
server.getPluginManager().callEvent(respawnEvent);
|
server.getPluginManager().callEvent(respawnEvent);
|
||||||
|
entityplayer1.world = ((CraftWorld)respawnEvent.getRespawnLocation().getWorld()).getHandle();
|
||||||
entityplayer1.locX = respawnEvent.getRespawnLocation().getX();
|
entityplayer1.locX = respawnEvent.getRespawnLocation().getX();
|
||||||
entityplayer1.locY = respawnEvent.getRespawnLocation().getY();
|
entityplayer1.locY = respawnEvent.getRespawnLocation().getY();
|
||||||
entityplayer1.locZ = respawnEvent.getRespawnLocation().getZ();
|
entityplayer1.locZ = respawnEvent.getRespawnLocation().getZ();
|
||||||
entityplayer1.yaw = respawnEvent.getRespawnLocation().getYaw();
|
entityplayer1.yaw = respawnEvent.getRespawnLocation().getYaw();
|
||||||
entityplayer1.pitch = respawnEvent.getRespawnLocation().getPitch();
|
entityplayer1.pitch = respawnEvent.getRespawnLocation().getPitch();
|
||||||
|
entityplayer1.c = new ItemInWorldManager(((CraftWorld)respawnEvent.getRespawnLocation().getWorld()).getHandle());
|
||||||
|
entityplayer1.c.a = entityplayer1;
|
||||||
|
((WorldServer)entityplayer1.world).A.d((int) entityplayer1.locX >> 4, (int) entityplayer1.locZ >> 4);
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
entityplayer1.a.b((Packet) (new Packet9Respawn()));
|
entityplayer1.a.b((Packet) (new Packet9Respawn()));
|
||||||
|
Loading…
Reference in New Issue
Block a user