From 16d00c1e9f5b29fa4c29918b777ee0d15892d802 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 4 May 2021 11:55:29 +0200 Subject: [PATCH] Keep moveToWorld with old method signature --- .../add-RespawnFlags-to-PlayerRespawnEvent.patch | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/add-RespawnFlags-to-PlayerRespawnEvent.patch b/Spigot-Server-Patches/add-RespawnFlags-to-PlayerRespawnEvent.patch index 8ded1edfe4..b458277981 100644 --- a/Spigot-Server-Patches/add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/Spigot-Server-Patches/add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -25,8 +25,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return this.moveToWorld(entityplayer, this.server.getWorldServer(entityplayer.getSpawnDimension()), flag, null, true); } -- public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation) { -+ public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) { // Paper ++ // Paper start + public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation) { ++ return moveToWorld(entityplayer, worldserver, flag, location, avoidSuffocation, new org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag[0]); ++ } ++ ++ public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) { ++ // Paper end entityplayer.stopRiding(); // CraftBukkit this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getName().toLowerCase(java.util.Locale.ROOT)); // Spigot