SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge some stuff from upstream.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-02 17:54:35 +11:00
parent 04c83ec337
commit c936739c09
14 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
View File

@@ -1,14 +1,14 @@
From f28a0094dc8fe9667f4896e2594e5e1b762e8956 Mon Sep 17 00:00:00 2001
From 1d8a006504954d64b479160a09317204bfab7a33 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 03be384..3fcab5d 100644
index 1d2a080..5677a9b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1192,7 +1192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1193,7 +1193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {
@@ -18,5 +18,5 @@ index 03be384..3fcab5d 100644
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
--
1.8.5.2.msysgit.0
1.8.3.2