19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 39457860e637dd33e23a801f73808afb4f62a496 Mon Sep 17 00:00:00 2001
|
|
From: Alex Ciuba <alexciuba@gmail.com>
|
|
Date: Tue, 11 Jun 2013 15:23:03 -0400
|
|
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
|
|
|
|
Check if the player is still connected after firing event. Fixes BUKKIT-4327
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index 2b8a3e5..fe4121f 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -481,6 +481,11 @@ public abstract class PlayerList {
|
|
Player respawnPlayer = cserver.getPlayer(entityplayer1);
|
|
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
|
|
cserver.getPluginManager().callEvent(respawnEvent);
|
|
+ // Spigot Start
|
|
+ if (entityplayer.playerConnection.isDisconnected()) {
|
|
+ return entityplayer;
|
|
+ }
|
|
+ // Spigot End
|
|
|
|
location = respawnEvent.getRespawnLocation();
|
|
entityplayer.reset();
|
|
--
|
|
2.1.0
|
|
|