mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@04b91129 Update projects dependents GitHub Action (#12436) PaperMC/Paper@def0532f Fix writing headers and update to be more papery (#12459) PaperMC/Paper@d22644aa Expand cooldown API (#12435) PaperMC/Paper@df429932 Fix floating warning log when the kick event is canceled (#12374) PaperMC/Paper@a820bdae [ci/skip] Some javadoc fixes PaperMC/Paper@55f20209 Fix CCE in LingeringPotionSplashEvent (#12463)
This commit is contained in:
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
|
|||||||
version = 1.21.5-R0.1-SNAPSHOT
|
version = 1.21.5-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion = 1.21.5
|
mcVersion = 1.21.5
|
||||||
paperCommit = 5f0b82925e06c90400b4069631b15c8f2c47c76d
|
paperCommit = 55f20209262cb196976e18d155551fb13c3d1554
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
CraftRegistry.setMinecraftRegistry(console.registryAccess());
|
CraftRegistry.setMinecraftRegistry(console.registryAccess());
|
||||||
|
|
||||||
@@ -1064,6 +_,7 @@
|
@@ -1067,6 +_,7 @@
|
||||||
|
|
||||||
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
|
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
|
||||||
this.console.paperConfigurations.reloadConfigs(this.console);
|
this.console.paperConfigurations.reloadConfigs(this.console);
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
for (ServerLevel world : this.console.getAllLevels()) {
|
for (ServerLevel world : this.console.getAllLevels()) {
|
||||||
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
||||||
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
|
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
|
||||||
@@ -1079,6 +_,7 @@
|
@@ -1082,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
world.spigotConfig.init(); // Spigot
|
world.spigotConfig.init(); // Spigot
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
||||||
@@ -1096,6 +_,7 @@
|
@@ -1099,6 +_,7 @@
|
||||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||||
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
|
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
|
||||||
this.spark.registerCommandBeforePlugins(this); // Paper - spark
|
this.spark.registerCommandBeforePlugins(this); // Paper - spark
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
||||||
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
||||||
|
|
||||||
@@ -1595,6 +_,60 @@
|
@@ -1598,6 +_,60 @@
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
@Override
|
@Override
|
||||||
public List<Recipe> getRecipesFor(ItemStack result) {
|
public List<Recipe> getRecipesFor(ItemStack result) {
|
||||||
Preconditions.checkArgument(result != null, "ItemStack cannot be null");
|
Preconditions.checkArgument(result != null, "ItemStack cannot be null");
|
||||||
@@ -2942,6 +_,18 @@
|
@@ -2945,6 +_,18 @@
|
||||||
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
|
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
@Override
|
@Override
|
||||||
public void restart() {
|
public void restart() {
|
||||||
CraftServer.this.restart();
|
CraftServer.this.restart();
|
||||||
@@ -2974,6 +_,7 @@
|
@@ -2977,6 +_,7 @@
|
||||||
@Override
|
@Override
|
||||||
public double[] getTPS() {
|
public double[] getTPS() {
|
||||||
return new double[] {
|
return new double[] {
|
||||||
@@ -133,7 +133,7 @@
|
|||||||
net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
|
net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
|
||||||
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
|
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
|
||||||
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
|
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
|
||||||
@@ -3181,4 +_,18 @@
|
@@ -3184,4 +_,18 @@
|
||||||
public void allowPausing(final Plugin plugin, final boolean value) {
|
public void allowPausing(final Plugin plugin, final boolean value) {
|
||||||
this.console.addPluginAllowingSleep(plugin.getName(), value);
|
this.console.addPluginAllowingSleep(plugin.getName(), value);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
@@ -277,6 +_,7 @@
|
@@ -279,6 +_,7 @@
|
||||||
@Override
|
@Override
|
||||||
public void recalculatePermissions() {
|
public void recalculatePermissions() {
|
||||||
this.perm.recalculatePermissions();
|
this.perm.recalculatePermissions();
|
||||||
|
|||||||
Reference in New Issue
Block a user