Paper/nms-patches/ScoreboardServer.patch

130 lines
5.9 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ScoreboardServer.java
+++ b/net/minecraft/server/ScoreboardServer.java
2018-07-15 02:00:00 +02:00
@@ -22,7 +22,7 @@
public void handleScoreChanged(ScoreboardScore scoreboardscore) {
super.handleScoreChanged(scoreboardscore);
if (this.b.contains(scoreboardscore.getObjective())) {
2018-07-15 02:00:00 +02:00
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, scoreboardscore.getObjective().getName(), scoreboardscore.getPlayerName(), scoreboardscore.getScore()));
+ this.sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, scoreboardscore.getObjective().getName(), scoreboardscore.getPlayerName(), scoreboardscore.getScore()));
}
this.b();
2018-07-15 02:00:00 +02:00
@@ -30,14 +30,14 @@
public void handlePlayerRemoved(String s) {
super.handlePlayerRemoved(s);
2018-07-15 02:00:00 +02:00
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, (String) null, s, 0));
+ this.sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, (String) null, s, 0));
this.b();
}
public void a(String s, ScoreboardObjective scoreboardobjective) {
super.a(s, scoreboardobjective);
2018-07-15 02:00:00 +02:00
if (this.b.contains(scoreboardobjective)) {
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, scoreboardobjective.getName(), s, 0));
+ this.sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, scoreboardobjective.getName(), s, 0));
}
2018-07-15 02:00:00 +02:00
this.b();
@@ -49,7 +49,7 @@
super.setDisplaySlot(i, scoreboardobjective);
if (scoreboardobjective1 != scoreboardobjective && scoreboardobjective1 != null) {
if (this.h(scoreboardobjective1) > 0) {
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
} else {
this.g(scoreboardobjective1);
}
2018-07-15 02:00:00 +02:00
@@ -57,7 +57,7 @@
if (scoreboardobjective != null) {
if (this.b.contains(scoreboardobjective)) {
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
} else {
this.e(scoreboardobjective);
}
2018-07-15 02:00:00 +02:00
@@ -68,7 +68,7 @@
2018-07-15 02:00:00 +02:00
public boolean addPlayerToTeam(String s, ScoreboardTeam scoreboardteam) {
if (super.addPlayerToTeam(s, scoreboardteam)) {
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(new String[] { s}), 3));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(new String[] { s}), 3));
this.b();
return true;
} else {
2018-07-15 02:00:00 +02:00
@@ -78,7 +78,7 @@
public void removePlayerFromTeam(String s, ScoreboardTeam scoreboardteam) {
super.removePlayerFromTeam(s, scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(new String[] { s}), 4));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(new String[] { s}), 4));
this.b();
}
2018-07-15 02:00:00 +02:00
@@ -90,7 +90,7 @@
public void handleObjectiveChanged(ScoreboardObjective scoreboardobjective) {
super.handleObjectiveChanged(scoreboardobjective);
if (this.b.contains(scoreboardobjective)) {
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardObjective(scoreboardobjective, 2));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardObjective(scoreboardobjective, 2));
}
this.b();
2018-07-15 02:00:00 +02:00
@@ -107,19 +107,19 @@
public void handleTeamAdded(ScoreboardTeam scoreboardteam) {
super.handleTeamAdded(scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 0));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 0));
this.b();
}
public void handleTeamChanged(ScoreboardTeam scoreboardteam) {
super.handleTeamChanged(scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 2));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 2));
this.b();
}
public void handleTeamRemoved(ScoreboardTeam scoreboardteam) {
super.handleTeamRemoved(scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 1));
2015-02-26 23:41:06 +01:00
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 1));
this.b();
}
2018-07-15 02:00:00 +02:00
@@ -168,6 +168,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+ if (entityplayer.getBukkitEntity().getScoreboard().getHandle() != this) continue; // CraftBukkit - Only players on this board
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
2018-07-15 02:00:00 +02:00
@@ -200,6 +201,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+ if (entityplayer.getBukkitEntity().getScoreboard().getHandle() != this) continue; // CraftBukkit - Only players on this board
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
2018-07-15 02:00:00 +02:00
@@ -224,6 +226,16 @@
return i;
}
2018-07-15 02:00:00 +02:00
+ // CraftBukkit start - Send to players
+ private void sendAll(Packet packet) {
+ for (EntityPlayer entityplayer : (List<EntityPlayer>) this.a.getPlayerList().players) {
+ if (entityplayer.getBukkitEntity().getScoreboard().getHandle() == this) {
+ entityplayer.playerConnection.sendPacket(packet);
+ }
+ }
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
+
public static enum Action {
CHANGE, REMOVE;