diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-30 17:10:32 +0200 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-30 17:10:32 +0200 |
| commit | 8b94fad772977bb3c5f367bccaf3a2a1f0edc3b1 (patch) | |
| tree | 12e2edb02c1ea1306c1f726d3dcd30df0dac54e7 | |
| parent | 22df29225833bd65bb9137829a57e490258ed045 (diff) | |
| parent | cc0d8bb32722bce9ea87b60c8353f070eb51aa7d (diff) | |
| download | craftbukkit-8b94fad772977bb3c5f367bccaf3a2a1f0edc3b1.tar craftbukkit-8b94fad772977bb3c5f367bccaf3a2a1f0edc3b1.tar.gz craftbukkit-8b94fad772977bb3c5f367bccaf3a2a1f0edc3b1.tar.lz craftbukkit-8b94fad772977bb3c5f367bccaf3a2a1f0edc3b1.tar.xz craftbukkit-8b94fad772977bb3c5f367bccaf3a2a1f0edc3b1.zip | |
Merge pull request #13 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-20 to master
* commit 'cc0d8bb32722bce9ea87b60c8353f070eb51aa7d':
Update the correct Scoreboard Criteria when a health change comes in. This fixes SPIGOT-20
| -rw-r--r-- | nms-patches/EntityPlayer.patch | 6 |
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()) { |