mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Mappings Update

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2018-12-26 08:00:00 +11:00
commit d7e312278d
120 changed files with 878 additions and 1619 deletions
Download patch file Download diff file Expand all files Collapse all files

30
paper-server/nms-patches/ScoreboardServer.patch
View file

@ -1,6 +1,6 @@
--- a/net/minecraft/server/ScoreboardServer.java
+++ b/net/minecraft/server/ScoreboardServer.java
@@ -22,7 +22,7 @@
@@ -21,7 +21,7 @@
public void handleScoreChanged(ScoreboardScore scoreboardscore) {
super.handleScoreChanged(scoreboardscore);
if (this.b.contains(scoreboardscore.getObjective())) {
@ -9,7 +9,7 @@
}
this.b();
@@ -30,14 +30,14 @@
@@ -29,14 +29,14 @@
public void handlePlayerRemoved(String s) {
super.handlePlayerRemoved(s);
@ -26,7 +26,7 @@
}
this.b();
@@ -49,7 +49,7 @@
@@ -48,7 +48,7 @@
super.setDisplaySlot(i, scoreboardobjective);
if (scoreboardobjective1 != scoreboardobjective && scoreboardobjective1 != null) {
if (this.h(scoreboardobjective1) > 0) {
@ -35,7 +35,7 @@
} else {
this.g(scoreboardobjective1);
}
@@ -57,7 +57,7 @@
@@ -56,7 +56,7 @@
if (scoreboardobjective != null) {
if (this.b.contains(scoreboardobjective)) {
@ -44,25 +44,25 @@
} else {
this.e(scoreboardobjective);
}
@@ -68,7 +68,7 @@
@@ -67,7 +67,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.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(s), 3));
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(s), 3));
this.b();
return true;
} else {
@@ -78,7 +78,7 @@
@@ -77,7 +77,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.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(s), 4));
+ this.sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(s), 4));
this.b();
}
@@ -90,7 +90,7 @@
@@ -89,7 +89,7 @@
public void handleObjectiveChanged(ScoreboardObjective scoreboardobjective) {
super.handleObjectiveChanged(scoreboardobjective);
if (this.b.contains(scoreboardobjective)) {
@ -71,7 +71,7 @@
}
this.b();
@@ -107,19 +107,19 @@
@@ -106,19 +106,19 @@
public void handleTeamAdded(ScoreboardTeam scoreboardteam) {
super.handleTeamAdded(scoreboardteam);
@ -94,7 +94,7 @@
this.b();
}
@@ -168,6 +168,7 @@
@@ -167,6 +167,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@ -102,7 +102,7 @@
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
@@ -200,6 +201,7 @@
@@ -199,6 +200,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@ -110,7 +110,7 @@
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
@@ -224,6 +226,16 @@
@@ -223,6 +225,16 @@
return i;
}