CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Thinkofdeath 2015-01-25 14:44:52 +00:00 committed by Zach Brown
parent a131bfb513
commit d7dbedcf72
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 572ada533f8279e545e6cd0c410c7de76c384a76 Mon Sep 17 00:00:00 2001
From 3f2bae5366aa36f78b4070aebecd75e9ae8ffb4c 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
@ -161,14 +161,13 @@ index d3ae91b..0b71b53 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 5584353..8f5689f 100644
index c4db462..fa6e826 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
@@ -194,4 +194,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
return getScoreboard();
@@ -214,5 +214,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
}
+
+ // Spigot start
+ @Override
+ public Set<String> getEntries() throws IllegalStateException {
@ -190,6 +189,7 @@ index 5584353..8f5689f 100644
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ // Spigot end
}
--
2.1.0

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

@ -1,11 +1,11 @@
From 6ace60478f1178d155552acc7e2c436d0d22fe6c Mon Sep 17 00:00:00 2001
From 173fc91abf944fa69ca8f3eebbc98ff71309cd4a 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 8f5689f..2a9bffc 100644
index fa6e826..a44c160 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
@@ -117,6 +117,19 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
@ -83,9 +83,9 @@ index 8f5689f..2a9bffc 100644
}
@Override
@@ -194,26 +229,4 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
return getScoreboard();
@@ -213,27 +248,6 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
final CraftTeam other = (CraftTeam) obj;
return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
}
-
- // Spigot start
@ -108,7 +108,8 @@ index 8f5689f..2a9bffc 100644
- public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
- throw new UnsupportedOperationException("Not supported yet.");
- }
- // Spigot end
// Spigot end
}
--
2.1.0