core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit) 

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
cc21bae97 SPIGOT-5569: Call WorldInitEvent before any chunks are getting generated
This commit is contained in:
Aikar 2021-05-17 18:32:29 -04:00
parent 1514576281
commit 45e19ffb00
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
40 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0002-Paper-config-files.patch
View File

@ -689,10 +689,10 @@ index 344b7f52e85af3e543da0bb1dd14b68eb41ebb84..f794113e7cc5809d1da0c85648fb7311
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e41425419e138 100644
index f03d83440291a329f5a1922c8710ed975025fdbb..82f5b3387f9e71ae258111b7196986623452dc02 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -808,6 +808,7 @@ public final class CraftServer implements Server {
@@ -807,6 +807,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -700,7 +700,7 @@ index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e4142
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -841,6 +842,7 @@ public final class CraftServer implements Server {
@@ -840,6 +841,7 @@ public final class CraftServer implements Server {
world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
}
world.spigotConfig.init(); // Spigot
@ -708,7 +708,7 @@ index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e4142
}
pluginManager.clearPlugins();
@@ -848,6 +850,7 @@ public final class CraftServer implements Server {
@@ -847,6 +849,7 @@ public final class CraftServer implements Server {
resetRecipes();
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@ -716,7 +716,7 @@ index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e4142
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2105,4 +2108,35 @@ public final class CraftServer implements Server {
@@ -2102,4 +2105,35 @@ public final class CraftServer implements Server {
return spigot;
}
// Spigot end

6
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -788,7 +788,7 @@ index 21f5474a1cd60168ca059da542a432d40d88b514..07ca1234ad6ffa797003f7317fb88abf
int k = 0;
CustomFunction.c[] acustomfunction_c = customfunction.b();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cd3e7b8a23e40c717829bd262bfa675e4e3532f9..511d6094403d17522212fcdda6903a13517c44fa 100644
index 5ce0dfade68257b51ad4a19a829e1fc0a0bbc3db..85c96e3f70a3ffecb6195a1d83053412eb180d78 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -174,7 +174,7 @@ import org.bukkit.craftbukkit.Main;
@ -1812,10 +1812,10 @@ index 27703b807735d52313b93f8f606aa263571525d2..f301c7ba4b17b92c6cf2fcee6da1e670
private static NBTTagCompound a(ChunkCoordIntPair chunkcoordintpair, Map<StructureGenerator<?>, StructureStart<?>> map, Map<StructureGenerator<?>, LongSet> map1) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7b77bbf15e59c5a993fb1683c27e41425419e138..ce68a6cf845af640e03819c44860590655f74cb1 100644
index 82f5b3387f9e71ae258111b7196986623452dc02..0c1e12b0b43f949d4ace600b2ccdffe52faab1e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2077,12 +2077,31 @@ public final class CraftServer implements Server {
@@ -2074,12 +2074,31 @@ public final class CraftServer implements Server {
private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
{

18
Spigot-Server-Patches/0010-Adventure.patch
View File

@ -1658,10 +1658,10 @@ index 7ec93ddd7e7c9dc54e3e4dcfe0d1654c0b0a8536..3f057f0bd23bc1c693c8f04ee8acd662
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041fac91ce5 100644
index 0c1e12b0b43f949d4ace600b2ccdffe52faab1e6..2c2e87d96f61e7ef88847df70e1c6153bca9fcd3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -563,8 +563,11 @@ public final class CraftServer implements Server {
@@ -562,8 +562,11 @@ public final class CraftServer implements Server {
}
@Override
@ -1674,7 +1674,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041
}
public Player getPlayer(final EntityPlayer entity) {
@@ -1310,7 +1313,15 @@ public final class CraftServer implements Server {
@@ -1307,7 +1310,15 @@ public final class CraftServer implements Server {
return configuration.getInt("settings.spawn-radius", -1);
}
@ -1690,7 +1690,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041
public String getShutdownMessage() {
return configuration.getString("settings.shutdown-message");
}
@@ -1426,7 +1437,15 @@ public final class CraftServer implements Server {
@@ -1423,7 +1434,15 @@ public final class CraftServer implements Server {
}
@Override
@ -1706,7 +1706,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041
Set<CommandSender> recipients = new HashSet<>();
for (Permissible permissible : getPluginManager().getPermissionSubscriptions(permission)) {
if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
@@ -1434,14 +1453,14 @@ public final class CraftServer implements Server {
@@ -1431,14 +1450,14 @@ public final class CraftServer implements Server {
}
}
@ -1723,7 +1723,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041
for (CommandSender recipient : recipients) {
recipient.sendMessage(message);
@@ -1667,6 +1686,14 @@ public final class CraftServer implements Server {
@@ -1664,6 +1683,14 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
}
@ -1738,7 +1738,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041
@Override
public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type);
@@ -1679,13 +1706,28 @@ public final class CraftServer implements Server {
@@ -1676,13 +1703,28 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
}
@ -1767,7 +1767,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041
public Merchant createMerchant(String title) {
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
}
@@ -1729,6 +1771,12 @@ public final class CraftServer implements Server {
@@ -1726,6 +1768,12 @@ public final class CraftServer implements Server {
return Thread.currentThread().equals(console.serverThread) || console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog)
}
@ -1780,7 +1780,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041
@Override
public String getMotd() {
return console.getMotd();
@@ -2157,5 +2205,15 @@ public final class CraftServer implements Server {
@@ -2154,5 +2202,15 @@ public final class CraftServer implements Server {
return null;
}
}

8
Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View File

@ -19,7 +19,7 @@ index a5171d28b960b12c2743ea68a36d747bc967697d..a0f53c9eff04a40780b3ba568dbfc5bb
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 511d6094403d17522212fcdda6903a13517c44fa..9ba05ab7ec97896349f4b754f2993cda9ab1bbfd 100644
index 85c96e3f70a3ffecb6195a1d83053412eb180d78..c21790b4de698aa6f7fc4dadab64d791cd0562b6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1342,7 +1342,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -32,10 +32,10 @@ index 511d6094403d17522212fcdda6903a13517c44fa..9ba05ab7ec97896349f4b754f2993cda
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cb470baa3533e4502c13982ef4e03041fac91ce5..c66be5b9f304878f9179faba433f2e844bcee72c 100644
index 2c2e87d96f61e7ef88847df70e1c6153bca9fcd3..a9449a62f678ec6dc5e923c64e89140bb96fb697 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -226,7 +226,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -225,7 +225,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
public final class CraftServer implements Server {
@ -45,7 +45,7 @@ index cb470baa3533e4502c13982ef4e03041fac91ce5..c66be5b9f304878f9179faba433f2e84
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index bb8ddfae48526d9b6fdc64eecb6f655f6b7665de..8507f9a81b6068eb2f50e6390e3b4afe6d04fbbb 100644
index cf6d350e6afc46bb58678192fe0b24b7d923412e..2819c734fb6b8ed82df143e90c24316f3e8c551e 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -206,12 +206,25 @@ public class Main {

6
Spigot-Server-Patches/0024-Further-improve-server-tick-loop.patch
View File

@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9ba05ab7ec97896349f4b754f2993cda9ab1bbfd..add4f149fd31d1420d825b646b3e088808e5896b 100644
index c21790b4de698aa6f7fc4dadab64d791cd0562b6..fb0d985b5c977a7c63701484678b75928d9ee382 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -253,7 +253,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -140,10 +140,10 @@ index 9ba05ab7ec97896349f4b754f2993cda9ab1bbfd..add4f149fd31d1420d825b646b3e0888
GameProfilerTick gameprofilertick = GameProfilerTick.a("Server");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c66be5b9f304878f9179faba433f2e844bcee72c..eeaf100f73bb10e0a49400795f568438982f7cfa 100644
index a9449a62f678ec6dc5e923c64e89140bb96fb697..d9672aeae53119d2fbc1456cd3071d5c9eb8a730 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2121,6 +2121,17 @@ public final class CraftServer implements Server {
@@ -2118,6 +2118,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}

4
Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
View File

@ -48,10 +48,10 @@ index a39f58e0c60b5e3ccc3b725f1f4167d52b230e11..6a8567c355202560ee523c6dc68cac1a
} else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
// Do nothing, this is coming from a plugin
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f84fe5929cb7bcedff5fc587163380172bc1e8be..8e9547fc745e8244ca1f439770571ca1175ff632 100644
index d9672aeae53119d2fbc1456cd3071d5c9eb8a730..69f2ccef0f88d8407ee00d41ac32ebb071b6803f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -762,6 +762,29 @@ public final class CraftServer implements Server {
@@ -761,6 +761,29 @@ public final class CraftServer implements Server {
Validate.notNull(commandLine, "CommandLine cannot be null");
org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot

4
Spigot-Server-Patches/0047-Expose-server-CommandMap.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3b29f94dcfb98ba7cdd61c7b398dbc8fc56f5aef..9142a4813414d125ebff32e1521659da525e7337 100644
index 69f2ccef0f88d8407ee00d41ac32ebb071b6803f..bfd78c41757c73736371811aab97ca05a01667c9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1760,6 +1760,7 @@ public final class CraftServer implements Server {
@@ -1757,6 +1757,7 @@ public final class CraftServer implements Server {
return helpMap;
}

4
Spigot-Server-Patches/0053-Add-velocity-warnings.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 96d4049f8a42f00dbbc092b391ae11c1326a5501..f6a1d52239216984da4a9c87312c6ed085213935 100644
index bfd78c41757c73736371811aab97ca05a01667c9..c952b193618c58335172117dfe475047a1178ac5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -262,6 +262,7 @@ public final class CraftServer implements Server {
@@ -261,6 +261,7 @@ public final class CraftServer implements Server {
public boolean ignoreVanillaPermissions = false;
private final List<CraftPlayer> playerView;
public int reloadCount;

6
Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch
View File

@ -30,10 +30,10 @@ index 429b74474ced04d8dd8f038b8590b8dfe178bf4d..716f285e67019b8a62922d09c15883c9
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2833861b337cdb28ae12d21c6abee84dbcac314a..6df1ef2640cc6c014051bdb4d71d7cd80e978aec 100644
index c952b193618c58335172117dfe475047a1178ac5..ac10067e924cfbfe0a528cad62293686c0c24562 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -399,6 +399,7 @@ public final class CraftServer implements Server {
@@ -398,6 +398,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) {
helpMap.clear();
helpMap.initializeGeneralTopics();
@ -41,7 +41,7 @@ index 2833861b337cdb28ae12d21c6abee84dbcac314a..6df1ef2640cc6c014051bdb4d71d7cd8
}
Plugin[] plugins = pluginManager.getPlugins();
@@ -418,7 +419,7 @@ public final class CraftServer implements Server {
@@ -417,7 +418,7 @@ public final class CraftServer implements Server {
commandMap.registerServerAliases();
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();

4
Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
https://github.com/PaperMC/Paper/issues/49
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b75c5571c3f1d7c45ca2dd29ff285cb5a0d27071..9e2b3ef9296cd6bbba99f1b1e3181fff4e537760 100644
index ac10067e924cfbfe0a528cad62293686c0c24562..3f300a4fd661707e386090e5ba3be3ddb9af2d00 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2252,5 +2252,23 @@ public final class CraftServer implements Server {
@@ -2249,5 +2249,23 @@ public final class CraftServer implements Server {
}
return this.adventure$audiences;
}

4
Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch
View File

@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e5f6dfa4061b98ccb5f3b0cd93ef416a2c20ee78..83ab502d80bbb97204a6f0e4474d1a3b96218448 100644
index 3f300a4fd661707e386090e5ba3be3ddb9af2d00..16a2c614d58f3604613138210a7ac1be0b00a15c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -873,8 +873,18 @@ public final class CraftServer implements Server {
@@ -872,8 +872,18 @@ public final class CraftServer implements Server {
world.paperConfig.init(); // Paper
}

6
Spigot-Server-Patches/0087-Configurable-Player-Collision.patch
View File

@ -32,7 +32,7 @@ index bc40f2cbe1645fd60c4cee106b90f17cd043d32d..c1bb5c325286119891e8d68ce8f7328c
packetdataserializer.a(this.c);
packetdataserializer.a(this.d);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 33139f9dc6a9c6030f565b01c9b6fd411cafa710..026ddfba26439a00685f3962084aa6194086c9b7 100644
index b141c744b8ffbc37b09cb4347c4051a77bb7049e..8df60cedc1198916dfce8fcea7ca4a49f98429ba 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -151,6 +151,7 @@ import net.minecraft.world.phys.Vec2F;
@ -43,7 +43,7 @@ index 33139f9dc6a9c6030f565b01c9b6fd411cafa710..026ddfba26439a00685f3962084aa619
import org.apache.commons.lang3.Validate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -552,6 +553,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -551,6 +552,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
}
@ -65,7 +65,7 @@ index 33139f9dc6a9c6030f565b01c9b6fd411cafa710..026ddfba26439a00685f3962084aa619
this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
this.serverConnection.acceptConnections();
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 152aa38788a21638aab7cfe2dc187671f1143bde..f9e9e51b0b0dcbf2a8424c7c14bd2cbb0d899e82 100644
index 9d327f1255dd9d6b11840f7bb8ffc302bc33dbcf..49f1aed92fd5fa46b74a979f317a2eb0672991e9 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -86,6 +86,7 @@ import net.minecraft.world.level.storage.SavedFile;

4
Spigot-Server-Patches/0108-Add-setting-for-proxy-online-mode-status.patch
View File

@ -66,10 +66,10 @@ index 4ad084e7cea3b341ca0dbaa6e853cfc685a555ff..b9f94f957dd5372c8b02d785204690e4
public synchronized void a(GameProfile gameprofile) { // Paper - synchronize
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a084beced6647d6815e9bd728b2107c03998777c..f6d4e8d008b85bcf52cfeceb6b40fe9d1a2b557b 100644
index 16a2c614d58f3604613138210a7ac1be0b00a15c..e07d5e54e0d606113337913f940e8659ab6e98e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1515,7 +1515,8 @@ public final class CraftServer implements Server {
@@ -1512,7 +1512,8 @@ public final class CraftServer implements Server {
// Spigot Start
GameProfile profile = null;
// Only fetch an online UUID in online mode

4
Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f6d4e8d008b85bcf52cfeceb6b40fe9d1a2b557b..e5ade7ac2bd059e2d05f2f38d0dae77070c989f7 100644
index e07d5e54e0d606113337913f940e8659ab6e98e7..8c8d3c4f8818552843ee93ae39af06d51404af9f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2281,5 +2281,24 @@ public final class CraftServer implements Server {
@@ -2278,5 +2278,24 @@ public final class CraftServer implements Server {
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();
}

4
Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch
View File

@ -20,10 +20,10 @@ index 4e2f243faa209925dcb7c3ef89df3ed875c5ff78..48319aaf1c525c6fb7bdee5c2f570a0d
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e5ade7ac2bd059e2d05f2f38d0dae77070c989f7..e2062f2a86cd764c86e69709b370f54b7fb5e15c 100644
index 8c8d3c4f8818552843ee93ae39af06d51404af9f..c029cf4d930c5bc412b55a567b03bbce41b61bbd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2300,5 +2300,10 @@ public final class CraftServer implements Server {
@@ -2297,5 +2297,10 @@ public final class CraftServer implements Server {
commandMap.registerServerAliases();
return true;
}

10
Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -19,7 +19,7 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index 8ce86529d55c256c745dac2cfa7bd2e3c702bf87..d82c43adadc2da44e9018a6be3e594d32d010bef 100644
index a5d87d22cb1588d15e08da3b37e51c5e261c7799..3841fe3630c090f8a468333d43caeb2b5841329d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,10 +57,26 @@
@ -143,7 +143,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d92ca78e483b3f085e3bad1d1250cac2f9031fa7..bad6dfcb9ed558499c39880c44ae514ee2051a3c 100644
index fae7e4a7adcc930a7252634dc535339b5a5bd3b9..71496fff9faeb72e28dfc2842ed8105a9cb835c1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -12,6 +12,7 @@ import com.mojang.datafixers.DataFixer;
@ -266,7 +266,7 @@ index 67814e3e54ec2be02c4d592c56b60e66d15bedb2..8348dfa43c1f6e07c01024b40f4b3ebc
this.k = new GameProfileBanList(PlayerList.b);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e2062f2a86cd764c86e69709b370f54b7fb5e15c..268d56859a0de3b2ca39155f882991b5bf3aa5e0 100644
index c029cf4d930c5bc412b55a567b03bbce41b61bbd..86d069819b97b7fe60acd7f4bdb0c4a67565a31e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -46,7 +46,6 @@ import java.util.function.Consumer;
@ -285,7 +285,7 @@ index e2062f2a86cd764c86e69709b370f54b7fb5e15c..268d56859a0de3b2ca39155f882991b5
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerCommand;
import net.minecraft.server.bossevents.BossBattleCustom;
@@ -1209,9 +1209,13 @@ public final class CraftServer implements Server {
@@ -1206,9 +1206,13 @@ public final class CraftServer implements Server {
return logger;
}
@ -300,7 +300,7 @@ index e2062f2a86cd764c86e69709b370f54b7fb5e15c..268d56859a0de3b2ca39155f882991b5
@Override
public PluginCommand getPluginCommand(String name) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 89abd046dc4043e2a138fd93cbf55b96cd90f890..bed1208223e4213dec2c246675c11f2a1965a4ee 100644
index f1f658a90dcbb8d0b26a22c632cd7172e5d206ef..f474220105f58e0a889c78ae0b11873369a7f402 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -12,7 +12,7 @@ import java.util.logging.Level;

4
Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5d357b0f84b5242066dcce203752a0f46e9a249c..4f9c42a4b0256f181263bf5e0492714a01fbec38 100644
index 86d069819b97b7fe60acd7f4bdb0c4a67565a31e..54f924685df58d558cc9488c338c4a479d403791 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -104,6 +104,7 @@ import net.minecraft.world.level.storage.WorldNBTStorage;
@ -24,7 +24,7 @@ index 5d357b0f84b5242066dcce203752a0f46e9a249c..4f9c42a4b0256f181263bf5e0492714a
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.server.BroadcastMessageEvent;
@@ -793,7 +795,13 @@ public final class CraftServer implements Server {
@@ -792,7 +794,13 @@ public final class CraftServer implements Server {
// Spigot start
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {

6
Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch
View File

@ -517,10 +517,10 @@ index b9f94f957dd5372c8b02d785204690e4ade36a98..692d95c94df85d752a3ddc66e1f2af76
private volatile long c;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 92c68becf45d83dbc18d3a9c1f86f8aa308e0d87..c8ea7b8ad46ce0fab794b897b5f3fe414a679387 100644
index 54f924685df58d558cc9488c338c4a479d403791..2f9d649bd7b59b36d23316707da7e31430f8a6cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -227,6 +227,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -226,6 +226,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@ -530,7 +530,7 @@ index 92c68becf45d83dbc18d3a9c1f86f8aa308e0d87..c8ea7b8ad46ce0fab794b897b5f3fe41
public final class CraftServer implements Server {
private final String serverName = "Paper"; // Paper
private final String serverVersion;
@@ -2317,5 +2320,24 @@ public final class CraftServer implements Server {
@@ -2314,5 +2317,24 @@ public final class CraftServer implements Server {
public boolean suggestPlayerNamesWhenNullTabCompletions() {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}

4
Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch
View File

@ -72,10 +72,10 @@ index 3628965d2a18a367c2357b54b65786fb90c38205..fc624315b156f450c1cbc87a81e9eeff
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c8ea7b8ad46ce0fab794b897b5f3fe414a679387..3c019719e6eaf789bd5e20f382b707973f8b39c6 100644
index 2f9d649bd7b59b36d23316707da7e31430f8a6cb..fb6a1526384b94495939299b4eef2d1ea2ad7378 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1852,7 +1852,7 @@ public final class CraftServer implements Server {
@@ -1849,7 +1849,7 @@ public final class CraftServer implements Server {
offers = tabCompleteChat(player, message);
}

4
Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch
View File

@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3c019719e6eaf789bd5e20f382b707973f8b39c6..d15314af5ed58c846b97997fdfdf28786873ae01 100644
index fb6a1526384b94495939299b4eef2d1ea2ad7378..ce08e0d14cc9ab1fd6d56900fd48268649e01f03 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1519,6 +1519,25 @@ public final class CraftServer implements Server {
@@ -1516,6 +1516,25 @@ public final class CraftServer implements Server {
return recipients.size();
}

8
Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
View File

@ -36,7 +36,7 @@ index bd508025b771424c942fd856c31d520b6f548082..62621562137cba4804f0465c58d25ca2
public static int tabSpamLimit = 500;
private static void tabSpamLimiters() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 925dd2dc2b4af5596c9dc891f756bad66baadbea..540250a9610e2ee51685b655a7d6c0809bba64fd 100644
index 5bbd3bb52b76b8b6cdf90c94bcb29f122f31c543..52c0dd4f2779125116d9dcccc2aef7a11af92945 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1019,6 +1019,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -48,10 +48,10 @@ index 925dd2dc2b4af5596c9dc891f756bad66baadbea..540250a9610e2ee51685b655a7d6c080
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
lastTick = start - TICK_TIME; // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d15314af5ed58c846b97997fdfdf28786873ae01..72e2c6f731c1d2cb0eafedef7317b35a45b55dd7 100644
index ce08e0d14cc9ab1fd6d56900fd48268649e01f03..dad096e9bd7efeed59fd484ce6c93334f7adeaa9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -813,6 +813,7 @@ public final class CraftServer implements Server {
@@ -812,6 +812,7 @@ public final class CraftServer implements Server {
@Override
public void reload() {
@ -59,7 +59,7 @@ index d15314af5ed58c846b97997fdfdf28786873ae01..72e2c6f731c1d2cb0eafedef7317b35a
reloadCount++;
configuration = YamlConfiguration.loadConfiguration(getConfigFile());
commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile());
@@ -931,6 +932,7 @@ public final class CraftServer implements Server {
@@ -930,6 +931,7 @@ public final class CraftServer implements Server {
enablePlugins(PluginLoadOrder.STARTUP);
enablePlugins(PluginLoadOrder.POSTWORLD);
getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));

4
Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
View File

@ -288,10 +288,10 @@ index 21e70a133278d85ecd65fec36a273ed4faabf6cc..36f747af18347197bab7c335d5d7dfc0
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 72e2c6f731c1d2cb0eafedef7317b35a45b55dd7..54fa963faab3289d014299a38099eb72ff541065 100644
index dad096e9bd7efeed59fd484ce6c93334f7adeaa9..174b87def18b2c39fb03ccedf0082720f0987cb5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -685,7 +685,7 @@ public final class CraftServer implements Server {
@@ -684,7 +684,7 @@ public final class CraftServer implements Server {
@Override
public long getConnectionThrottle() {
// Spigot Start - Automatically set connection throttle for bungee configurations

4
Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
View File

@ -29,10 +29,10 @@ index 13edb435b3fa65b4980bd7472aa5a5196f4d5b2b..469f78775b03cf363d88e35c69c0dc18
Object val = config.get("settings.save-player-data");
if (val instanceof Boolean) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 54fa963faab3289d014299a38099eb72ff541065..0cfbe461c9b915c96b27f88f651a296d470b995f 100644
index 174b87def18b2c39fb03ccedf0082720f0987cb5..b46fe9254a2dce30db9733281e4d36daa9d08e01 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2342,6 +2342,11 @@ public final class CraftServer implements Server {
@@ -2339,6 +2339,11 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}

6
Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
View File

@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
synchronously when the server gets shut down.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7ef01f2f80eea31fa76d22c3a0d5036883dee516..e885e5c4c772a87c0359ed2c56aa71a856c3be59 100644
index fa7935cccb450ae5f782fec5ebe27275fe6dd510..5a5e097b131500d7cb9f61ea0f96f9006fabb941 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2192,7 +2192,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -29,10 +29,10 @@ index 7ef01f2f80eea31fa76d22c3a0d5036883dee516..e885e5c4c772a87c0359ed2c56aa71a8
public boolean isDebugging() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0cfbe461c9b915c96b27f88f651a296d470b995f..7b2326922415ae55dd930654defb09f736c1f781 100644
index b46fe9254a2dce30db9733281e4d36daa9d08e01..08327d80cca5e3fea513260c403c1839e06219a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1841,7 +1841,7 @@ public final class CraftServer implements Server {
@@ -1838,7 +1838,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {

4
Spigot-Server-Patches/0380-Expose-the-internal-current-tick.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7b2326922415ae55dd930654defb09f736c1f781..3cb67cfe8b69da722709ebdde250add88c19fee3 100644
index 08327d80cca5e3fea513260c403c1839e06219a3..1b2bd7e51aff16c01058e7b2aadd97ff657d6de0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2365,5 +2365,10 @@ public final class CraftServer implements Server {
@@ -2362,5 +2362,10 @@ public final class CraftServer implements Server {
}
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
}

6
Spigot-Server-Patches/0430-Add-tick-times-API-and-mspt-command.patch
View File

@ -87,7 +87,7 @@ index ddbc8cb712c50038922eded75dd6ca85fe851078..78271b400c79578d043b20a5389a37b1
version = getInt("config-version", 20);
set("config-version", 20);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5ea593ccfedf55140a723f6dc29bebe282e77ab3..795cf9635ab6ac7f001476354813cac9d7e025eb 100644
index 5e6ca8690c5cb312e805798e8483ac701439227b..506edef56ef6012424556f058996dbf690d4bae7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -219,6 +219,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -147,10 +147,10 @@ index 5ea593ccfedf55140a723f6dc29bebe282e77ab3..795cf9635ab6ac7f001476354813cac9
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3cb67cfe8b69da722709ebdde250add88c19fee3..35e1739c4c90f4f27ed2b729a2ec2522b3aa0c06 100644
index 1b2bd7e51aff16c01058e7b2aadd97ff657d6de0..2a1b0cbb09ebd35d7008ede9a3f1241ff616e90b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2203,6 +2203,16 @@ public final class CraftServer implements Server {
@@ -2200,6 +2200,16 @@ public final class CraftServer implements Server {
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
};
}

4
Spigot-Server-Patches/0431-Expose-MinecraftServer-isRunning.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 35e1739c4c90f4f27ed2b729a2ec2522b3aa0c06..fbc5d62d1ac2affc5240b114ee88375ff0199ef4 100644
index 2a1b0cbb09ebd35d7008ede9a3f1241ff616e90b..9325b4f4f668ecd519d9c0106300d2b4c84bea63 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2380,5 +2380,10 @@ public final class CraftServer implements Server {
@@ -2377,5 +2377,10 @@ public final class CraftServer implements Server {
public int getCurrentTick() {
return net.minecraft.server.MinecraftServer.currentTick;
}

10
Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch
View File

@ -83,7 +83,7 @@ index 397194b3e90c9df39cfae17b401c7ac891b0dbb7..61b4c42e95994343772a91640b243b8e
a(SystemUtils.e);
a(SystemUtils.f);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 795cf9635ab6ac7f001476354813cac9d7e025eb..6f51409bac9c2907a5be02e4c15319fcc520609f 100644
index 506edef56ef6012424556f058996dbf690d4bae7..0498c62d695d627db26d8c932562f0e2cc7eec74 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -271,7 +271,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -287,7 +287,7 @@ index 5ccc70f36616e1bd8cdb8b23315f7422ec5acc61..b00c5a7eaf456e6d6ce250ee790ce33d
list.stream().map((playerchunk) -> {
CompletableFuture completablefuture;
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index cfe784560ea4c368d6e3a0797d09c0a717eb146e..795c4a9e3e33660af888ff80204bfd47a3b327fd 100644
index bc629c8355a0a2273bcf1285a22deb1ce1154bf9..524bbf9bdf5fb0e1e4ff217ae3291fdbe742437e 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -177,7 +177,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -345,10 +345,10 @@ index cc41dcd85760b57bb8076b37e9a907d1cb4e12c7..efcfc8f0f45901d14ac8fdf8ed7b0bd6
String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ();
System.err.println(msg);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fbc5d62d1ac2affc5240b114ee88375ff0199ef4..b55b2a27adba357faee0f260c8d7cc247d8d8238 100644
index 9325b4f4f668ecd519d9c0106300d2b4c84bea63..d1eb8818e5d7bb43ef014392a9dd5bc83a34d71a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1841,7 +1841,7 @@ public final class CraftServer implements Server {
@@ -1838,7 +1838,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@ -358,7 +358,7 @@ index fbc5d62d1ac2affc5240b114ee88375ff0199ef4..b55b2a27adba357faee0f260c8d7cc24
// Paper start
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c3e2d9c4d0ef3de80f5206c6bd234121ee1316cc..777116a0a0be6a5a00b1443204d6c53803af8051 100644
index a399c676c431c16468a55beb09a47ce0d5548769..f9edae56abff5f6b2e2f02dd52fd92feeda9f407 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -12,6 +12,8 @@ import java.util.logging.Level;

4
Spigot-Server-Patches/0461-Expose-game-version.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b55b2a27adba357faee0f260c8d7cc247d8d8238..688bf56b331cc4b6b9664365f97a98720ec522a9 100644
index d1eb8818e5d7bb43ef014392a9dd5bc83a34d71a..0196d729406133fe54af88c2c86404bed5905fd4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -518,6 +518,13 @@ public final class CraftServer implements Server {
@@ -517,6 +517,13 @@ public final class CraftServer implements Server {
return bukkitVersion;
}

6
Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/pom.xml b/pom.xml
index dd5f7dba3610b63aa16088a94bf3b459d496cb3c..1869a7fdb8e48dc94cd9c22c7d85298a06729b5b 100644
index 4c8a057e790c96b0ab5123549d0566371acacb46..1a9204c869dd36e80932b1366352db15ebd70723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,13 @@
@ -1043,10 +1043,10 @@ index 8c8e39d35fb56aa6cf7d456adab01dff5d13a60d..bcf6c924894f49f1c602b83b501f904e
public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 688bf56b331cc4b6b9664365f97a98720ec522a9..3b7a7791a221aaf39b4b6974b2f37efd403e4b25 100644
index 0196d729406133fe54af88c2c86404bed5905fd4..418a383eeabccf3d17fc5b05494918957c4f6ca3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2392,5 +2392,11 @@ public final class CraftServer implements Server {
@@ -2389,5 +2389,11 @@ public final class CraftServer implements Server {
public boolean isStopping() {
return net.minecraft.server.MinecraftServer.getServer().hasStopped();
}

6
Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch
View File

@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
if any are still running after that delay just as reload does.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e25539dd54956225e8b14d3b8c636130267f226d..9074646e8111c69c4875b0633a424b250a30bc5c 100644
index 1e7b3a14210edf453de9c1d9ebbb22be5d9f7a7a..1df2ff45edb4c71bf68ae37fe1cb0e5438e0373d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -893,6 +893,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -22,10 +22,10 @@ index e25539dd54956225e8b14d3b8c636130267f226d..9074646e8111c69c4875b0633a424b25
// CraftBukkit end
if (this.getServerConnection() != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3b7a7791a221aaf39b4b6974b2f37efd403e4b25..81627e0774442c15c62b8a13db865378411d7801 100644
index 418a383eeabccf3d17fc5b05494918957c4f6ca3..8b185beef31ef0f942249d2e9f76be3ffcc625e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -942,6 +942,35 @@ public final class CraftServer implements Server {
@@ -941,6 +941,35 @@ public final class CraftServer implements Server {
org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
}

6
Spigot-Server-Patches/0493-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
View File

@ -22,10 +22,10 @@ wants it to collect even faster, they can restore that setting back to 1 instead
Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 81627e0774442c15c62b8a13db865378411d7801..02de2c985e0dcb43ff10e686b608052e83629064 100644
index 8b185beef31ef0f942249d2e9f76be3ffcc625e0..c71814fb169637be83e9f125a91b251d2d6a469f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -346,7 +346,7 @@ public final class CraftServer implements Server {
@@ -345,7 +345,7 @@ public final class CraftServer implements Server {
ambientSpawn = configuration.getInt("spawn-limits.ambient");
console.autosavePeriod = configuration.getInt("ticks-per.autosave");
warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));
@ -34,7 +34,7 @@ index 81627e0774442c15c62b8a13db865378411d7801..02de2c985e0dcb43ff10e686b608052e
minimumAPI = configuration.getString("settings.minimum-api");
loadIcon();
}
@@ -837,7 +837,7 @@ public final class CraftServer implements Server {
@@ -836,7 +836,7 @@ public final class CraftServer implements Server {
waterAmbientSpawn = configuration.getInt("spawn-limits.water-ambient");
ambientSpawn = configuration.getInt("spawn-limits.ambient");
warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));

4
Spigot-Server-Patches/0523-Allow-delegation-to-vanilla-chunk-gen.patch
View File

@ -27,10 +27,10 @@ index 60ecd3a92af0f1968b10bb8babfb43147ef568d3..9077b70650d70dd294f53a1ef73e86e2
for (int l = 0; l < k; ++l) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 02de2c985e0dcb43ff10e686b608052e83629064..1e0546a14506a41d1a7b74d306b992cfbdf6e0cf 100644
index c71814fb169637be83e9f125a91b251d2d6a469f..f9ccd6f4be69a2b3770ccb0d0bdd8f96574cc13a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2034,6 +2034,32 @@ public final class CraftServer implements Server {
@@ -2031,6 +2031,32 @@ public final class CraftServer implements Server {
return new CraftChunkData(world);
}

4
Spigot-Server-Patches/0549-Add-setMaxPlayers-API.patch
View File

@ -18,10 +18,10 @@ index d3f3dc4ad2c758482b7a8d5c07caa526ce1e3424..8bd55e3d2b5142081a7dfe1dbbd36f2f
private EnumGamemode u;
private boolean v;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1e0546a14506a41d1a7b74d306b992cfbdf6e0cf..53254ad9e775e9e78da238a54be7d3fc4b8a6ced 100644
index f9ccd6f4be69a2b3770ccb0d0bdd8f96574cc13a..41da3e716427e91e733585583e441dde35f7b493 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -618,6 +618,13 @@ public final class CraftServer implements Server {
@@ -617,6 +617,13 @@ public final class CraftServer implements Server {
return playerList.getMaxPlayers();
}

4
Spigot-Server-Patches/0589-Add-getOfflinePlayerIfCached-String.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 53254ad9e775e9e78da238a54be7d3fc4b8a6ced..49d989545aa1a02ecc811a74f0283e779d2543a0 100644
index 41da3e716427e91e733585583e441dde35f7b493..50a97414b09e45f53e5f34f0af5f63db0e4bab89 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1614,6 +1614,28 @@ public final class CraftServer implements Server {
@@ -1611,6 +1611,28 @@ public final class CraftServer implements Server {
return result;
}

4
Spigot-Server-Patches/0654-Added-Vanilla-Entity-Tags.patch
View File

@ -40,10 +40,10 @@ index 0000000000000000000000000000000000000000..2ca8e1bade5450a14125b77540792e0b
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 49d989545aa1a02ecc811a74f0283e779d2543a0..19bd420e6bf625f77bb37755ff8364e5955feb2a 100644
index 50a97414b09e45f53e5f34f0af5f63db0e4bab89..75b3698e27327f0c03bbe3e0a9629239ff92e02e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2223,6 +2223,11 @@ public final class CraftServer implements Server {
@@ -2220,6 +2220,11 @@ public final class CraftServer implements Server {
Preconditions.checkArgument(clazz == org.bukkit.Fluid.class, "Fluid namespace must have fluid type");
return (org.bukkit.Tag<T>) new CraftFluidTag(console.getTagRegistry().getFluidTags(), key);

6
Spigot-Server-Patches/0672-misc-debugging-dumps.patch
View File

@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 952d5c7c3324377e0036b9d7e524484cb581e5b2..a116156236caa22d3ee13b5a56f4ed3c8d013f37 100644
index d043b758a68a6afcc36880f255723413fab57c2a..c9a8b7bfc9cd33185d5abedb50ea1bef0bbde8f9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -14,6 +14,7 @@ import io.netty.buffer.ByteBufOutputStream;
@ -66,7 +66,7 @@ index 952d5c7c3324377e0036b9d7e524484cb581e5b2..a116156236caa22d3ee13b5a56f4ed3c
try {
this.serverThread.join();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 19bd420e6bf625f77bb37755ff8364e5955feb2a..e8305df0ce11bf7c297bf5f0acc95f07324e4143 100644
index 75b3698e27327f0c03bbe3e0a9629239ff92e02e..15398675035d2955f84fb22b41d4db9e52fb0d4d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -18,6 +18,7 @@ import com.mojang.serialization.Lifecycle;
@ -77,7 +77,7 @@ index 19bd420e6bf625f77bb37755ff8364e5955feb2a..e8305df0ce11bf7c297bf5f0acc95f07
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -941,6 +942,7 @@ public final class CraftServer implements Server {
@@ -940,6 +941,7 @@ public final class CraftServer implements Server {
plugin.getDescription().getName(),
"This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin"
));

6
Spigot-Server-Patches/0689-Implement-Keyed-on-World.patch
View File

@ -64,10 +64,10 @@ index 760579921927b4c8b0f20b2611b95fd626e4b27f..3075700dfa992da81b10246fcf7c7ad1
return this.c;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e8305df0ce11bf7c297bf5f0acc95f07324e4143..6cc8eb04f42592aa12f76bb4a0a863ea509741b2 100644
index 15398675035d2955f84fb22b41d4db9e52fb0d4d..9e7b6043e6ead590689ed0d7341cd8b16d7f3c39 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1161,7 +1161,7 @@ public final class CraftServer implements Server {
@@ -1160,7 +1160,7 @@ public final class CraftServer implements Server {
} else if (name.equals(levelName + "_the_end")) {
worldKey = net.minecraft.world.level.World.THE_END;
} else {
@ -76,7 +76,7 @@ index e8305df0ce11bf7c297bf5f0acc95f07324e4143..6cc8eb04f42592aa12f76bb4a0a863ea
}
WorldServer internal = (WorldServer) new WorldServer(console, console.executorService, worldSession, worlddata, worldKey, dimensionmanager, getServer().worldLoadListenerFactory.create(11),
@@ -1253,6 +1253,15 @@ public final class CraftServer implements Server {
@@ -1250,6 +1250,15 @@ public final class CraftServer implements Server {
return null;
}

8
Spigot-Server-Patches/0731-Add-basic-Datapack-API.patch
View File

@ -134,7 +134,7 @@ index e87523612d0423d71eab7b9af851c1c268cdf84f..568da9686c41a41e43ede3fe15e0ca53
return this.c;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4a4987dbb 100644
index 9e7b6043e6ead590689ed0d7341cd8b16d7f3c39..3ef4197bcc2a98a983055856c099d41eea595d84 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -18,6 +18,7 @@ import com.mojang.serialization.Lifecycle;
@ -145,7 +145,7 @@ index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4
import io.papermc.paper.util.TraceUtil;
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
import java.awt.image.BufferedImage;
@@ -268,6 +269,7 @@ public final class CraftServer implements Server {
@@ -267,6 +268,7 @@ public final class CraftServer implements Server {
public boolean ignoreVanillaPermissions = false;
private final List<CraftPlayer> playerView;
public int reloadCount;
@ -153,7 +153,7 @@ index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4
public static Exception excessiveVelEx; // Paper - Velocity warnings
static {
@@ -350,6 +352,7 @@ public final class CraftServer implements Server {
@@ -349,6 +351,7 @@ public final class CraftServer implements Server {
TicketType.PLUGIN.loadPeriod = Math.min(20, configuration.getInt("chunk-gc.period-in-ticks")); // Paper - cap plugin loads to 1 second
minimumAPI = configuration.getString("settings.minimum-api");
loadIcon();
@ -161,7 +161,7 @@ index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4
}
public boolean getCommandBlockOverride(String command) {
@@ -2498,5 +2501,11 @@ public final class CraftServer implements Server {
@@ -2495,5 +2498,11 @@ public final class CraftServer implements Server {
public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
return mobGoals;
}

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 1e8c432cd90ffdd0300c7f73487649bae4c0aac8
Subproject commit cc21bae97758b850c5e36b6a97cd0850a28c28da