diff --git a/patches/unapplied/server/working/0021-Configurable-cave-lava-sea-level.patch b/patches/server/0020-Configurable-cave-lava-sea-level.patch similarity index 95% rename from patches/unapplied/server/working/0021-Configurable-cave-lava-sea-level.patch rename to patches/server/0020-Configurable-cave-lava-sea-level.patch index 7cb5257..85fef2d 100644 --- a/patches/unapplied/server/working/0021-Configurable-cave-lava-sea-level.patch +++ b/patches/server/0020-Configurable-cave-lava-sea-level.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Configurable cave lava sea level This patch also fix MC-237017. diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java -index 8ce870a5341a61fbbaf42021ef7f7f615a6a3e09..6650f74b01285c1dba8243ca11dbde06419a90e7 100644 +index 68be0d51aa64b5d917fb53dbbbdf8966d4f4abd8..688d9a2fe0ad0f176cd19a3ed7f2669fef2c962e 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java -@@ -72,14 +72,14 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator { +@@ -71,14 +71,14 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator { } private static Aquifer.FluidPicker createFluidPicker(NoiseGeneratorSettings settings) { diff --git a/patches/unapplied/server/working/0023-Configurable-entity-sensor-tick.patch b/patches/server/0021-Configurable-entity-sensor-tick.patch similarity index 79% rename from patches/unapplied/server/working/0023-Configurable-entity-sensor-tick.patch rename to patches/server/0021-Configurable-entity-sensor-tick.patch index 697a07a..16b3e1c 100644 --- a/patches/unapplied/server/working/0023-Configurable-entity-sensor-tick.patch +++ b/patches/server/0021-Configurable-entity-sensor-tick.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable entity sensor tick diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 05c41e1c2f4a1c714dc842dc019acda46fc41e7b..ba6295ce11236c7eadaeaa042482d6cec0945bd1 100644 +index 4b4bdaf8c43e15ba953c160a003a719aaf730318..35f150d348c3bd27416c60840988d381b85f9ccf 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -997,10 +997,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti +@@ -953,10 +953,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab //ProfilerFiller gameprofilerfiller = this.level().getProfiler(); // Purpur //gameprofilerfiller.push("sensing"); // Purpur @@ -22,14 +22,15 @@ index 05c41e1c2f4a1c714dc842dc019acda46fc41e7b..ba6295ce11236c7eadaeaa042482d6ce //gameprofilerfiller.push("targetSelector"); // Purpur if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java -index 9debf554deb5b7aa021502ff7d600905f56fa25c..dceb5b2cec5f0c20be74d892e8cab98823d2f59a 100644 +index b83a1058484e3d4d46f91d659f795f59d7087b72..480f9948265bdb0742ebc4181bba564644809bff 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java -@@ -30,6 +30,7 @@ public class WorldConfigurations extends ConfigurationPart { +@@ -29,6 +29,8 @@ public class WorldConfigurations extends ConfigurationPart { + public Entity entity; public class Entity extends ConfigurationPart { - public boolean ignoreUselessPackets = OPTIMIZE; + public int sensorTick = 1; - ++ public Phantom phantom; public class Phantom extends ConfigurationPart { + diff --git a/patches/unapplied/server/working/0024-Variable-entity-wakeup-duration.patch b/patches/server/0022-Variable-entity-wakeup-duration.patch similarity index 93% rename from patches/unapplied/server/working/0024-Variable-entity-wakeup-duration.patch rename to patches/server/0022-Variable-entity-wakeup-duration.patch index fc18930..9d27e77 100644 --- a/patches/unapplied/server/working/0024-Variable-entity-wakeup-duration.patch +++ b/patches/server/0022-Variable-entity-wakeup-duration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Variable entity wakeup duration diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java -index dceb5b2cec5f0c20be74d892e8cab98823d2f59a..bc35244533621436e3c0fb871edf7834ad937f81 100644 +index 480f9948265bdb0742ebc4181bba564644809bff..f5249795503b97b66644f59ff4a1afa66b6b6759 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java -@@ -39,6 +39,20 @@ public class WorldConfigurations extends ConfigurationPart { +@@ -38,6 +38,20 @@ public class WorldConfigurations extends ConfigurationPart { } @@ -30,10 +30,10 @@ index dceb5b2cec5f0c20be74d892e8cab98823d2f59a..bc35244533621436e3c0fb871edf7834 public Structure structure; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 56e52b16b419c882440a15947f037ae1a902bc70..583647f6c9ca0fb092f30c97693bd548f692dfd3 100644 +index ed1cdea66dd117ecafd14a52727f094430f39b60..2c30e659d0ec28c0ec4f8ccb0fa29de5a31d3881 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java -@@ -68,29 +68,36 @@ public class ActivationRange +@@ -67,29 +67,36 @@ public class ActivationRange Activity.PANIC }; diff --git a/patches/unapplied/server/working/0025-Optimise-state-lookup-more.patch b/patches/server/0023-Optimise-state-lookup-more.patch similarity index 100% rename from patches/unapplied/server/working/0025-Optimise-state-lookup-more.patch rename to patches/server/0023-Optimise-state-lookup-more.patch diff --git a/patches/unapplied/server/working/0027-Skip-event-if-no-listeners.patch b/patches/server/0024-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/unapplied/server/working/0027-Skip-event-if-no-listeners.patch rename to patches/server/0024-Skip-event-if-no-listeners.patch diff --git a/patches/unapplied/server/working/0028-Add-entity-spawn-deadlock-timer.patch b/patches/server/0025-Add-entity-spawn-deadlock-timer.patch similarity index 95% rename from patches/unapplied/server/working/0028-Add-entity-spawn-deadlock-timer.patch rename to patches/server/0025-Add-entity-spawn-deadlock-timer.patch index 085930a..4b2de42 100644 --- a/patches/unapplied/server/working/0028-Add-entity-spawn-deadlock-timer.patch +++ b/patches/server/0025-Add-entity-spawn-deadlock-timer.patch @@ -61,10 +61,10 @@ index 967af8771ff8564c715d89f4b4b69b16c25add59..2ac5fb585636523787e05edaa58a4fa3 return nbt; } diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java -index a9c8a5918184a2ea364261e279edf7169ae270c7..ffbe18cd212fda0a67d13cb5ccf32068670988aa 100644 +index f5249795503b97b66644f59ff4a1afa66b6b6759..5978970f80b1b4672298426dcd8026e453025a52 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java -@@ -54,6 +54,14 @@ public class WorldConfigurations extends ConfigurationPart { +@@ -52,6 +52,14 @@ public class WorldConfigurations extends ConfigurationPart { } diff --git a/patches/unapplied/server/working/0029-Lithium-HashedList.patch b/patches/server/0026-Lithium-HashedList.patch similarity index 100% rename from patches/unapplied/server/working/0029-Lithium-HashedList.patch rename to patches/server/0026-Lithium-HashedList.patch diff --git a/patches/unapplied/server/working/0030-Improve-SwingTime-ticking.patch b/patches/server/0027-Improve-SwingTime-ticking.patch similarity index 81% rename from patches/unapplied/server/working/0030-Improve-SwingTime-ticking.patch rename to patches/server/0027-Improve-SwingTime-ticking.patch index 647bbdd..304ecb5 100644 --- a/patches/unapplied/server/working/0030-Improve-SwingTime-ticking.patch +++ b/patches/server/0027-Improve-SwingTime-ticking.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Improve SwingTime ticking diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f0d611f370966c12e076252ffd020a05c40f3588..8da257e5d305e4ec978f4933d5011f84976e6bb9 100644 +index f714e2dc212a3b70977e93c55e94f8b272c5b02d..0d48209efc607dd7f81deffa96af2ff05ccd37b7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2670,6 +2670,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2722,6 +2722,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected void updateSwingTime() { diff --git a/patches/unapplied/server/working/0015-Completely-remove-Mojang-Profiler.patch b/patches/unapplied/server/0015-Completely-remove-Mojang-Profiler.patch similarity index 100% rename from patches/unapplied/server/working/0015-Completely-remove-Mojang-Profiler.patch rename to patches/unapplied/server/0015-Completely-remove-Mojang-Profiler.patch diff --git a/patches/unapplied/server/working/0022-Ignore-useless-entity-packets.patch b/patches/unapplied/server/0022-Ignore-useless-entity-packets.patch similarity index 100% rename from patches/unapplied/server/working/0022-Ignore-useless-entity-packets.patch rename to patches/unapplied/server/0022-Ignore-useless-entity-packets.patch diff --git a/patches/unapplied/server/working/0026-Suppress-errors-from-dirty-attributes.patch b/patches/unapplied/server/0026-Suppress-errors-from-dirty-attributes.patch similarity index 100% rename from patches/unapplied/server/working/0026-Suppress-errors-from-dirty-attributes.patch rename to patches/unapplied/server/0026-Suppress-errors-from-dirty-attributes.patch