Skip to content

Commit c1bd3cc

Browse files
Machine-MakerMachine-Maker
authored
Updated Upstream (CraftBukkit) (#7105)
1 parent 91f3eda commit c1bd3cc

25 files changed

+56
-68
lines changed

‎patches/server/0004-Paper-config-files.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ index aaf71bfb582d1d86d67205618825411babd2625a..f18ae5b80c930c3a7c2da079b9926ab2
714714
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
715715
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
716716
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
717-
index ae0e8dc6fd3f8323c34df83450a16fc3c44a9e5e..980e5abe159ebfdf5334332b8d8201c0c0b66a7b 100644
717+
index 63a45a3bcde978bc34d14c498e2ec026975af94e..204f3ece37ebbc5159e80c2161801e45fa08dcd6 100644
718718
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
719719
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
720720
@@ -842,6 +842,7 @@ public final class CraftServer implements Server {
@@ -740,7 +740,7 @@ index ae0e8dc6fd3f8323c34df83450a16fc3c44a9e5e..980e5abe159ebfdf5334332b8d8201c0
740740
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
741741
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
742742

743-
@@ -2293,4 +2296,35 @@ public final class CraftServer implements Server {
743+
@@ -2287,4 +2290,35 @@ public final class CraftServer implements Server {
744744
return this.spigot;
745745
}
746746
// Spigot end

‎patches/server/0010-Timings-v2.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,10 +1713,10 @@ index ed639dbb4ea94839390778654c7dd0437bac41ac..1729af83b979e35a585c8d049b14dc23
17131713
};
17141714
}
17151715
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1716-
index 980e5abe159ebfdf5334332b8d8201c0c0b66a7b..59e619f745f62dec5a5fe304bbea75690a0b1663 100644
1716+
index 204f3ece37ebbc5159e80c2161801e45fa08dcd6..95046f9499a1dee5bcb4e2aab03ca6b11b4b145b 100644
17171717
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
17181718
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1719-
@@ -2265,12 +2265,31 @@ public final class CraftServer implements Server {
1719+
@@ -2259,12 +2259,31 @@ public final class CraftServer implements Server {
17201720
private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
17211721
{
17221722

‎patches/server/0012-Adventure.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,7 @@ index 9af14095fa8dbc75fadb84c5a1d263039994e441..3b35ec1df648a3de920ea0c159623880
17181718
}
17191719
collection = icons;
17201720
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1721-
index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6f238f489 100644
1721+
index 7d1ff7636d5e91249c71303da708e754c90f0b92..693d92e3c72e8f76b12a14083efde0b5c6656050 100644
17221722
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
17231723
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
17241724
@@ -624,8 +624,10 @@ public final class CraftServer implements Server {
@@ -1732,7 +1732,7 @@ index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6
17321732
}
17331733

17341734
@Override
1735-
@@ -1460,7 +1462,15 @@ public final class CraftServer implements Server {
1735+
@@ -1454,7 +1456,15 @@ public final class CraftServer implements Server {
17361736
return this.configuration.getInt("settings.spawn-radius", -1);
17371737
}
17381738

@@ -1748,7 +1748,7 @@ index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6
17481748
public String getShutdownMessage() {
17491749
return this.configuration.getString("settings.shutdown-message");
17501750
}
1751-
@@ -1618,7 +1628,20 @@ public final class CraftServer implements Server {
1751+
@@ -1612,7 +1622,20 @@ public final class CraftServer implements Server {
17521752
}
17531753

17541754
@Override
@@ -1769,7 +1769,7 @@ index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6
17691769
Set<CommandSender> recipients = new HashSet<>();
17701770
for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
17711771
if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
1772-
@@ -1626,14 +1649,14 @@ public final class CraftServer implements Server {
1772+
@@ -1620,14 +1643,14 @@ public final class CraftServer implements Server {
17731773
}
17741774
}
17751775

@@ -1786,7 +1786,7 @@ index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6
17861786

17871787
for (CommandSender recipient : recipients) {
17881788
recipient.sendMessage(message);
1789-
@@ -1869,6 +1892,14 @@ public final class CraftServer implements Server {
1789+
@@ -1863,6 +1886,14 @@ public final class CraftServer implements Server {
17901790
return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
17911791
}
17921792

@@ -1801,7 +1801,7 @@ index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6
18011801
@Override
18021802
public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
18031803
Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type);
1804-
@@ -1881,13 +1912,28 @@ public final class CraftServer implements Server {
1804+
@@ -1875,13 +1906,28 @@ public final class CraftServer implements Server {
18051805
return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
18061806
}
18071807

@@ -1830,7 +1830,7 @@ index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6
18301830
public Merchant createMerchant(String title) {
18311831
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
18321832
}
1833-
@@ -1936,6 +1982,12 @@ public final class CraftServer implements Server {
1833+
@@ -1930,6 +1976,12 @@ public final class CraftServer implements Server {
18341834
return Thread.currentThread().equals(console.serverThread) || this.console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog)
18351835
}
18361836

@@ -1843,7 +1843,7 @@ index 23cba4bd17742733659aef498aa39d12ef48ca1d..cf79b158c7fbbb3ccddd4472eceb27d6
18431843
@Override
18441844
public String getMotd() {
18451845
return this.console.getMotd();
1846-
@@ -2379,5 +2431,15 @@ public final class CraftServer implements Server {
1846+
@@ -2373,5 +2425,15 @@ public final class CraftServer implements Server {
18471847
return null;
18481848
}
18491849
}

‎patches/server/0025-Further-improve-server-tick-loop.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ index f1dfb56d0158d36b583b5ee5596235540b2cb11c..b86ceda8f7376334987955095234bdec
144144
this.startMetricsRecordingTick();
145145
this.profiler.push("tick");
146146
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
147-
index cfdc78fe0820d47d8af055e844b08ea003d74368..528687b7672ebf6e25fc0fc120fffe158e543bb3 100644
147+
index 50ed646021808e23876735d50c727a0f300f596e..3fdfa7750436f78ce6f0c5bac68ee0e602e8ec67 100644
148148
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
149149
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
150-
@@ -2347,6 +2347,17 @@ public final class CraftServer implements Server {
150+
@@ -2341,6 +2341,17 @@ public final class CraftServer implements Server {
151151
return CraftMagicNumbers.INSTANCE;
152152
}
153153

‎patches/server/0049-Expose-server-CommandMap.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
55

66

77
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
8-
index 99c1ca9a93092465c08723b919aa61dff747bd66..d30b04375eaed44ae63b3e60ab9ac8a42478a604 100644
8+
index 9284b5a3b303222df23bee4b66551c08f4c55c1f..1f9e896b70888708d6420c060d8657b9ff7e60c4 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
11-
@@ -1965,6 +1965,7 @@ public final class CraftServer implements Server {
11+
@@ -1959,6 +1959,7 @@ public final class CraftServer implements Server {
1212
return this.helpMap;
1313
}
1414

‎patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
66
https://github.com/PaperMC/Paper/issues/49
77

88
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
9-
index fb220fb9567bbbbeb0ec5515359a5b5308df2e1b..8e0e98506a647428a06b1cda094c7e00990bdfe8 100644
9+
index f473ec0852648198a1633fb5c916ed2bfc49630d..9e6bfd8e5ca42bb72d3d56ae7eb82c0f704f15e1 100644
1010
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1111
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
12-
@@ -2477,5 +2477,23 @@ public final class CraftServer implements Server {
12+
@@ -2471,5 +2471,23 @@ public final class CraftServer implements Server {
1313
}
1414
return this.adventure$audiences;
1515
}

‎patches/server/0103-Add-setting-for-proxy-online-mode-status.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ index 876658b685ea09adb4c01d436da56daadb7eedaa..5445cb5910ec63408dc4379eec5e12d3
6767
} else {
6868
String[] astring1 = astring;
6969
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
70-
index 448544b7d290e8e98322833ec55b467e43209cae..921fc7003d2a77f195f5febe674383803950fb96 100644
70+
index dd5bf92faef1f7a9c5cf48eb9b1cc04272d2bd70..8b438464892f9d78457a2b09cb4670da2e356549 100644
7171
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
7272
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
73-
@@ -1708,7 +1708,7 @@ public final class CraftServer implements Server {
73+
@@ -1702,7 +1702,7 @@ public final class CraftServer implements Server {
7474
// Spigot Start
7575
GameProfile profile = null;
7676
// Only fetch an online UUID in online mode

‎patches/server/0112-Allow-Reloading-of-Command-Aliases.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
66
Reload the aliases stored in commands.yml
77

88
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
9-
index 921fc7003d2a77f195f5febe674383803950fb96..2faf65a0bf3a14c891b9c603f831b66926bde87e 100644
9+
index 8b438464892f9d78457a2b09cb4670da2e356549..53e3ab7845934e0bbc1923be84eeb34e72794777 100644
1010
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1111
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
12-
@@ -2503,5 +2503,24 @@ public final class CraftServer implements Server {
12+
@@ -2497,5 +2497,24 @@ public final class CraftServer implements Server {
1313
DefaultPermissions.registerCorePermissions();
1414
CraftDefaultPermissions.registerCorePermissions();
1515
}

‎patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ index 5e23ff0c5e44427a996281ae42fc12c28649e158..7a69f9d9bb9c05474d8fbab22d626529
2020
+ }
2121
}
2222
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
23-
index 2faf65a0bf3a14c891b9c603f831b66926bde87e..93e3d587f7d1d621e8aedb8e53f38a8df21b5587 100644
23+
index 53e3ab7845934e0bbc1923be84eeb34e72794777..39e99daae4bb16fca5e14edf86f300f040d535eb 100644
2424
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2525
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
26-
@@ -2522,5 +2522,10 @@ public final class CraftServer implements Server {
26+
@@ -2516,5 +2516,10 @@ public final class CraftServer implements Server {
2727
commandMap.registerServerAliases();
2828
return true;
2929
}

‎patches/server/0143-Basic-PlayerProfile-API.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ index ff4def7ec3dcfa30fdc0135bd1add8e47989fb36..4f45ac04a219e619c13b31befd2c4e45
460460
* Calculates distance between 2 entities
461461
* @param e1
462462
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
463-
index a497b281d03c097587b21e9f141a6a66f36e4dad..4ab820c43ddc79f5a280e2d4b322a667b9ba725f 100644
463+
index 156fa293626119caf0cf414505fdf0e96eaa08b7..e98492adfb83c24e1baa6cab24cca55f3ec151bf 100644
464464
--- a/src/main/java/net/minecraft/server/Main.java
465465
+++ b/src/main/java/net/minecraft/server/Main.java
466466
@@ -135,7 +135,7 @@ public class Main {
@@ -491,7 +491,7 @@ index 00f783aafd81fa7e836e4eea5bfeac7434f33b0f..3789441e2df9410aa1c6efe59054aaba
491491
String s1 = name.toLowerCase(Locale.ROOT);
492492
GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
493493
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
494-
index e873cc1e27fc3fe65e7bb07c5bec7f599c32be32..0c1378bbee14a9fc3c81288e963e2709238830ae 100644
494+
index 23941b3ef194818483f0903b5b4793391c16f705..f824c8725ac104c93e0c24c90d3825bfb153cd2a 100644
495495
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
496496
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
497497
@@ -248,6 +248,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -504,7 +504,7 @@ index e873cc1e27fc3fe65e7bb07c5bec7f599c32be32..0c1378bbee14a9fc3c81288e963e2709
504504
public final class CraftServer implements Server {
505505
private final String serverName = "Paper"; // Paper
506506
private final String serverVersion;
507-
@@ -2537,5 +2540,24 @@ public final class CraftServer implements Server {
507+
@@ -2531,5 +2534,24 @@ public final class CraftServer implements Server {
508508
public boolean suggestPlayerNamesWhenNullTabCompletions() {
509509
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
510510
}

0 commit comments

Comments
 (0)