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

Merge

Browse Source
This commit is contained in:
md_5
2015-01-17 10:12:14 +11:00
parent 65c90b951a
commit 020079df9a
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View File

@@ -165,8 +165,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
+++ b/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 { @@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
throw new IllegalArgumentException("Unknown visibility level " + visibility);
} return getScoreboard();
} }
+ +
+ // Spigot start + // Spigot start

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

@@ -84,8 +84,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@Override @Override
@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { @@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
throw new IllegalArgumentException("Unknown visibility level " + visibility);
} return getScoreboard();
} }
- -
- // Spigot start - // Spigot start

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

@@ -10,20 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
+++ b/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 { @@ -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 // Spigot start
- @Override @Override
+ @Override
public boolean isScoreSet() throws IllegalStateException { public boolean isScoreSet() throws IllegalStateException {
- throw new UnsupportedOperationException("Not supported yet."); - throw new UnsupportedOperationException("Not supported yet.");
+ Scoreboard board = objective.checkState().board; + Scoreboard board = objective.checkState().board;