testserver/CraftBukkit-Patches/0035-Prevent-Ghost-Players-...

27 lines
1.1 KiB
Diff
Raw Normal View History

2015-04-09 03:18:56 +00:00
From 7dad14b7d0d5b10a24d61b41be648f62e8818acf 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
2015-04-09 03:18:56 +00:00
index 146e186..38c904c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2015-02-28 11:36:22 +00:00
@@ -548,6 +548,11 @@ public abstract class PlayerList {
2014-11-28 01:17:45 +00:00
Player respawnPlayer = cserver.getPlayer(entityplayer1);
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
2014-11-28 01:17:45 +00:00
cserver.getPluginManager().callEvent(respawnEvent);
+ // Spigot Start
+ if (entityplayer.playerConnection.isDisconnected()) {
+ return entityplayer;
+ }
+ // Spigot End
location = respawnEvent.getRespawnLocation();
entityplayer.reset();
--
2014-11-28 01:17:45 +00:00
2.1.0