mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge

Browse source
This commit is contained in:
md_5 2015-01-17 10:12:14 +11:00 • committed by Zach Brown
parent d41f0754f0
commit 478838714f
4 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -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