mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-06-23 10:47:47 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e2c7e5cf Limit projectiles size PaperMC/Paper@ca5e948a Fix override of new item for Firework entity (#13891) PaperMC/Paper@20938c72 Set Obsolete the use of PotionMeta in Potion entities (#13892) PaperMC/Paper@76d2ac75 [ci/skip] Fix AreaEffectCloud doc comments (#13926) PaperMC/Paper@f414ba89 run generator PaperMC/Paper@9194ea20 fix duplicate goal name for cube mobs PaperMC/Paper@b0c2992a Fix "-1 releases behind" being logged for early snapshots PaperMC/Paper@46a24d6a Merge remote-tracking branch 'origin/main' into dev/26.2 PaperMC/Paper@2c0dfb53 Fix emptying sulfur cube bucket doesn't work PaperMC/Paper@b1b09191 update todo PaperMC/Paper@f23495f0 Commodore rewriting for breaking slime API change PaperMC/Paper@9a1623b3 fix tests PaperMC/Paper@611a0ab5 Update to 26.2-pre-4 PaperMC/Paper@87cc35db delegate more stuff to CraftItemStack PaperMC/Paper@8ea9659a bump built-in pack and regenerate tags PaperMC/Paper@46cc8588 fix dispense events a bit PaperMC/Paper@5c5ff5c8 remove redundant bed updates PaperMC/Paper@1b087229 Unapply hopper patch PaperMC/Paper@c600b162 skip POI cleanup when place event is cancelled for now
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
|
||||
CraftRegistry.setMinecraftRegistry(console.registryAccess());
|
||||
|
||||
@@ -990,6 +_,7 @@
|
||||
@@ -989,6 +_,7 @@
|
||||
|
||||
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
|
||||
this.console.paperConfigurations.reloadConfigs(this.console);
|
||||
@@ -29,7 +29,7 @@
|
||||
for (ServerLevel world : this.console.getAllLevels()) {
|
||||
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
||||
world.setSpawnSettings(world.isSpawningMonsters()); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
|
||||
@@ -1005,6 +_,7 @@
|
||||
@@ -1004,6 +_,7 @@
|
||||
}
|
||||
}
|
||||
world.spigotConfig.init(); // Spigot
|
||||
@@ -37,7 +37,7 @@
|
||||
}
|
||||
|
||||
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
||||
@@ -1022,6 +_,7 @@
|
||||
@@ -1021,6 +_,7 @@
|
||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
|
||||
this.spark.registerCommandBeforePlugins(this); // Paper - spark
|
||||
@@ -45,7 +45,7 @@
|
||||
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
||||
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
||||
|
||||
@@ -1479,6 +_,60 @@
|
||||
@@ -1478,6 +_,60 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
@Override
|
||||
public List<Recipe> getRecipesFor(ItemStack result) {
|
||||
Preconditions.checkArgument(result != null, "ItemStack cannot be null");
|
||||
@@ -2725,6 +_,18 @@
|
||||
@@ -2723,6 +_,18 @@
|
||||
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
@Override
|
||||
public void restart() {
|
||||
CraftServer.this.restart();
|
||||
@@ -2960,4 +_,18 @@
|
||||
@@ -2958,4 +_,18 @@
|
||||
public void allowPausing(final Plugin plugin, final boolean value) {
|
||||
this.console.addPluginAllowingSleep(plugin.getName(), value);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
@@ -681,4 +_,285 @@
|
||||
@@ -782,4 +_,285 @@
|
||||
}
|
||||
|
||||
// Paper end - data component API
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
@@ -492,7 +_,7 @@
|
||||
@@ -486,7 +_,7 @@
|
||||
|
||||
@Override
|
||||
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
|
||||
|
||||
Reference in New Issue
Block a user