diff --git a/divinemc-server/minecraft-patches/features/0045-Petal-Multithreaded-Tracker.patch b/divinemc-server/minecraft-patches/features/0045-Petal-Multithreaded-Tracker.patch index 755b962..a70d626 100644 --- a/divinemc-server/minecraft-patches/features/0045-Petal-Multithreaded-Tracker.patch +++ b/divinemc-server/minecraft-patches/features/0045-Petal-Multithreaded-Tracker.patch @@ -399,7 +399,7 @@ index 78bf3365b426e7090182af84630111d410a2460e..3c1795eb56900cd80cfec38bd1d922d5 } } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7b10fe7cf66757ed68f9e39e03259700dfabf184..c537d22fd97225c1b6d58bed61add83a20d9be24 100644 +index 2d3200834e46a24156659a32170aa4974caf8060..4d37b16adc5491db24fce1ce656f6cde575e10f4 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1936,7 +1936,6 @@ public class ServerGamePacketListenerImpl @@ -411,7 +411,7 @@ index 7b10fe7cf66757ed68f9e39e03259700dfabf184..c537d22fd97225c1b6d58bed61add83a if (this.player.isRemoved()) { LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName()); diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 327b3b1463caafc69e6a5dc0eee577f4af49d202..683a8913ef4e71ae3072b520d0e0a6a73c96a13c 100644 +index 76a7898c040cd46df6a889535b1d77c8e6de5a91..e903e60c8914899d9be14cce9fdef9cc33ee71d5 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1353,13 +1353,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @@ -434,13 +434,13 @@ index 327b3b1463caafc69e6a5dc0eee577f4af49d202..683a8913ef4e71ae3072b520d0e0a6a7 protected void onAttributeUpdated(Holder attribute) { diff --git a/net/minecraft/world/entity/ai/attributes/Attribute.java b/net/minecraft/world/entity/ai/attributes/Attribute.java -index f8419dde44ebc7324e783f8bee42132d5ec973c3..776445dd2dfee9d386ccb3ad17746d4c405a96b9 100644 +index 18563961e9dba1a11265c6ea708881d4e46846ff..355e552f77e7639ddf1c8b4da9868775017563c3 100644 --- a/net/minecraft/world/entity/ai/attributes/Attribute.java +++ b/net/minecraft/world/entity/ai/attributes/Attribute.java @@ -16,10 +16,15 @@ public class Attribute { private boolean syncable; private final String descriptionId; - private Attribute.Sentiment sentiment = Attribute.Sentiment.POSITIVE; + public Attribute.Sentiment sentiment = Attribute.Sentiment.POSITIVE; + // DivineMC start - Multithreaded Tracker + public final int uid; + private static final java.util.concurrent.atomic.AtomicInteger SIZE = new java.util.concurrent.atomic.AtomicInteger(); @@ -449,7 +449,7 @@ index f8419dde44ebc7324e783f8bee42132d5ec973c3..776445dd2dfee9d386ccb3ad17746d4c protected Attribute(String descriptionId, double defaultValue) { this.defaultValue = defaultValue; this.descriptionId = descriptionId; -+ this.uid = SIZE.getAndAdd(1); ++ this.uid = SIZE.getAndAdd(1); // DivineMC - Multithreaded Tracker } public double getDefaultValue() { diff --git a/divinemc-server/paper-patches/features/0007-Paper-PR-Throttle-failed-spawn-attempts.patch b/divinemc-server/paper-patches/features/0007-Paper-PR-Throttle-failed-spawn-attempts.patch index a413512..3fa023b 100644 --- a/divinemc-server/paper-patches/features/0007-Paper-PR-Throttle-failed-spawn-attempts.patch +++ b/divinemc-server/paper-patches/features/0007-Paper-PR-Throttle-failed-spawn-attempts.patch @@ -22,10 +22,10 @@ Example config in paper-world-defaults.yml: ``` diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index 8e65586182bd586c95b8c4873fab6d6ff5975243..ed687b0ab589fd2ddb8bf77f42ba42cf8b1c2ea7 100644 +index bd1f0ba488ff9f12de4b85c97617638592bab09c..827ae27210a5da342041fa355ac58708ca370961 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -183,6 +183,17 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -184,6 +184,17 @@ public class WorldConfiguration extends ConfigurationPart { @MergeMap public Reference2IntMap ticksPerSpawn = Util.make(new Reference2IntOpenHashMap<>(NaturalSpawner.SPAWNING_CATEGORIES.length), map -> Arrays.stream(NaturalSpawner.SPAWNING_CATEGORIES).forEach(mobCategory -> map.put(mobCategory, -1))); diff --git a/divinemc-server/paper-patches/features/0008-Optimize-default-values-for-configs.patch b/divinemc-server/paper-patches/features/0008-Optimize-default-values-for-configs.patch index 31cae17..1eb5c6f 100644 --- a/divinemc-server/paper-patches/features/0008-Optimize-default-values-for-configs.patch +++ b/divinemc-server/paper-patches/features/0008-Optimize-default-values-for-configs.patch @@ -20,10 +20,10 @@ index 3f5e76e4df8ff8152060449f89b522910adee834..4eb45775c7ada4fd4137c87104580314 public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT; @Comment("Defines the leniency distance added on the server to the interaction range of a player when validating interact packets.") diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b31ff9558 100644 +index 827ae27210a5da342041fa355ac58708ca370961..963c6749363c0d88d01a7c2b261c9b6e6c9e849f 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -148,8 +148,10 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -149,8 +149,10 @@ public class WorldConfiguration extends ConfigurationPart { public ArmorStands armorStands; public class ArmorStands extends ConfigurationPart { @@ -36,7 +36,7 @@ index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b } public Markers markers; -@@ -274,8 +276,38 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -275,8 +277,38 @@ public class WorldConfiguration extends ConfigurationPart { public AltItemDespawnRate altItemDespawnRate; public class AltItemDespawnRate extends ConfigurationPart { @@ -77,7 +77,7 @@ index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b } } -@@ -418,7 +450,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -421,7 +453,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Environment extends ConfigurationPart { public boolean disableThunder = false; public boolean disableIceAndSnow = false; @@ -86,7 +86,7 @@ index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b public boolean disableExplosionKnockback = false; public boolean generateFlatBedrock = false; public FrostedIce frostedIce; -@@ -471,7 +503,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -474,7 +506,7 @@ public class WorldConfiguration extends ConfigurationPart { public Fixes fixes; public class Fixes extends ConfigurationPart { @@ -95,7 +95,7 @@ index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b public boolean disableUnloadedChunkEnderpearlExploit = false; public boolean preventTntFromMovingInWater = false; public boolean splitOverstackedLoot = true; -@@ -499,9 +531,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -502,9 +534,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Collisions extends ConfigurationPart { public boolean onlyPlayersCollide = false; public boolean allowVehicleCollisions = true; @@ -107,7 +107,7 @@ index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b public boolean allowPlayerCrammingDamage = false; } -@@ -511,16 +543,33 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -514,16 +546,33 @@ public class WorldConfiguration extends ConfigurationPart { public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); public int maxAutoSaveChunksPerTick = 24; public int fixedChunkInhabitedTime = -1; @@ -148,7 +148,7 @@ index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b }); public boolean flushRegionsOnSave = false; -@@ -540,9 +589,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -543,9 +592,9 @@ public class WorldConfiguration extends ConfigurationPart { public TickRates tickRates; public class TickRates extends ConfigurationPart { @@ -160,7 +160,7 @@ index 7100a3fce29ef0cbbdb3659835a0896e168c5803..8e695b602b95ff6a85316e19d24be94b public int wetFarmland = 1; public int dryFarmland = 1; public Table, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40)); -@@ -577,7 +626,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -580,7 +629,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Misc extends ConfigurationPart { public boolean updatePathfindingOnBlockUpdate = true; public boolean showSignClickCommandFailureMsgsToPlayer = false; diff --git a/gradle.properties b/gradle.properties index 6a9bc21..6a4cf9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.bxteam.divinemc version=1.21.8-R0.1-SNAPSHOT mcVersion=1.21.8 -purpurRef=8a5d2c882e7f35ed85be316ad4f22b7486085d4b +purpurRef=36a95d1fe045dab5f91e9e603194e04d75f36f20 experimental=false org.gradle.configuration-cache=true