Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-20 23:39:16 +00:00
Code Issues Releases Activity

Update Upstream

Browse Source
This commit is contained in:
NONPLAYT
2023-05-16 18:37:16 +03:00
parent e6f183a8f0
commit 6c61f08588
33 changed files with 46 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group=gq.bxteam.divinemc group=gq.bxteam.divinemc
version=1.19.4-R0.1-SNAPSHOT version=1.19.4-R0.1-SNAPSHOT
purpurRef=54656e975527d263415f7905873e0709d3e2576a purpurRef=b84222981c11a522e56db80b5005ba2108fa0ee0
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

8
patches/api/0003-Rework-Spigot-Deprecations.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Rework Spigot Deprecations
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index 3578ab0c3a413d56bc39af43b5d3201d20d7d13a..29ac48445c3b6d14b1b549d856c350df6712ccac 100644 index df642a55003517040be795b44a8bf107dd88810b..09ae729cfdcc60c3315e3d87422e92db8c482fe5 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java --- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -160,9 +160,11 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -165,9 +165,11 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
* UTC. * UTC.
* *
* @return Date of last log-in for this player, or 0 * @return Date of last log-in for this player, or 0
@@ -59,10 +59,10 @@ index fc4d3bcd9b16097086fef7975274d825b65adb10..e485975dbb6973d2b21259c4e4d5d751
void resetMaxHealth(); void resetMaxHealth();
} }
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 43cef54d355c8a1b6a8cd6be89a6a805e9f88566..457facce52256c42c3c249ec7f4b3ed4f0269618 100644 index 838f32eb3397d847071f54648dbac02c35d621cf..93279bcd93e17f2460782b0da09745242a2c45c0 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -279,14 +279,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -280,14 +280,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Returns true if the entity is supported by a block. * Returns true if the entity is supported by a block.
* *
* This value is a state updated by the client after each movement. * This value is a state updated by the client after each movement.

4
patches/api/0005-Paper-PR-BoneMeal-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR - BoneMeal API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index cf8b93aa5787e96f54e2ffe2a0f157b0e53e2c5c..5bbab861056ff3277f2778c3cb2eb9367cdab012 100644 index 4561ca02052d774bc1424f7044c34f7affd415fc..7f668a21f3e92d7f98f1bc82d84fdf76be5308f1 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -4157,4 +4157,20 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @@ -4112,4 +4112,20 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
} }
} }
} }

0
patches/api/0007-Additional-pathfinding-API.patch → patches/api/0006-Additional-pathfinding-API.patch
View File

27
patches/api/0006-Paper-PR-Add-sendTitleUpdate-for-inventories.patch
View File

@@ -1,27 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: nopjar <code.nopjar@gmail.com>
Date: Mon, 13 Jun 2022 11:29:42 +0200
Subject: [PATCH] Paper PR - Add sendTitleUpdate for inventories
diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java
index daca40b63e95ea33178bcb54ad45911da591ca54..957e2d091e40ecc283343b7b07b813406d75e852 100644
--- a/src/main/java/org/bukkit/inventory/InventoryView.java
+++ b/src/main/java/org/bukkit/inventory/InventoryView.java
@@ -468,4 +468,16 @@ public abstract class InventoryView {
@Deprecated // Paper
@NotNull
public abstract String getTitle();
+
+ // Paper start
+ /**
+ * Sends a packet to the client to open a new inventory with the new title.
+ * <p>
+ * The ID of the inventory and the contents stay the same. This does not affect the title on the
+ * server. Methods like {@link #title()} will still return the old title.
+ *
+ * @param title the new title
+ */
+ public abstract void sendTitleUpdate(@NotNull net.kyori.adventure.text.Component title);
+ // Paper end
}

0
patches/api/0008-Optimize-spigot-event-bus.patch → patches/api/0007-Optimize-spigot-event-bus.patch
View File

6
patches/server/0001-Divine-Branding.patch
View File

@@ -139,10 +139,10 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a
.completer(new ConsoleCommandCompleter(this.server)) .completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true); .option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 861afc3e8fed9884d4efb0b9548cfc2df9c27adc..4f301b0b2010086b9ec478d784cf2c89f180c4bc 100644 index e5bac6bc792196226f975e7f3dd8f147fb14dbad..165c95a8ef6a07669eda17ef6b745ca48f4483b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -256,7 +256,7 @@ import javax.annotation.Nullable; // Paper @@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server { public final class CraftServer implements Server {
@@ -165,7 +165,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..627ceea9fa0fccd3e466eb34d59e760b
if (stream != null) { if (stream != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ad7d3b71cf2f2e20794345c590e161d41b78b2d5..780e817ea27f519d6c7de61699d59bf422e8c1ae 100644 index 62ad4c6ad417e11e9152f74636b2ff0d187d0799..0dfd997fea4154896f5a3a04cdfd2d9ab706004f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -227,7 +227,7 @@ public class PurpurConfig { @@ -227,7 +227,7 @@ public class PurpurConfig {

16
patches/server/0002-Divine-Configuration.patch
View File

@@ -327,10 +327,10 @@ index 0000000000000000000000000000000000000000..5d16d2250bae9c982a0af9ad2580a635
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 582467e3419c23446b20d3076fbfce22115250a8..6a12c93b730838a06af7ac8801433a394064e2bc 100644 index 6ecc75621867390738e804e06ac284524664473d..11f95ce3777c2b1d4b33cecff112a7e9d13f332e 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -233,6 +233,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -234,6 +234,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur
gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
@@ -376,7 +376,7 @@ index b8001bca2a33ec1e60566948a651400418a6e9e7..e39b3c7a67de82dd5165f9276f374cd8
this.generator = gen; this.generator = gen;
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 861afc3e8fed9884d4efb0b9548cfc2df9c27adc..5d2d800e5aed4698c8692bcac58cf5baaa4c02c0 100644 index 165c95a8ef6a07669eda17ef6b745ca48f4483b8..3b06ad6139ce4c16dbad396c6a5ad8d03d0ef34a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode; @@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -387,7 +387,7 @@ index 861afc3e8fed9884d4efb0b9548cfc2df9c27adc..5d2d800e5aed4698c8692bcac58cf5ba
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@@ -971,6 +972,7 @@ public final class CraftServer implements Server { @@ -972,6 +973,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console); this.console.paperConfigurations.reloadConfigs(this.console);
org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
@@ -395,7 +395,7 @@ index 861afc3e8fed9884d4efb0b9548cfc2df9c27adc..5d2d800e5aed4698c8692bcac58cf5ba
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, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -987,6 +989,7 @@ public final class CraftServer implements Server { @@ -988,6 +990,7 @@ public final class CraftServer implements Server {
} }
world.spigotConfig.init(); // Spigot world.spigotConfig.init(); // Spigot
world.purpurConfig.init(); // Purpur world.purpurConfig.init(); // Purpur
@@ -403,7 +403,7 @@ index 861afc3e8fed9884d4efb0b9548cfc2df9c27adc..5d2d800e5aed4698c8692bcac58cf5ba
} }
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1003,6 +1006,7 @@ public final class CraftServer implements Server { @@ -1004,6 +1007,7 @@ public final class CraftServer implements Server {
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
org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
@@ -411,7 +411,7 @@ index 861afc3e8fed9884d4efb0b9548cfc2df9c27adc..5d2d800e5aed4698c8692bcac58cf5ba
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");
@@ -2824,6 +2828,13 @@ public final class CraftServer implements Server { @@ -2825,6 +2829,13 @@ public final class CraftServer implements Server {
} }
// Purpur end // Purpur end
@@ -426,7 +426,7 @@ index 861afc3e8fed9884d4efb0b9548cfc2df9c27adc..5d2d800e5aed4698c8692bcac58cf5ba
public void restart() { public void restart() {
org.spigotmc.RestartCommand.restart(); org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index d2e20a03bf031011b64d0ae15c09ab7105e0cffa..b5a242ccb63ad9ea1762905a4bf598c7d38ea64a 100644 index 2a8db3527f3680789125fca41097657063efb32d..8038bfada0cbab20d22e3305029ba32011665d22 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -187,6 +187,14 @@ public class Main { @@ -187,6 +187,14 @@ public class Main {

20
patches/server/0004-Optimize-default-values-for-configs.patch
View File

@@ -43,7 +43,7 @@ index 8d442c5a498ecf288a0cc0c54889c6e2fda849ce..fc60346bc7db6fba62dfa38bbc3d7d12
public boolean useDimensionTypeForCustomSpawners = false; public boolean useDimensionTypeForCustomSpawners = false;
public boolean strictAdvancementDimensionCheck = false; public boolean strictAdvancementDimensionCheck = false;
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index ee430563b99e48cd722c2897e4729936457d3017..2453b32ddcbd1cd3615621fda4a92b13c675d454 100644 index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf16897bb66 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -115,9 +115,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -115,9 +115,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -167,9 +167,9 @@ index ee430563b99e48cd722c2897e4729936457d3017..2453b32ddcbd1cd3615621fda4a92b13
+ map.put(EntityType.AREA_EFFECT_CLOUD, 8); + map.put(EntityType.AREA_EFFECT_CLOUD, 8);
+ // DivineMC end + // DivineMC end
}); });
public boolean flushRegionsOnSave = false;
} }
@@ -439,11 +452,22 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -438,11 +451,22 @@ public class WorldConfiguration extends ConfigurationPart {
public TickRates tickRates; public TickRates tickRates;
public class TickRates extends ConfigurationPart { public class TickRates extends ConfigurationPart {
@@ -197,7 +197,7 @@ index ee430563b99e48cd722c2897e4729936457d3017..2453b32ddcbd1cd3615621fda4a92b13
} }
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
@@ -450,7 +474,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -451,7 +475,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class FeatureSeeds extends ConfigurationPart.Post { public class FeatureSeeds extends ConfigurationPart.Post {
@Setting(FeatureSeedsGeneration.GENERATE_KEY) @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -206,7 +206,7 @@ index ee430563b99e48cd722c2897e4729936457d3017..2453b32ddcbd1cd3615621fda4a92b13
@Setting(FeatureSeedsGeneration.FEATURES_KEY) @Setting(FeatureSeedsGeneration.FEATURES_KEY)
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>(); public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
@@ -464,9 +488,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -465,9 +489,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart { public class Misc extends ConfigurationPart {
public int lightQueueSize = 20; public int lightQueueSize = 20;
@@ -219,7 +219,7 @@ index ee430563b99e48cd722c2897e4729936457d3017..2453b32ddcbd1cd3615621fda4a92b13
public float maxLeashDistance = 10f; public float maxLeashDistance = 10f;
public boolean disableSprintInterruptionOnAttack = false; public boolean disableSprintInterruptionOnAttack = false;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 5503ad6a93d331771a0e92c0da6adedf2ac81aff..69fb6ac082bb7b77051c5824923a7c1ae222dd73 100644 index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9684df75b 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -146,14 +146,14 @@ public class SpigotWorldConfig @@ -146,14 +146,14 @@ public class SpigotWorldConfig
@@ -277,7 +277,7 @@ index 5503ad6a93d331771a0e92c0da6adedf2ac81aff..69fb6ac082bb7b77051c5824923a7c1a
public boolean ignoreSpectatorActivation = false; public boolean ignoreSpectatorActivation = false;
private void activationRange() private void activationRange()
{ {
@@ -293,7 +293,7 @@ public class SpigotWorldConfig @@ -295,7 +295,7 @@ public class SpigotWorldConfig
{ {
this.set( "ticks-per.hopper-check", 1 ); this.set( "ticks-per.hopper-check", 1 );
} }
@@ -286,7 +286,7 @@ index 5503ad6a93d331771a0e92c0da6adedf2ac81aff..69fb6ac082bb7b77051c5824923a7c1a
this.hopperAmount = this.getInt( "hopper-amount", 1 ); this.hopperAmount = this.getInt( "hopper-amount", 1 );
this.hopperCanLoadChunks = this.getBoolean( "hopper-can-load-chunks", false ); this.hopperCanLoadChunks = this.getBoolean( "hopper-can-load-chunks", false );
this.log( "Hopper Transfer: " + this.hopperTransfer + " Hopper Check: " + this.hopperCheck + " Hopper Amount: " + this.hopperAmount + " Hopper Can Load Chunks: " + this.hopperCanLoadChunks ); this.log( "Hopper Transfer: " + this.hopperTransfer + " Hopper Check: " + this.hopperCheck + " Hopper Amount: " + this.hopperAmount + " Hopper Can Load Chunks: " + this.hopperCanLoadChunks );
@@ -303,7 +303,7 @@ public class SpigotWorldConfig @@ -305,7 +305,7 @@ public class SpigotWorldConfig
public int tridentDespawnRate; public int tridentDespawnRate;
private void arrowDespawnRate() private void arrowDespawnRate()
{ {
@@ -295,7 +295,7 @@ index 5503ad6a93d331771a0e92c0da6adedf2ac81aff..69fb6ac082bb7b77051c5824923a7c1a
this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate ); this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate );
this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate ); this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate );
} }
@@ -318,14 +318,14 @@ public class SpigotWorldConfig @@ -320,14 +320,14 @@ public class SpigotWorldConfig
public boolean nerfSpawnerMobs; public boolean nerfSpawnerMobs;
private void nerfSpawnerMobs() private void nerfSpawnerMobs()
{ {
@@ -312,7 +312,7 @@ index 5503ad6a93d331771a0e92c0da6adedf2ac81aff..69fb6ac082bb7b77051c5824923a7c1a
this.log( "Allow Zombie Pigmen to spawn from portal blocks: " + this.enableZombiePigmenPortalSpawns ); this.log( "Allow Zombie Pigmen to spawn from portal blocks: " + this.enableZombiePigmenPortalSpawns );
} }
@@ -439,7 +439,7 @@ public class SpigotWorldConfig @@ -441,7 +441,7 @@ public class SpigotWorldConfig
public int hangingTickFrequency; public int hangingTickFrequency;
private void hangingTickFrequency() private void hangingTickFrequency()
{ {

4
patches/server/0006-Fix-MC-98160-and-MC-105103.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-98160 and MC-105103
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
index 33de7cca8063618466fe47417e700a5b15c8dc70..49660b0b9ee24de96006441a46bf6efa95873db3 100644 index 06421017e3a7a0511c253e2ad4a028b0c156c9a8..d3f722d13eb7a47d10dd77017d0918a9e55e390a 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
@@ -906,7 +906,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> { @@ -907,7 +907,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
if (!this.isPassenger()) { if (!this.isPassenger()) {
if (onGround) { if (onGround) {
if (this.fallDistance > 3.0F) { if (this.fallDistance > 3.0F) {

6
patches/server/0008-Fix-entity-serialization.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix entity serialization
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3c10c719f6172161a2dcc6592a0a1492e9b3d7c1..d839a6d7be3fb2a9b14fbad1e3e48d0b88a1c6eb 100644 index f31f4ecf8fb07f6cf01eea0aa14f5d454a4ce2a3..2db85c73fd1f29a6f88ea8b7b956a5dae7fc79c0 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2182,15 +2182,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -2183,15 +2183,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
} }
} }
@@ -25,7 +25,7 @@ index 3c10c719f6172161a2dcc6592a0a1492e9b3d7c1..d839a6d7be3fb2a9b14fbad1e3e48d0b
return this.isPassenger() ? false : this.saveAsPassenger(nbt); return this.isPassenger() ? false : this.saveAsPassenger(nbt);
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index bd21dd728b6d47d354aeb879b083394e186d6a5c..a006dea11313f2cbd33d652fcddd171f1dd7355b 100644 index 1dd7f923dd6adb41eafc3ea0c063e3aae6670124..df970a68c9139025caca056d7941d01224126a5c 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -490,8 +490,13 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -490,8 +490,13 @@ public final class CraftMagicNumbers implements UnsafeValues {

8
patches/server/0009-Boat-Settings.patch
View File

@@ -22,10 +22,10 @@ index 5d16d2250bae9c982a0af9ad2580a63532b140f7..9eede8eb7fefc414f3a1207cd3ca2b33
} }
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
index 49660b0b9ee24de96006441a46bf6efa95873db3..ebd35ca6833aa5cfb913be96ca0c8c13cef45872 100644 index d3f722d13eb7a47d10dd77017d0918a9e55e390a..a6775a19897540a2ec556c53bbcc0f52c298c201 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
@@ -356,7 +356,18 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> { @@ -357,7 +357,18 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
} }
if (!this.level.isClientSide && this.outOfControlTicks >= 60.0F) { if (!this.level.isClientSide && this.outOfControlTicks >= 60.0F) {
@@ -45,7 +45,7 @@ index 49660b0b9ee24de96006441a46bf6efa95873db3..ebd35ca6833aa5cfb913be96ca0c8c13
} }
if (this.getHurtTime() > 0) { if (this.getHurtTime() > 0) {
@@ -897,7 +908,13 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> { @@ -898,7 +909,13 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
@Override @Override
public InteractionResult interact(Player player, InteractionHand hand) { public InteractionResult interact(Player player, InteractionHand hand) {
@@ -60,7 +60,7 @@ index 49660b0b9ee24de96006441a46bf6efa95873db3..ebd35ca6833aa5cfb913be96ca0c8c13
} }
@Override @Override
@@ -993,7 +1010,13 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> { @@ -994,7 +1011,13 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
@Override @Override
protected boolean canAddPassenger(Entity passenger) { protected boolean canAddPassenger(Entity passenger) {

6
patches/server/0012-Remove-Spigot-tick-limiter.patch
View File

@@ -29,10 +29,10 @@ index e39b3c7a67de82dd5165f9276f374cd89ecf96c9..4bacba49a3e462e21b25f388293f2554
} }
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 69fb6ac082bb7b77051c5824923a7c1ae222dd73..30b82d352726072f6ae144e1ab8e9bfb434a4774 100644 index 2db47bcdfffbbea7de011016367df4b9684df75b..ec4d974c66ce966d31a377092697e85c8a3331e6 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -442,6 +442,7 @@ public class SpigotWorldConfig @@ -444,6 +444,7 @@ public class SpigotWorldConfig
this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 200 ); // DivineMC - optimize default values for configs this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 200 ); // DivineMC - optimize default values for configs
} }
@@ -40,7 +40,7 @@ index 69fb6ac082bb7b77051c5824923a7c1ae222dd73..30b82d352726072f6ae144e1ab8e9bfb
public int tileMaxTickTime; public int tileMaxTickTime;
public int entityMaxTickTime; public int entityMaxTickTime;
private void maxTickTimes() private void maxTickTimes()
@@ -450,6 +451,7 @@ public class SpigotWorldConfig @@ -452,6 +453,7 @@ public class SpigotWorldConfig
this.entityMaxTickTime = this.getInt("max-tick-time.entity", 50); this.entityMaxTickTime = this.getInt("max-tick-time.entity", 50);
this.log("Tile Max Tick Time: " + this.tileMaxTickTime + "ms Entity max Tick Time: " + this.entityMaxTickTime + "ms"); this.log("Tile Max Tick Time: " + this.tileMaxTickTime + "ms Entity max Tick Time: " + this.entityMaxTickTime + "ms");
} }

4
patches/server/0014-Paper-PR-BoneMeal-API.patch
View File

@@ -38,10 +38,10 @@ index c26665bc59c18c4da467fb6ae33e51a65ecf1de6..bf65490f0239fc6d9d9c101ebce5845d
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b5415f0c65db728f4a935b87b54fa14b68d31bc4..4d0c69c0d2aa7eb625a949a9e6c6c1a5d7a25057 100644 index 3013aeb442799aba5b2ae45edcb3c2c72a18a740..6cf521d0d400c3b66530b79bf8bda3f94353c474 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2446,5 +2446,43 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -2432,5 +2432,43 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return this.adventure$pointers; return this.adventure$pointers;
} }

45
patches/server/0015-Paper-PR-Add-sendTitleUpdate-for-inventories.patch
View File

@@ -1,45 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: nopjar <code.nopjar@gmail.com>
Date: Mon, 13 Jun 2022 11:29:42 +0200
Subject: [PATCH] Paper PR - Add sendTitleUpdate for inventories
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index 76e26542448d18750ce33d53d54c2a77c0590554..2ae43194ffb670f9145ffcc137fea29addec4e51 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -79,6 +79,16 @@ public class CraftContainer extends AbstractContainerMenu {
public String getTitle() {
return inventory instanceof CraftInventoryCustom custom ? custom.getTitle() : inventory.getType().getDefaultTitle(); // Paper
}
+
+ // Paper start
+ @Override
+ public void sendTitleUpdate(@org.jetbrains.annotations.NotNull net.kyori.adventure.text.Component title) {
+ AbstractContainerMenu menu = ((org.bukkit.craftbukkit.entity.CraftHumanEntity) getPlayer()).getHandle().containerMenu;
+ var packet = new net.minecraft.network.protocol.game.ClientboundOpenScreenPacket(menu.containerId, menu.getType(), io.papermc.paper.adventure.PaperAdventure.asVanilla(title));
+ ((net.minecraft.server.level.ServerPlayer) player).connection.send(packet);
+ menu.sendAllDataToRemote();
+ }
+ // Paper end
}, player, id);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
index 7d6b5fdb00a5c1614849735634262a36a4efbd66..68e11a13120d81eff511f2e6c6c08aeef4fd50ae 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
@@ -83,4 +83,13 @@ public class CraftInventoryView extends InventoryView {
public AbstractContainerMenu getHandle() {
return this.container;
}
+
+ // Paper start
+ @Override
+ public void sendTitleUpdate(@org.jetbrains.annotations.NotNull net.kyori.adventure.text.Component title) {
+ var packet = new net.minecraft.network.protocol.game.ClientboundOpenScreenPacket(this.container.containerId, this.container.getType(), io.papermc.paper.adventure.PaperAdventure.asVanilla(title));
+ ((org.bukkit.craftbukkit.entity.CraftPlayer) getPlayer()).getHandle().connection.send(packet);
+ container.sendAllDataToRemote();
+ }
+ // Paper end
}

4
patches/server/0016-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch → patches/server/0015-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
View File

@@ -50,10 +50,10 @@ index 6b0bdc266109cdfb874f08bf74323603921d2260..a355470f6b0e8286a178ad279ad93bca
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 33d4c1af86382cc3343d5db42283b27f69f52374..9679cce1a836add4aee343087370a2fc4d2d132e 100644 index c27e455321951e76e4818fec0e64301f5620dbf6..1a90a7d91288b9a8ab3539785de2616a6f24aa48 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -302,11 +302,13 @@ public abstract class PlayerList { @@ -304,11 +304,13 @@ public abstract class PlayerList {
Component joinMessage = ichatmutablecomponent; // Paper - Adventure Component joinMessage = ichatmutablecomponent; // Paper - Adventure
playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot()); playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());

0
patches/server/0017-Additional-pathfinding-API.patch → patches/server/0016-Additional-pathfinding-API.patch
View File

0
patches/server/0018-EMC-Allow-negative-Amplifier-values.patch → patches/server/0017-EMC-Allow-negative-Amplifier-values.patch
View File

0
patches/server/0019-Fix-MC-110386.patch → patches/server/0018-Fix-MC-110386.patch
View File

4
patches/server/0020-Fallback-to-Dimension-if-World-UUID-is-unknown.patch → patches/server/0019-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
View File

@@ -20,7 +20,7 @@ index 0a8baeb94ae553c4759b065eafd9e242153cf991..abf8ddccce6ec9d893038d1fafdca617
} }
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 9679cce1a836add4aee343087370a2fc4d2d132e..10d48bc54da61c3fefac177006daf9c0bc4c4687 100644 index 1a90a7d91288b9a8ab3539785de2616a6f24aa48..2a3025d16a3ca02ce1566a96b8bf3bea45ccb0c1 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -102,6 +102,7 @@ import net.minecraft.world.scores.PlayerTeam; @@ -102,6 +102,7 @@ import net.minecraft.world.scores.PlayerTeam;
@@ -31,7 +31,7 @@ index 9679cce1a836add4aee343087370a2fc4d2d132e..10d48bc54da61c3fefac177006daf9c0
// CraftBukkit start // CraftBukkit start
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -211,7 +212,14 @@ public abstract class PlayerList { @@ -213,7 +214,14 @@ public abstract class PlayerList {
if (bWorld != null) { if (bWorld != null) {
resourcekey = ((CraftWorld) bWorld).getHandle().dimension(); resourcekey = ((CraftWorld) bWorld).getHandle().dimension();
} else { } else {

0
patches/server/0021-Allow-any-username.patch → patches/server/0020-Allow-any-username.patch
View File

0
patches/server/0022-Fix-memory-leak.patch → patches/server/0021-Fix-memory-leak.patch
View File

0
patches/server/0023-Optimize-spigot-event-bus.patch → patches/server/0022-Optimize-spigot-event-bus.patch
View File

0
patches/server/0024-Better-Impaling.patch → patches/server/0023-Better-Impaling.patch
View File

0
patches/server/0025-Despawn-shulker-bullets-on-owner-death.patch → patches/server/0024-Despawn-shulker-bullets-on-owner-death.patch
View File

0
patches/server/0026-Fix-MC-31819.patch → patches/server/0025-Fix-MC-31819.patch
View File

0
patches/server/0027-lithium-collections.goals.patch → patches/server/0026-lithium-collections.goals.patch
View File

0
patches/server/0028-lithium-collections.gamerules.patch → patches/server/0027-lithium-collections.gamerules.patch
View File

0
patches/server/0029-lithium-collections.attributes.patch → patches/server/0028-lithium-collections.attributes.patch
View File

0
patches/server/0030-lithium-cached_hashcode.patch → patches/server/0029-lithium-cached_hashcode.patch
View File

0
patches/server/0031-lithium-ai.raid.patch → patches/server/0030-lithium-ai.raid.patch
View File

0
patches/server/0032-lithium-gen.cached_generator_settings.patch → patches/server/0031-lithium-gen.cached_generator_settings.patch
View File

0
patches/server/0033-Replace-shape-full-block-cache-with-hashtable.patch → patches/server/0032-Replace-shape-full-block-cache-with-hashtable.patch
View File