Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.5.1

Browse Source
This commit is contained in:
Travis Watkins
2013-03-20 15:09:23 -05:00
parent 6aaa1e83df
commit 696543cf3f
21 changed files with 307 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@@ -201,13 +201,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void setHealth(int i) {
super.setHealth(i);
Collection collection = this.getScoreboard().a(IObjective.f);
Collection collection = this.getScoreboard().getObjectivesForCriteria(IScoreboardCriteria.f);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
ScoreboardObjective scoreboardobjective = (ScoreboardObjective) iterator.next();
this.getScoreboard().a(this.getLocalizedName(), scoreboardobjective).a(Arrays.asList(new EntityHuman[] { this}));
this.getScoreboard().getPlayerScoreForObjective(this.getLocalizedName(), scoreboardobjective).updateForList(Arrays.asList(new EntityHuman[] { this}));
}
}
@@ -304,14 +304,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.closeInventory();
// CraftBukkit end
Collection collection = this.world.getScoreboard().a(IObjective.c);
Collection collection = this.world.getScoreboard().getObjectivesForCriteria(IScoreboardCriteria.c);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
ScoreboardObjective scoreboardobjective = (ScoreboardObjective) iterator.next();
ScoreboardScore scoreboardscore = this.getScoreboard().a(this.getLocalizedName(), scoreboardobjective);
ScoreboardScore scoreboardscore = this.getScoreboard().getPlayerScoreForObjective(this.getLocalizedName(), scoreboardobjective);
scoreboardscore.a();
scoreboardscore.incrementScore();
}
EntityLiving entityliving = this.bN();