summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-10 16:27:56 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-10 16:27:56 +0000
commit85e9ba780f5b6617340a8727a38483cbb731f00e (patch)
treef1c102308dedefbb7caaa3e4d9ebe445528f1499
parent3433eeadc2a408faacccd82b2db2f97c3c9f5dbd (diff)
downloadcraftbukkit-85e9ba780f5b6617340a8727a38483cbb731f00e.tar
craftbukkit-85e9ba780f5b6617340a8727a38483cbb731f00e.tar.gz
craftbukkit-85e9ba780f5b6617340a8727a38483cbb731f00e.tar.lz
craftbukkit-85e9ba780f5b6617340a8727a38483cbb731f00e.tar.xz
craftbukkit-85e9ba780f5b6617340a8727a38483cbb731f00e.zip
SPIGOT-173: Fix missed renames in EntityHuman
-rw-r--r--nms-patches/EntityHuman.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch
index 935dc5c0..ca770d2c 100644
--- a/nms-patches/EntityHuman.patch
+++ b/nms-patches/EntityHuman.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityHuman.java 2014-12-07 11:26:13.489010423 +0000
-+++ src/main/java/net/minecraft/server/EntityHuman.java 2014-12-07 11:25:50.801010669 +0000
+--- ../work/decompile-8eb82bde/net/minecraft/server/EntityHuman.java 2014-12-10 16:27:47.832575157 +0000
++++ src/main/java/net/minecraft/server/EntityHuman.java 2014-12-10 16:27:27.556575377 +0000
@@ -8,13 +8,27 @@
import java.util.List;
import java.util.UUID;
@@ -112,14 +112,14 @@
this.addScore(i);
- Collection collection = this.getScoreboard().getObjectivesForCriteria(IScoreboardCriteria.f);
+ // CraftBukkit - Get our scores instead
-+ Collection<ScoreboardScore> collection = this.world.getServer().getScoreboardManager().getScoreboardScores(IScoreboardCriteria.e, this.getName(), new java.util.ArrayList<ScoreboardScore>());
++ Collection<ScoreboardScore> collection = this.world.getServer().getScoreboardManager().getScoreboardScores(IScoreboardCriteria.f, this.getName(), new java.util.ArrayList<ScoreboardScore>());
+
if (entity instanceof EntityHuman) {
this.b(StatisticList.B);
- collection.addAll(this.getScoreboard().getObjectivesForCriteria(IScoreboardCriteria.e));
+ // CraftBukkit - Get our scores instead
-+ this.world.getServer().getScoreboardManager().getScoreboardScores(IScoreboardCriteria.d, this.getName(), collection);
++ this.world.getServer().getScoreboardManager().getScoreboardScores(IScoreboardCriteria.e, this.getName(), collection);
collection.addAll(this.e(entity));
} else {
this.b(StatisticList.z);