From f78b1cd8d49b8f35473d1a847f5ae8e5eddb3647 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 28 Jun 2014 16:57:35 -0500 Subject: [PATCH] Remove 0017 - potentially causing issues on respawn with plugins --- ...h => 0017-Actually-fix-TNT-movement.patch} | 0 ...Do-not-remove-player-in-world-change.patch | 31 ------------------- ...ie-sieges-and-their-spawn-mechanics.patch} | 0 3 files changed, 31 deletions(-) rename CraftBukkit-Patches/{0018-Actually-fix-TNT-movement.patch => 0017-Actually-fix-TNT-movement.patch} (100%) delete mode 100644 CraftBukkit-Patches/0017-Do-not-remove-player-in-world-change.patch rename CraftBukkit-Patches/{0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch => 0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch} (100%) diff --git a/CraftBukkit-Patches/0018-Actually-fix-TNT-movement.patch b/CraftBukkit-Patches/0017-Actually-fix-TNT-movement.patch similarity index 100% rename from CraftBukkit-Patches/0018-Actually-fix-TNT-movement.patch rename to CraftBukkit-Patches/0017-Actually-fix-TNT-movement.patch diff --git a/CraftBukkit-Patches/0017-Do-not-remove-player-in-world-change.patch b/CraftBukkit-Patches/0017-Do-not-remove-player-in-world-change.patch deleted file mode 100644 index 2a9a65a282..0000000000 --- a/CraftBukkit-Patches/0017-Do-not-remove-player-in-world-change.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 09f43d297f1e89124a97532b0c02750b0f154fe9 Mon Sep 17 00:00:00 2001 -From: T00thpick1 -Date: Mon, 23 Jun 2014 21:37:24 -0500 -Subject: [PATCH] Do not remove player in world change - - -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a4a59ee..a723f3b 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -452,7 +452,7 @@ public abstract class PlayerList { - entityplayer.r().getTracker().untrackPlayer(entityplayer); - // entityplayer.r().getTracker().untrackEntity(entityplayer); // CraftBukkit - entityplayer.r().getPlayerChunkMap().removePlayer(entityplayer); -- this.players.remove(entityplayer); -+ // this.players.remove(entityplayer); // PaperSpigot -- Fixes BUKKIT-4561 and BUKKIT-4082 and BUKKIT-2094 - this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer); - ChunkCoordinates chunkcoordinates = entityplayer.getBed(); - boolean flag1 = entityplayer.isRespawnForced(); -@@ -547,7 +547,7 @@ public abstract class PlayerList { - if (!entityplayer.playerConnection.isDisconnected()) { - worldserver.getPlayerChunkMap().addPlayer(entityplayer1); - worldserver.addEntity(entityplayer1); -- this.players.add(entityplayer1); -+ // this.players.add(entityplayer1); // PaperSpigot -- Fixes BUKKIT-4561 and BUKKIT-4082 and BUKKIT-2094 - } - // Added from changeDimension - this.updateClient(entityplayer1); // Update health, etc... --- -1.9.1 - diff --git a/CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch b/CraftBukkit-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch similarity index 100% rename from CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch rename to CraftBukkit-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch