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

14
src/main/java/net/minecraft/server/EntityHuman.java
View File

@@ -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);
}
}