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

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9861)

Browse source
This commit is contained in:
Jake Potrebic 2023-10-26 14:56:40 -07:00 • committed by GitHub
parent c1ac98328c
commit acc6d012b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 409 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0011-Paper-command.patch
View file

@ -617,7 +617,7 @@ index a9ec28c3cf3ed50d929c80ac21959d82603ff0aa..95a4bcd09f3a9d462ff4c92431c07e3d
this.setPvpAllowed(dedicatedserverproperties.pvp);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e04b981e990efc6402978a329dee8024440b48fa..f75e17f3b475fcdaa2aa83829df647a09b863071 100644
index 39a3ab010a2960ea99a6cc246edd343994bb523f..411d744bbdbc333b1f3854e474964c10a955ed66 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -942,6 +942,7 @@ public final class CraftServer implements Server {
@ -628,7 +628,7 @@ index e04b981e990efc6402978a329dee8024440b48fa..f75e17f3b475fcdaa2aa83829df647a0
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2535,6 +2536,34 @@ public final class CraftServer implements Server {
@@ -2536,6 +2537,34 @@ public final class CraftServer implements Server {
// Paper end
// Paper start