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

Update to Minecraft 1.20.3

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2023-12-06 03:40:00 +11:00
commit 8398e12b34
256 changed files with 2745 additions and 1911 deletions
Download patch file Download diff file Expand all files Collapse all files

4
paper-server/nms-patches/net/minecraft/server/commands/CommandSchedule.patch
View file

@ -1,11 +1,11 @@
--- a/net/minecraft/server/commands/CommandSchedule.java
+++ b/net/minecraft/server/commands/CommandSchedule.java
@@ -56,7 +56,7 @@
@@ -55,7 +55,7 @@
} else {
long j = commandlistenerwrapper.getLevel().getGameTime() + (long) i;
MinecraftKey minecraftkey = (MinecraftKey) pair.getFirst();
- CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getServer().getWorldData().overworldData().getScheduledEvents();
+ CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getLevel().serverLevelData.overworldData().getScheduledEvents(); // CraftBukkit - SPIGOT-6667: Use world specific function timer
((Either) pair.getSecond()).ifLeft((customfunction) -> {
((Either) pair.getSecond()).ifLeft((net_minecraft_commands_functions_commandfunction) -> {
String s = minecraftkey.toString();

4
paper-server/nms-patches/net/minecraft/server/commands/CommandSpreadPlayers.patch
View file

@ -1,6 +1,6 @@
--- a/net/minecraft/server/commands/CommandSpreadPlayers.java
+++ b/net/minecraft/server/commands/CommandSpreadPlayers.java
@@ -92,7 +92,7 @@
@@ -93,7 +93,7 @@
if (entity instanceof EntityHuman) {
set.add(entity.getTeam());
} else {
@ -9,7 +9,7 @@
}
}
@@ -202,7 +202,7 @@
@@ -203,7 +203,7 @@
commandspreadplayers_a = acommandspreadplayers_a[j++];
}

11
paper-server/nms-patches/net/minecraft/server/commands/CommandTrigger.patch
View file

@ -1,11 +0,0 @@
--- a/net/minecraft/server/commands/CommandTrigger.java
+++ b/net/minecraft/server/commands/CommandTrigger.java
@@ -96,7 +96,7 @@
if (scoreboardobjective.getCriteria() != IScoreboardCriteria.TRIGGER) {
throw CommandTrigger.ERROR_INVALID_OBJECTIVE.create();
} else {
- Scoreboard scoreboard = entityplayer.getScoreboard();
+ Scoreboard scoreboard = entityplayer.getServer().getScoreboard(); // CraftBukkit - SPIGOT-6917: use main scoreboard
String s = entityplayer.getScoreboardName();
if (!scoreboard.hasPlayerScore(s, scoreboardobjective)) {