Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-26 16:12:37 +01:00
130 Zeilen
5.9 KiB
Diff
130 Zeilen
5.9 KiB
Diff
--- a/net/minecraft/server/ScoreboardServer.java
|
|
+++ b/net/minecraft/server/ScoreboardServer.java
|
|
@@ -22,7 +22,7 @@
|
|
public void handleScoreChanged(ScoreboardScore scoreboardscore) {
|
|
super.handleScoreChanged(scoreboardscore);
|
|
if (this.b.contains(scoreboardscore.getObjective())) {
|
|
- 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();
|
|
@@ -30,14 +30,14 @@
|
|
|
|
public void handlePlayerRemoved(String s) {
|
|
super.handlePlayerRemoved(s);
|
|
- 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);
|
|
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));
|
|
}
|
|
|
|
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));
|
|
+ this.sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
|
|
} else {
|
|
this.g(scoreboardobjective1);
|
|
}
|
|
@@ -57,7 +57,7 @@
|
|
|
|
if (scoreboardobjective != null) {
|
|
if (this.b.contains(scoreboardobjective)) {
|
|
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
|
|
+ this.sendAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
|
|
} else {
|
|
this.e(scoreboardobjective);
|
|
}
|
|
@@ -68,7 +68,7 @@
|
|
|
|
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));
|
|
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(new String[] { s}), 3));
|
|
this.b();
|
|
return true;
|
|
} else {
|
|
@@ -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));
|
|
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(new String[] { s}), 4));
|
|
this.b();
|
|
}
|
|
|
|
@@ -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));
|
|
+ this.sendAll(new PacketPlayOutScoreboardObjective(scoreboardobjective, 2));
|
|
}
|
|
|
|
this.b();
|
|
@@ -107,19 +107,19 @@
|
|
|
|
public void handleTeamAdded(ScoreboardTeam scoreboardteam) {
|
|
super.handleTeamAdded(scoreboardteam);
|
|
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 0));
|
|
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 0));
|
|
this.b();
|
|
}
|
|
|
|
public void handleTeamChanged(ScoreboardTeam scoreboardteam) {
|
|
super.handleTeamChanged(scoreboardteam);
|
|
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 2));
|
|
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 2));
|
|
this.b();
|
|
}
|
|
|
|
public void handleTeamRemoved(ScoreboardTeam scoreboardteam) {
|
|
super.handleTeamRemoved(scoreboardteam);
|
|
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 1));
|
|
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 1));
|
|
this.b();
|
|
}
|
|
|
|
@@ -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()) {
|
|
@@ -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()) {
|
|
@@ -224,6 +226,16 @@
|
|
return i;
|
|
}
|
|
|
|
+ // 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
|
|
+
|
|
public static enum Action {
|
|
|
|
CHANGE, REMOVE;
|