922c33171c
* work * work * more work * complete configuration base * More work * more work * Configurable cave lava sea level, Fix MC-237017 * more more more work * Updated Upstream (Paper, Pufferfish, Purpur) * Rework, again * Cleanup workflows, fix build * typo * more work * more work - Updated Upstream (Paper) - [CI-Skip] Update Upstream CacheData (Pufferfish, Purpur) - Update Dependencies (Paperweight) - Fix build - Update Wrapper * more works * more more works * Fix build * Fix test * Implemented FixMySpawnR, Added more config optimize * Fix build
77 lines
4.4 KiB
Diff
77 lines
4.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: AlphaKR93 <dev@alpha93.kr>
|
|
Date: Mon, 4 Dec 2023 23:01:32 +0900
|
|
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 b036b54d551c892cc48d0a6816382bce5e38efd4..459cba838468b95547b2a515c497fcbb7bd45718 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 {
|
|
|
|
}
|
|
|
|
+ public WakeUpDurationVariance wakeUpDurationVariance;
|
|
+ public class WakeUpDurationVariance extends ConfigurationPart {
|
|
+
|
|
+ private double defaultValue() {
|
|
+ return OPTIMIZE ? 0.2 : 0.0;
|
|
+ }
|
|
+
|
|
+ double animal = defaultValue(); public double animal() { return Math.max(this.animal, 0.0); }
|
|
+ double monster = defaultValue(); public double monster() { return Math.max(this.monster, 0.0); }
|
|
+ double flying = defaultValue(); public double flying() { return Math.max(this.flying, 0.0); }
|
|
+ double villager = defaultValue(); public double villager() { return Math.max(this.villager, 0.0); }
|
|
+
|
|
+ }
|
|
+
|
|
}
|
|
|
|
public Structure structure;
|
|
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
|
index 0b03dae85e6008283e68b07fa438daccf0e4f5fa..5b981300a8addb85fce32b814dfe70cb2bc4beb3 100644
|
|
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
|
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
|
@@ -68,29 +68,36 @@ public class ActivationRange
|
|
Activity.PANIC
|
|
};
|
|
|
|
+ // Plazma start - Variable entity wakeup duration
|
|
+ private static int getWakeupDuration(net.minecraft.util.RandomSource random, int duration, double deviation) {
|
|
+ if (deviation == 0) return duration;
|
|
+ return (int) Math.min(Integer.MAX_VALUE, Math.max(1, Math.round(duration * (1 + deviation * random.nextGaussian()))));
|
|
+ }
|
|
+ // Plazma end
|
|
private static int checkInactiveWakeup(Entity entity) {
|
|
Level world = entity.level();
|
|
SpigotWorldConfig config = world.spigotConfig;
|
|
+ org.plazmamc.plazma.configurations.WorldConfigurations plazmaConfig = world.plazmaConfig(); // Plazma
|
|
long inactiveFor = MinecraftServer.currentTick - entity.activatedTick;
|
|
if (entity.activationType == ActivationType.VILLAGER) {
|
|
if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) {
|
|
world.wakeupInactiveRemainingVillagers--;
|
|
- return config.wakeUpInactiveVillagersFor;
|
|
+ return getWakeupDuration(world.getRandom(), config.wakeUpInactiveVillagersFor, plazmaConfig.entity.wakeUpDurationVariance.villager()); // Plazma
|
|
}
|
|
} else if (entity.activationType == ActivationType.ANIMAL) {
|
|
if (inactiveFor > config.wakeUpInactiveAnimalsEvery && world.wakeupInactiveRemainingAnimals > 0) {
|
|
world.wakeupInactiveRemainingAnimals--;
|
|
- return config.wakeUpInactiveAnimalsFor;
|
|
+ return getWakeupDuration(world.getRandom(), config.wakeUpInactiveAnimalsFor, plazmaConfig.entity.wakeUpDurationVariance.animal()); // Plazma
|
|
}
|
|
} else if (entity.activationType == ActivationType.FLYING_MONSTER) {
|
|
if (inactiveFor > config.wakeUpInactiveFlyingEvery && world.wakeupInactiveRemainingFlying > 0) {
|
|
world.wakeupInactiveRemainingFlying--;
|
|
- return config.wakeUpInactiveFlyingFor;
|
|
+ return getWakeupDuration(world.getRandom(), config.wakeUpInactiveFlyingFor, plazmaConfig.entity.wakeUpDurationVariance.flying()); // Plazma
|
|
}
|
|
} else if (entity.activationType == ActivationType.MONSTER || entity.activationType == ActivationType.RAIDER) {
|
|
if (inactiveFor > config.wakeUpInactiveMonstersEvery && world.wakeupInactiveRemainingMonsters > 0) {
|
|
world.wakeupInactiveRemainingMonsters--;
|
|
- return config.wakeUpInactiveMonstersFor;
|
|
+ return getWakeupDuration(world.getRandom(), config.wakeUpInactiveMonstersFor, plazmaConfig.entity.wakeUpDurationVariance.monster()); // Plazma
|
|
}
|
|
}
|
|
return -1;
|