Merge

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From a9654381036acf78c53c250d77127e5e6523e212 Mon Sep 17 00:00:00 2001
+From 4ab376f74dcf329d15853816a39474ca11e93961 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -145,10 +145,10 @@ index 7ebb70b..e80fce2 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-index 7095f6d..c7d3657 100644
+index d3ae91b..0b71b53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-@@ -58,4 +58,11 @@ final class CraftScore implements Score {
+@@ -59,4 +59,11 @@ final class CraftScore implements Score {
      public CraftScoreboard getScoreboard() {
          return objective.getScoreboard();
      }
@@ -161,12 +161,12 @@ index 7095f6d..c7d3657 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index e8d1c08..ecbf66b 100644
+index 5584353..8f5689f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -188,4 +188,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-                 throw new IllegalArgumentException("Unknown visibility level " + visibility);
-         }
+@@ -194,4 +194,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+ 
+         return getScoreboard();
      }
 +
 +    // Spigot start

CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch

@@ -1,14 +1,14 @@
-From 9321311de10cf1a9733b0bcd2c644777a10d038e Mon Sep 17 00:00:00 2001
+From 6ace60478f1178d155552acc7e2c436d0d22fe6c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:22:22 +1000
 Subject: [PATCH] Expand team API to allow arbitrary strings.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index ecbf66b..7dd6138 100644
+index 8f5689f..2a9bffc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -118,6 +118,19 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+@@ -117,6 +117,19 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
          return players.build();
      }
  
@@ -28,7 +28,7 @@ index ecbf66b..7dd6138 100644
      public int getSize() throws IllegalStateException {
          CraftScoreboard scoreboard = checkState();
  
-@@ -126,28 +139,50 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+@@ -125,28 +138,50 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
  
      public void addPlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException {
          Validate.notNull(player, "OfflinePlayer cannot be null");
@@ -83,9 +83,9 @@ index ecbf66b..7dd6138 100644
      }
  
      @Override
-@@ -188,26 +223,4 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-                 throw new IllegalArgumentException("Unknown visibility level " + visibility);
-         }
+@@ -194,26 +229,4 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+ 
+         return getScoreboard();
      }
 -
 -    // Spigot start

CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch

@@ -1,4 +1,4 @@
-From 841b7b53e512708e6b7200f88dbe75f502239010 Mon Sep 17 00:00:00 2001
+From c018e8dde56684a2ec7e80ee2eedbcdff130e980 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:53 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.
@@ -6,24 +6,12 @@ Subject: [PATCH] Add Score.isScoreSet()Z API.
 Also fix generics on CraftScore.getScore()I.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-index c7d3657..05f72df 100644
+index 0b71b53..ee9d2ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-@@ -41,7 +41,7 @@ final class CraftScore implements Score {
-         Scoreboard board = objective.checkState().board;
- 
-         if (board.getPlayers().contains(entry)) { // Lazy
--            Map<String, ScoreboardScore> scores = board.getPlayerObjectives(entry);
-+            Map<net.minecraft.server.ScoreboardObjective, ScoreboardScore> scores = board.getPlayerObjectives(entry); // Spigot
-             ScoreboardScore score = scores.get(objective.getHandle());
-             if (score != null) { // Lazy
-                 return score.getScore();
-@@ -60,9 +60,11 @@ final class CraftScore implements Score {
-     }
- 
+@@ -63,7 +63,9 @@ final class CraftScore implements Score {
      // Spigot start
--    @Override
-+    @Override    
+     @Override
      public boolean isScoreSet() throws IllegalStateException {
 -        throw new UnsupportedOperationException("Not supported yet.");
 +        Scoreboard board = objective.checkState().board;

CraftBukkit-Patches/0120-Cap-Objective-Score-Length.patch

@@ -1,4 +1,4 @@
-From 575bb0335f1f0920a967f14bc27a354814bbb4c0 Mon Sep 17 00:00:00 2001
+From 489c751ca2ba787c57bca238092eef099c39b3fe Mon Sep 17 00:00:00 2001
 From: hauno <imhauno@gmail.com>
 Date: Tue, 6 May 2014 18:01:37 -0700
 Subject: [PATCH] Cap Objective Score Length
@@ -6,10 +6,10 @@ Subject: [PATCH] Cap Objective Score Length
 Adds a check for Score arguments that would crash the client
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
-index 9eaec71..992ef73 100644
+index 1171335..ba8c2d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
-@@ -95,6 +95,7 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective
+@@ -93,6 +93,7 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective
  
      public Score getScore(String entry) throws IllegalArgumentException, IllegalStateException {
          Validate.notNull(entry, "Entry cannot be null");