Skip to content

Commit a36d7f6

Browse files
kennytvkennytv
committed
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: 808cb7c PR-1023: Improve consistency of tag API
1 parent 1e12cf8 commit a36d7f6

18 files changed

+55
-61
lines changed

‎patches/api/0175-Fix-Spigot-annotation-mistakes.patch‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ index 88b3e0323dbc4f0fce31b147c7aaa08d65745852..23ca89dde7f6ac9082d4b97fce295942
6262
if (this.world == null) {
6363
return null;
6464
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
65-
index f43720d07e80e3d2937f5b271664b5268d7af027..49bcc2edea32ef2b31b9ed5c3a62140bcc81ffc9 100644
65+
index f43720d07e80e3d2937f5b271664b5268d7af027..4cd7dae2e6f530a402de460f61d57a27f5763b73 100644
6666
--- a/src/main/java/org/bukkit/Server.java
6767
+++ b/src/main/java/org/bukkit/Server.java
6868
@@ -1429,7 +1429,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -73,15 +73,6 @@ index f43720d07e80e3d2937f5b271664b5268d7af027..49bcc2edea32ef2b31b9ed5c3a62140b
7373
+ @NotNull // Paper
7474
ScoreboardManager getScoreboardManager();
7575

76-
/**
77-
@@ -1699,7 +1699,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
78-
* @param clazz the class of the tag entries
79-
* @return the tag or null
80-
*/
81-
- @Nullable
82-
+ @UndefinedNullability // Paper
83-
<T extends Keyed> Tag<T> getTag(@NotNull String registry, @NotNull NamespacedKey tag, @NotNull Class<T> clazz);
84-
8576
/**
8677
diff --git a/src/main/java/org/bukkit/entity/LingeringPotion.java b/src/main/java/org/bukkit/entity/LingeringPotion.java
8778
index f124b35ec76e6cb6a1a0dc464005087043c3efd0..94a2fef0dc9e13c754cd31d5eabc1bde2dbbe6a5 100644

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ index 9e4cca119722c2edc478fdd1a34af4370649aa5c..b49528d8a2c577def4f74ee694ffd53b
629629
Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
630630
WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
631631
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
632-
index 2a7a6a21d22bec6457845ec972f12321f534800f..8754e5899067bc5e8e83a6264c6fcc38846f6baa 100644
632+
index 9d38f78ba0db10578cfbcce29059e108272d0034..89522ebf7b11801cf8b9893a1bae50a1ee88ff79 100644
633633
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
634634
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
635635
@@ -603,6 +603,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -714,7 +714,7 @@ index 3dce5044332ee4a8f685ab1cde02cd4c72a85b63..6ded806628f2f3fd5b357eed41990abd
714714
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
715715

716716
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
717-
index d27dac2620a1b0700db76a1498ed8267c5b5828c..eac877cda0cd37d8717c770b86b590213ee0567e 100644
717+
index 05364e743e5000f1eff292b17bbd19dae58e3dac..e71bc0315f9e4559e2df6a83a3c11f1024d17de9 100644
718718
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
719719
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
720720
@@ -865,6 +865,7 @@ public final class CraftServer implements Server {
@@ -740,7 +740,7 @@ index d27dac2620a1b0700db76a1498ed8267c5b5828c..eac877cda0cd37d8717c770b86b59021
740740
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
741741
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
742742

743-
@@ -2308,4 +2311,35 @@ public final class CraftServer implements Server {
743+
@@ -2325,4 +2328,35 @@ public final class CraftServer implements Server {
744744
return this.spigot;
745745
}
746746
// Spigot end

‎patches/server/0008-Adventure.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ index 595b56b2ab9a813ba71399d306117294fa90dc65..3527d40102d512d0e276edc969ea3c18
16351635
}
16361636
collection = icons;
16371637
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1638-
index 93b70a144bca1e567b0d3f3eafc1dd4b3ac2d2ba..5410f0fe131af48d5c46a0fe6028c2b16eb2de16 100644
1638+
index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72ec84b062 100644
16391639
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
16401640
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
16411641
@@ -585,8 +585,10 @@ public final class CraftServer implements Server {
@@ -1760,7 +1760,7 @@ index 93b70a144bca1e567b0d3f3eafc1dd4b3ac2d2ba..5410f0fe131af48d5c46a0fe6028c2b1
17601760
@Override
17611761
public String getMotd() {
17621762
return this.console.getMotd();
1763-
@@ -2341,5 +2393,15 @@ public final class CraftServer implements Server {
1763+
@@ -2358,5 +2410,15 @@ public final class CraftServer implements Server {
17641764
return null;
17651765
}
17661766
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,10 +1700,10 @@ index 95abf42577725383a2b49242c28b81beef487ee5..4e5cfc508e356691a9a249013553f97e
17001700
};
17011701
}
17021702
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1703-
index 5410f0fe131af48d5c46a0fe6028c2b16eb2de16..0f1784e2cdde46f2213e540f1959a9c42d5db0c0 100644
1703+
index 586bfdc39840170b6bb43ef99a1e1f72ec84b062..fe5454f9e2507824c78cab3e31428608bf229ce1 100644
17041704
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
17051705
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1706-
@@ -2332,12 +2332,31 @@ public final class CraftServer implements Server {
1706+
@@ -2349,12 +2349,31 @@ public final class CraftServer implements Server {
17071707
private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
17081708
{
17091709

‎patches/server/0026-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 8bacbb2289a9e5203766d71be6ba0a31f48b626e..18f03367174651b93682d5e5f4350d8c
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 ad70bb6419bdfa75ffc8ce4f42150097ef0ead0f..8f1d3ac7c59963feb54cba60f749880fd9e8fcd9 100644
147+
index bb304601b3795349dd45d94c53f082a3bcc17273..3636921da74f5271a15d79d431c8a33a2c83cd96 100644
148148
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
149149
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
150-
@@ -2362,6 +2362,17 @@ public final class CraftServer implements Server {
150+
@@ -2379,6 +2379,17 @@ public final class CraftServer implements Server {
151151
return CraftMagicNumbers.INSTANCE;
152152
}
153153

‎patches/server/0064-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 c30eb1c910147ddd6237078367ce29f9e015af9e..39c847d68b9195d082d324485fee83332e07f59a 100644
9+
index b89ca165b7103b8a0d6a8e49e62657c70329890a..17fe7e47d9e11ca7c82bde34dc478c590328fb00 100644
1010
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1111
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
12-
@@ -2492,5 +2492,23 @@ public final class CraftServer implements Server {
12+
@@ -2509,5 +2509,23 @@ public final class CraftServer implements Server {
1313
}
1414
return this.adventure$audiences;
1515
}

‎patches/server/0113-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 2b6df52d586acf28aaf531c39073cf9448c589f9..eacf4e00d7ce0c1458428237e6c67aaddb45b77a 100644
9+
index 630ff9daa7bbe55e0e52f6127c496fdd10876c6e..5ce9ce7169e346d0156559295ee1bae5c8d45870 100644
1010
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1111
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
12-
@@ -2518,5 +2518,24 @@ public final class CraftServer implements Server {
12+
@@ -2535,5 +2535,24 @@ public final class CraftServer implements Server {
1313
DefaultPermissions.registerCorePermissions();
1414
CraftDefaultPermissions.registerCorePermissions();
1515
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
66

77

88
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
9-
index 7612ee9bb6877dea0ff83d03f393180048ff960c..352cec8559923189dcea5c97066ef2f90cc4023b 100644
9+
index 785660014a4a489decdf5e9febd3f6e4f82735fa..90b1803c111b26f299953eec15745bc4f180d4bd 100644
1010
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
1111
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
1212
@@ -280,4 +280,9 @@ public class PaperConfig {
@@ -20,10 +20,10 @@ index 7612ee9bb6877dea0ff83d03f393180048ff960c..352cec8559923189dcea5c97066ef2f9
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 eacf4e00d7ce0c1458428237e6c67aaddb45b77a..ef55ae870e341af0087bc99341a77c5d1b851328 100644
23+
index 5ce9ce7169e346d0156559295ee1bae5c8d45870..57999f25a820cc9b395f6c3037e0fcce9bc4a80c 100644
2424
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2525
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
26-
@@ -2537,5 +2537,10 @@ public final class CraftServer implements Server {
26+
@@ -2554,5 +2554,10 @@ public final class CraftServer implements Server {
2727
commandMap.registerServerAliases();
2828
return true;
2929
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ index c3e3a9950ee05dc97f15ab128e40854901f38a2f..95974d78196397136179f8d6acf1597c
617617
String s1 = name.toLowerCase(Locale.ROOT);
618618
GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
619619
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
620-
index 40d9766bbf53f858a3debd83319152cbd11ef7ed..a380f59ea01cec492f2d2bef6bb6509a07998d07 100644
620+
index 179ba5ae2406d8babfdec386fc8125960043d586..24f361820f195e948f617cd134352e098b298b5d 100644
621621
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
622622
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
623623
@@ -243,6 +243,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -638,7 +638,7 @@ index 40d9766bbf53f858a3debd83319152cbd11ef7ed..a380f59ea01cec492f2d2bef6bb6509a
638638
CraftItemFactory.instance();
639639
}
640640

641-
@@ -2551,5 +2555,24 @@ public final class CraftServer implements Server {
641+
@@ -2568,5 +2572,24 @@ public final class CraftServer implements Server {
642642
public boolean suggestPlayerNamesWhenNullTabCompletions() {
643643
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
644644
}

‎patches/server/0291-Make-the-default-permission-message-configurable.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ index 1fa190e098079522e0fe3593fa261c1b7ad4e24b..1eb45df9dca5d0c31ac46709e706136a
1818
}
1919

2020
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
21-
index c63b7b01094abaf41bc58c123d6ddeb68bc32195..0b0cdbea6693c18519212604a391e8100afbcc70 100644
21+
index d728c42ba986c5c354a205b1eb4c4d93b0b2d128..f938bd401c384d8e03c8ff90af08efc70629c77e 100644
2222
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
2323
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2424
@@ -20,6 +20,7 @@ import java.util.regex.Pattern;
@@ -42,10 +42,10 @@ index c63b7b01094abaf41bc58c123d6ddeb68bc32195..0b0cdbea6693c18519212604a391e810
4242
Object val = config.get("settings.save-player-data");
4343
if (val instanceof Boolean) {
4444
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
45-
index 532185882420c04c1a996a7d269af554ee106ed1..1373f00a5a93fbb34cc7cb47683a1eef48e88c8c 100644
45+
index 39389c3389eb6b118b662cb77552d198b0b21c05..ba0b22c45e0bdcda7087a262a82405a9efe8cc61 100644
4646
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
4747
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
48-
@@ -2577,6 +2577,11 @@ public final class CraftServer implements Server {
48+
@@ -2594,6 +2594,11 @@ public final class CraftServer implements Server {
4949
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
5050
}
5151

0 commit comments

Comments
 (0)