Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-01 05:01:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Thinkofdeath 2015-01-25 14:44:52 +00:00
parent 553a96920a
commit ea2b36a864
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,10 +165,9 @@ 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 {
return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
return getScoreboard();
} }
+
+ // Spigot start + // Spigot start
+ @Override + @Override
+ public Set<String> getEntries() throws IllegalStateException { + public Set<String> getEntries() throws IllegalStateException {
@ -190,5 +189,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ throw new UnsupportedOperationException("Not supported yet."); + throw new UnsupportedOperationException("Not supported yet.");
+ } + }
+ // Spigot end + // Spigot end
} }
-- --

7
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 {
final CraftTeam other = (CraftTeam) obj;
return getScoreboard(); return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
} }
- -
- // Spigot start - // Spigot start
@ -108,6 +108,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException { - public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
- throw new UnsupportedOperationException("Not supported yet."); - throw new UnsupportedOperationException("Not supported yet.");
- } - }
- // Spigot end // Spigot end
} }
-- --