Merge

2015-01-17 10:12:14 +11:00
parent 65c90b951a
commit 020079df9a
3 changed files with 5 additions and 17 deletions
--- a/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
+++ b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
@@ -84,8 +84,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 
     @Override
@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-                 throw new IllegalArgumentException("Unknown visibility level " + visibility);
-         }
+ 
+         return getScoreboard();
     }
 -
 -    // Spigot start