Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ScoreboardServer.java
+++ b/net/minecraft/server/ScoreboardServer.java
@@ -21,7 +21,7 @@
@@ -22,7 +22,7 @@
public void handleScoreChanged(ScoreboardScore scoreboardscore) {
super.handleScoreChanged(scoreboardscore);
if (this.b.contains(scoreboardscore.getObjective())) {
@@ -9,8 +9,8 @@
}
this.b();
@@ -29,14 +29,14 @@
@@ -31,7 +31,7 @@
@Override
public void handlePlayerRemoved(String s) {
super.handlePlayerRemoved(s);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardScore(ScoreboardServer.Action.REMOVE, (String) null, s, 0));
@@ -18,6 +18,7 @@
this.b();
}
@@ -39,7 +39,7 @@
public void a(String s, ScoreboardObjective scoreboardobjective) {
super.a(s, scoreboardobjective);
if (this.b.contains(scoreboardobjective)) {
@@ -26,7 +27,7 @@
}
this.b();
@@ -48,7 +48,7 @@
@@ -52,7 +52,7 @@
super.setDisplaySlot(i, scoreboardobjective);
if (scoreboardobjective1 != scoreboardobjective && scoreboardobjective1 != null) {
if (this.h(scoreboardobjective1) > 0) {
@@ -35,7 +36,7 @@
} else {
this.g(scoreboardobjective1);
}
@@ -56,7 +56,7 @@
@@ -60,7 +60,7 @@
if (scoreboardobjective != null) {
if (this.b.contains(scoreboardobjective)) {
@@ -44,8 +45,8 @@
} else {
this.e(scoreboardobjective);
}
@@ -67,7 +67,7 @@
@@ -72,7 +72,7 @@
@Override
public boolean addPlayerToTeam(String s, ScoreboardTeam scoreboardteam) {
if (super.addPlayerToTeam(s, scoreboardteam)) {
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(s), 3));
@@ -53,8 +54,8 @@
this.b();
return true;
} else {
@@ -77,7 +77,7 @@
@@ -83,7 +83,7 @@
@Override
public void removePlayerFromTeam(String s, ScoreboardTeam scoreboardteam) {
super.removePlayerFromTeam(s, scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, Arrays.asList(s), 4));
@@ -62,7 +63,7 @@
this.b();
}
@@ -89,7 +89,7 @@
@@ -97,7 +97,7 @@
public void handleObjectiveChanged(ScoreboardObjective scoreboardobjective) {
super.handleObjectiveChanged(scoreboardobjective);
if (this.b.contains(scoreboardobjective)) {
@@ -71,8 +72,8 @@
}
this.b();
@@ -106,19 +106,19 @@
@@ -116,21 +116,21 @@
@Override
public void handleTeamAdded(ScoreboardTeam scoreboardteam) {
super.handleTeamAdded(scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 0));
@@ -80,6 +81,7 @@
this.b();
}
@Override
public void handleTeamChanged(ScoreboardTeam scoreboardteam) {
super.handleTeamChanged(scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 2));
@@ -87,6 +89,7 @@
this.b();
}
@Override
public void handleTeamRemoved(ScoreboardTeam scoreboardteam) {
super.handleTeamRemoved(scoreboardteam);
- this.a.getPlayerList().sendAll(new PacketPlayOutScoreboardTeam(scoreboardteam, 1));
@@ -94,7 +97,7 @@
this.b();
}
@@ -167,6 +167,7 @@
@@ -179,6 +179,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -102,7 +105,7 @@
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
@@ -199,6 +200,7 @@
@@ -211,6 +212,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -110,7 +113,7 @@
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
@@ -223,6 +225,16 @@
@@ -235,6 +237,16 @@
return i;
}