summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorFabian Faßbender <fabian.fassbender42@googlemail.com>2014-11-30 13:34:38 +0100
committerFabian Faßbender <fabian.fassbender42@googlemail.com>2014-11-30 13:34:38 +0100
commitcc0d8bb32722bce9ea87b60c8353f070eb51aa7d (patch)
treec74c498dd7ccfbe89a650da55b5b76fafb0b043a /nms-patches
parent6eb0c79271c6e50fc36972913250dfc5ad19d04f (diff)
downloadcraftbukkit-cc0d8bb32722bce9ea87b60c8353f070eb51aa7d.tar
craftbukkit-cc0d8bb32722bce9ea87b60c8353f070eb51aa7d.tar.gz
craftbukkit-cc0d8bb32722bce9ea87b60c8353f070eb51aa7d.tar.lz
craftbukkit-cc0d8bb32722bce9ea87b60c8353f070eb51aa7d.tar.xz
craftbukkit-cc0d8bb32722bce9ea87b60c8353f070eb51aa7d.zip
Update the correct Scoreboard Criteria when a health change comes in. This fixes SPIGOT-20
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityPlayer.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch
index 33d77767..d8fc2f5d 100644
--- a/nms-patches/EntityPlayer.patch
+++ b/nms-patches/EntityPlayer.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityPlayer.java 2014-11-28 17:43:43.149707434 +0000
-+++ src/main/java/net/minecraft/server/EntityPlayer.java 2014-11-28 17:38:18.000000000 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/EntityPlayer.java Sun Nov 30 12:33:51 2014
++++ src/main/java/net/minecraft/server/EntityPlayer.java Sun Nov 30 12:31:53 2014
@@ -13,6 +13,17 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -136,7 +136,7 @@
- this.getScoreboard().getPlayerScoreForObjective(this.getName(), scoreboardobjective).updateForList(Arrays.asList(new EntityHuman[] { this}));
- }
+ // CraftBukkit - Update ALL the scores!
-+ this.world.getServer().getScoreboardManager().updateAllScoresForList(IScoreboardCriteria.f, this.getName(), com.google.common.collect.ImmutableList.of(this));
++ this.world.getServer().getScoreboardManager().updateAllScoresForList(IScoreboardCriteria.g, this.getName(), com.google.common.collect.ImmutableList.of(this));
+ }
+ // CraftBukkit start - Force max health updates
+ if (this.maxHealthCache != this.getMaxHealth()) {