diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index dbf081a2d2..2cb2177068 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -165,8 +165,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-                 throw new IllegalArgumentException("Unknown visibility level " + visibility);
-         }
+ 
+         return getScoreboard();
      }
 +
 +    // Spigot start
diff --git a/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
index 199a63b205..356c3ca1c1 100644
--- 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
diff --git a/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch
index a48fcb77a4..fdd83ba9e2 100644
--- a/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch
+++ b/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch
@@ -10,20 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 @@ -0,0 +0,0 @@ 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();
-@@ -0,0 +0,0 @@ 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;