2019-06-21 20:00:00 +10:00
|
|
|
From 9081c8661184d17edfc36523ee0d053464462754 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
|
2019-06-21 20:00:00 +10:00
|
|
|
index fe7b2bd32..e55aff329 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
|
2019-05-12 11:18:39 +10:00
|
|
|
@@ -611,6 +611,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();
|
2019-04-27 16:09:31 +10:00
|
|
|
if (!flag) entityplayer.reset(); // SPIGOT-4785
|
2014-04-12 14:18:37 +10:00
|
|
|
--
|
2019-04-23 09:33:25 +10:00
|
|
|
2.20.1
|
2014-04-12 14:18:37 +10:00
|
|
|
|