2017-08-05 14:35:25 +10:00
|
|
|
From ea0151f7fb4eb99670d9ea58e8538d0692aa795a Mon Sep 17 00:00:00 2001
|
2014-04-12 14:18:37 +10:00
|
|
|
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
|
2017-08-03 23:00:00 +10:00
|
|
|
index de20b9e0..8319bf17 100644
|
2014-04-12 14:18:37 +10:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2017-07-26 13:22:16 +10:00
|
|
|
@@ -628,6 +628,11 @@ public abstract class PlayerList {
|
2014-11-26 08:27:08 +11:00
|
|
|
Player respawnPlayer = cserver.getPlayer(entityplayer1);
|
2014-04-12 14:18:37 +10:00
|
|
|
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
|
2014-11-26 08:27:08 +11:00
|
|
|
cserver.getPluginManager().callEvent(respawnEvent);
|
2014-04-12 14:18:37 +10:00
|
|
|
+ // Spigot Start
|
|
|
|
+ if (entityplayer.playerConnection.isDisconnected()) {
|
|
|
|
+ return entityplayer;
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
|
|
|
|
location = respawnEvent.getRespawnLocation();
|
|
|
|
entityplayer.reset();
|
|
|
|
--
|
2017-04-22 15:54:44 +10:00
|
|
|
2.11.0
|
2014-04-12 14:18:37 +10:00
|
|
|
|