5b4bc3081a
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
From 3c7258e5cfca3d6d3fe63c3debdc8afbc767925e Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 6960a29..5a39069 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1221,7 +1221,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
throw new IllegalStateException("Cannot set scoreboard yet");
|
|
}
|
|
if (playerConnection.isDisconnected()) {
|
|
- throw new IllegalStateException("Cannot set scoreboard for invalid CraftPlayer");
|
|
+ // throw new IllegalStateException("Cannot set scoreboard for invalid CraftPlayer"); // Spigot - remove this as Mojang's semi asynchronous Netty implementation can lead to races
|
|
}
|
|
|
|
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
|
|
--
|
|
1.9.1
|
|
|