spigot/CraftBukkit-Patches/0035-Disable-Connected-Check-on-setScoreboard.patch

23 lines
1.3 KiB
Diff
Raw Normal View History

2023-06-13 07:00:00 +10:00
From d397ea6c632417654a154f8ec2aa10409984f911 Mon Sep 17 00:00:00 2001
2014-04-12 14:18:37 +10:00
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2023-06-13 07:00:00 +10:00
index 122be0c31..c2b606f75 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2023-06-13 07:00:00 +10:00
@@ -1803,7 +1803,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2023-06-12 19:41:07 +10:00
public void setScoreboard(Scoreboard scoreboard) {
Preconditions.checkArgument(scoreboard != null, "Scoreboard cannot be null");
Preconditions.checkState(getHandle().connection != null, "Cannot set scoreboard yet (invalid player connection)");
- Preconditions.checkState(getHandle().connection.isDisconnected(), "Cannot set scoreboard for invalid CraftPlayer (player is disconnected)");
+ // Preconditions.checkState(getHandle().connection.isDisconnected(), "Cannot set scoreboard for invalid CraftPlayer (player is disconnected)"); // Spigot - remove this as Mojang's semi asynchronous Netty implementation can lead to races
2014-04-12 14:18:37 +10:00
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
2023-06-12 19:41:07 +10:00
}
2014-04-12 14:18:37 +10:00
--
2023-05-11 07:10:33 +10:00
2.40.1
2014-04-12 14:18:37 +10:00