2021-04-07 15:03:34 +10:00
|
|
|
From fb6060c47f8e8b8c4c34eef19d0cdf2c90deaf3f 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
|
|
|
|
|
2021-03-16 09:00:00 +11:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
index 95f7a60e1..e8e5279a2 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
@@ -743,6 +743,11 @@ public abstract class PlayerList {
|
2014-11-26 08:27:08 +11:00
|
|
|
Player respawnPlayer = cserver.getPlayer(entityplayer1);
|
2020-07-03 09:58:39 +10:00
|
|
|
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2);
|
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
|
|
|
--
|
2020-05-09 18:48:11 +10:00
|
|
|
2.25.1
|
2014-04-12 14:18:37 +10:00
|
|
|
|