Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-20 to master

Browse Source 
* commit 'cc0d8bb32722bce9ea87b60c8353f070eb51aa7d':
  Update the correct Scoreboard Criteria when a health change comes in. This fixes SPIGOT-20
This commit is contained in:
Thinkofdeath 2014-11-30 17:10:32 +02:00
commit 8b94fad772
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nms-patches/EntityPlayer.patch
View File

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityPlayer.java 2014-11-28 17:43:43.149707434 +0000 --- ../work/decompile-8eb82bde//net/minecraft/server/EntityPlayer.java Sun Nov 30 12:33:51 2014
+++ src/main/java/net/minecraft/server/EntityPlayer.java 2014-11-28 17:38:18.000000000 +0000 +++ src/main/java/net/minecraft/server/EntityPlayer.java Sun Nov 30 12:31:53 2014
@@ -13,6 +13,17 @@ @@ -13,6 +13,17 @@
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -136,7 +136,7 @@
- this.getScoreboard().getPlayerScoreForObjective(this.getName(), scoreboardobjective).updateForList(Arrays.asList(new EntityHuman[] { this})); - this.getScoreboard().getPlayerScoreForObjective(this.getName(), scoreboardobjective).updateForList(Arrays.asList(new EntityHuman[] { this}));
- } - }
+ // CraftBukkit - Update ALL the scores! + // 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 + // CraftBukkit start - Force max health updates
+ if (this.maxHealthCache != this.getMaxHealth()) { + if (this.maxHealthCache != this.getMaxHealth()) {