SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
paper-server/nms-patches/net/minecraft/server/ScoreboardServer.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ScoreboardServer.java
+++ b/net/minecraft/server/ScoreboardServer.java
@@ -34,7 +34,7 @@
@@ -37,7 +37,7 @@
public void onScoreChanged(ScoreboardScore scoreboardscore) {
super.onScoreChanged(scoreboardscore);
if (this.trackedObjectives.contains(scoreboardscore.getObjective())) {
@@ -9,7 +9,7 @@
}
this.setDirty();
@@ -43,7 +43,7 @@
@@ -46,7 +46,7 @@
@Override
public void onPlayerRemoved(String s) {
super.onPlayerRemoved(s);
@@ -18,7 +18,7 @@
this.setDirty();
}
@@ -51,7 +51,7 @@
@@ -54,7 +54,7 @@
public void onPlayerScoreRemoved(String s, ScoreboardObjective scoreboardobjective) {
super.onPlayerScoreRemoved(s, scoreboardobjective);
if (this.trackedObjectives.contains(scoreboardobjective)) {
@@ -27,25 +27,25 @@
}
this.setDirty();
@@ -64,7 +64,7 @@
super.setDisplayObjective(i, scoreboardobjective);
@@ -67,7 +67,7 @@
super.setDisplayObjective(displayslot, scoreboardobjective);
if (scoreboardobjective1 != scoreboardobjective && scoreboardobjective1 != null) {
if (this.getObjectiveDisplaySlotCount(scoreboardobjective1) > 0) {
- this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
+ this.broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
- this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardDisplayObjective(displayslot, scoreboardobjective));
+ this.broadcastAll(new PacketPlayOutScoreboardDisplayObjective(displayslot, scoreboardobjective));
} else {
this.stopTrackingObjective(scoreboardobjective1);
}
@@ -72,7 +72,7 @@
@@ -75,7 +75,7 @@
if (scoreboardobjective != null) {
if (this.trackedObjectives.contains(scoreboardobjective)) {
- this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
+ this.broadcastAll(new PacketPlayOutScoreboardDisplayObjective(i, scoreboardobjective));
- this.server.getPlayerList().broadcastAll(new PacketPlayOutScoreboardDisplayObjective(displayslot, scoreboardobjective));
+ this.broadcastAll(new PacketPlayOutScoreboardDisplayObjective(displayslot, scoreboardobjective));
} else {
this.startTrackingObjective(scoreboardobjective);
}
@@ -84,7 +84,7 @@
@@ -87,7 +87,7 @@
@Override
public boolean addPlayerToTeam(String s, ScoreboardTeam scoreboardteam) {
if (super.addPlayerToTeam(s, scoreboardteam)) {
@@ -54,7 +54,7 @@
this.setDirty();
return true;
} else {
@@ -95,7 +95,7 @@
@@ -98,7 +98,7 @@
@Override
public void removePlayerFromTeam(String s, ScoreboardTeam scoreboardteam) {
super.removePlayerFromTeam(s, scoreboardteam);
@@ -63,7 +63,7 @@
this.setDirty();
}
@@ -109,7 +109,7 @@
@@ -112,7 +112,7 @@
public void onObjectiveChanged(ScoreboardObjective scoreboardobjective) {
super.onObjectiveChanged(scoreboardobjective);
if (this.trackedObjectives.contains(scoreboardobjective)) {
@@ -72,7 +72,7 @@
}
this.setDirty();
@@ -128,21 +128,21 @@
@@ -131,21 +131,21 @@
@Override
public void onTeamAdded(ScoreboardTeam scoreboardteam) {
super.onTeamAdded(scoreboardteam);
@@ -97,7 +97,7 @@
this.setDirty();
}
@@ -189,6 +189,7 @@
@@ -196,6 +196,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -105,7 +105,7 @@
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
@@ -221,6 +222,7 @@
@@ -232,6 +233,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -113,7 +113,7 @@
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
@@ -257,6 +259,16 @@
@@ -276,6 +278,16 @@
return this.createData().load(nbttagcompound);
}