diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-20 15:09:23 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-20 15:09:23 -0500 |
commit | 696543cf3f43756dfc2d4c1d18b2b461badcb107 (patch) | |
tree | c01929bbcf4f052df46c267226c529869042ad78 /src/main/java/net/minecraft/server/EntityHuman.java | |
parent | 6aaa1e83df796b7d380a22af3842f3aa4b367f4d (diff) | |
download | craftbukkit-696543cf3f43756dfc2d4c1d18b2b461badcb107.tar craftbukkit-696543cf3f43756dfc2d4c1d18b2b461badcb107.tar.gz craftbukkit-696543cf3f43756dfc2d4c1d18b2b461badcb107.tar.lz craftbukkit-696543cf3f43756dfc2d4c1d18b2b461badcb107.tar.xz craftbukkit-696543cf3f43756dfc2d4c1d18b2b461badcb107.zip |
Update CraftBukkit to Minecraft 1.5.1
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index bfcb6ce7..1f7b8ad7 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -436,11 +436,11 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen public void c(Entity entity, int i) { this.addScore(i); - Collection collection = this.getScoreboard().a(IObjective.e); + Collection collection = this.getScoreboard().getObjectivesForCriteria(IScoreboardCriteria.e); if (entity instanceof EntityHuman) { this.a(StatisticList.A, 1); - collection.addAll(this.getScoreboard().a(IObjective.d)); + collection.addAll(this.getScoreboard().getObjectivesForCriteria(IScoreboardCriteria.d)); } else { this.a(StatisticList.z, 1); } @@ -449,9 +449,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen 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(); } } @@ -690,7 +690,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen ScoreboardTeam scoreboardteam = this.getScoreboardTeam(); ScoreboardTeam scoreboardteam1 = entityhuman.getScoreboardTeam(); - return scoreboardteam != scoreboardteam1 ? true : (scoreboardteam != null ? scoreboardteam.g() : true); + return scoreboardteam != scoreboardteam1 ? true : (scoreboardteam != null ? scoreboardteam.allowFriendlyFire() : true); } protected void a(EntityLiving entityliving, boolean flag) { @@ -1490,10 +1490,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen } public ScoreboardTeam getScoreboardTeam() { - return this.getScoreboard().i(this.name); + return this.getScoreboard().getPlayerTeam(this.name); } public String getScoreboardDisplayName() { - return ScoreboardTeam.a(this.getScoreboardTeam(), this.name); + return ScoreboardTeam.getPlayerDisplayName(this.getScoreboardTeam(), this.name); } } |