mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Activation Range 2.0 with more villager controls

Browse source 
Now has separate configs to control Villager immunities a bit.

whether or not they wake up due to panic situations (raids)
and when should they wake up when work is available after being
inactive for so long, and for how long.

This work config may make the 'wake up inactive' feature for villagers
useless in most scenarios, but if there is a situation where the villager
does go without needing to work for a long period of time, it would kick
in then.

This also removes movement based immunities, so now villagers should only move
if they trigger a work immunity, panic immunity, or inactive wake up immunity.

Fixes #3263
This commit is contained in:
Aikar 2020-05-01 21:40:23 -04:00
parent 57dd397155
commit 6e41f7b79a
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch
View file

@ -1,4 +1,4 @@
From 56c60b5fe7223fdb70332e205f3ae0a831377782 Mon Sep 17 00:00:00 2001 From 15707af6bfb4b1a034d72de16ab84afdb2e5d9d9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 13 May 2016 01:38:06 -0400 Date: Fri, 13 May 2016 01:38:06 -0400
Subject: [PATCH] Entity Activation Range 2.0 Subject: [PATCH] Entity Activation Range 2.0
@ -266,7 +266,7 @@ index 9e161746f2..228e6e9ab9 100644
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 92601c581c..92f19fcbb1 100644 index 92601c581c..d873b8cf3a 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -2,24 +2,34 @@ package org.spigotmc; @@ -2,24 +2,34 @@ package org.spigotmc;
@ -331,25 +331,16 @@ index 92601c581c..92f19fcbb1 100644
MONSTER, MONSTER,
ANIMAL, ANIMAL,
RAIDER, RAIDER,
@@ -46,6 +66,52 @@ public class ActivationRange @@ -46,6 +66,43 @@ public class ActivationRange
AxisAlignedBB boundingBox = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 ); AxisAlignedBB boundingBox = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
} }
+ // Paper start + // Paper start
+ static MemoryModuleType<?>[] VILLAGER_IMMUNITIES = {
+ MemoryModuleType.LOOK_TARGET,
+ MemoryModuleType.INTERACTION_TARGET,
+ MemoryModuleType.WALK_TARGET,
+ MemoryModuleType.HIDING_PLACE,
+ MemoryModuleType.PATH,
+ MemoryModuleType.SECONDARY_JOB_SITE
+ };
+ +
+ static Activity[] VILLAGER_ACTIVITY_IMMUNITIES = { + static Activity[] VILLAGER_PANIC_IMMUNITIES = {
+ Activity.HIDE, + Activity.HIDE,
+ Activity.PRE_RAID, + Activity.PRE_RAID,
+ Activity.RAID, + Activity.RAID,
+ Activity.WORK,
+ Activity.PANIC + Activity.PANIC
+ }; + };
+ +
@ -384,7 +375,7 @@ index 92601c581c..92f19fcbb1 100644
static AxisAlignedBB maxBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 ); static AxisAlignedBB maxBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
@@ -58,10 +124,13 @@ public class ActivationRange @@ -58,10 +115,13 @@ public class ActivationRange
*/ */
public static ActivationType initializeEntityActivationType(Entity entity) public static ActivationType initializeEntityActivationType(Entity entity)
{ {
@ -399,7 +390,7 @@ index 92601c581c..92f19fcbb1 100644
{ {
return ActivationType.MONSTER; return ActivationType.MONSTER;
} else if ( entity instanceof EntityCreature || entity instanceof EntityAmbient ) } else if ( entity instanceof EntityCreature || entity instanceof EntityAmbient )
@@ -82,10 +151,14 @@ public class ActivationRange @@ -82,10 +142,14 @@ public class ActivationRange
*/ */
public static boolean initializeEntityActivationState(Entity entity, SpigotWorldConfig config) public static boolean initializeEntityActivationState(Entity entity, SpigotWorldConfig config)
{ {
@ -418,7 +409,7 @@ index 92601c581c..92f19fcbb1 100644
|| entity instanceof EntityHuman || entity instanceof EntityHuman
|| entity instanceof EntityProjectile || entity instanceof EntityProjectile
|| entity instanceof EntityEnderDragon || entity instanceof EntityEnderDragon
@@ -118,10 +191,25 @@ public class ActivationRange @@ -118,10 +182,25 @@ public class ActivationRange
final int raiderActivationRange = world.spigotConfig.raiderActivationRange; final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
final int animalActivationRange = world.spigotConfig.animalActivationRange; final int animalActivationRange = world.spigotConfig.animalActivationRange;
final int monsterActivationRange = world.spigotConfig.monsterActivationRange; final int monsterActivationRange = world.spigotConfig.monsterActivationRange;
@ -444,7 +435,7 @@ index 92601c581c..92f19fcbb1 100644
maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange ); maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange );
for ( EntityHuman player : world.getPlayers() ) for ( EntityHuman player : world.getPlayers() )
@@ -133,6 +221,11 @@ public class ActivationRange @@ -133,6 +212,11 @@ public class ActivationRange
ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange ); ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
ActivationType.ANIMAL.boundingBox = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange ); ActivationType.ANIMAL.boundingBox = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange );
ActivationType.MONSTER.boundingBox = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange ); ActivationType.MONSTER.boundingBox = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange );
@ -456,7 +447,7 @@ index 92601c581c..92f19fcbb1 100644
int i = MathHelper.floor( maxBB.minX / 16.0D ); int i = MathHelper.floor( maxBB.minX / 16.0D );
int j = MathHelper.floor( maxBB.maxX / 16.0D ); int j = MathHelper.floor( maxBB.maxX / 16.0D );
@@ -143,7 +236,7 @@ public class ActivationRange @@ -143,7 +227,7 @@ public class ActivationRange
{ {
for ( int j1 = k; j1 <= l; ++j1 ) for ( int j1 = k; j1 <= l; ++j1 )
{ {
@ -465,7 +456,7 @@ index 92601c581c..92f19fcbb1 100644
if ( chunk != null ) if ( chunk != null )
{ {
activateChunkEntities( chunk ); activateChunkEntities( chunk );
@@ -161,19 +254,15 @@ public class ActivationRange @@ -161,19 +245,15 @@ public class ActivationRange
*/ */
private static void activateChunkEntities(Chunk chunk) private static void activateChunkEntities(Chunk chunk)
{ {
@ -493,7 +484,7 @@ index 92601c581c..92f19fcbb1 100644
entity.activatedTick = MinecraftServer.currentTick; entity.activatedTick = MinecraftServer.currentTick;
} }
} }
@@ -188,56 +277,100 @@ public class ActivationRange @@ -188,56 +268,105 @@ public class ActivationRange
* @param entity * @param entity
* @return * @return
*/ */
@ -501,6 +492,7 @@ index 92601c581c..92f19fcbb1 100644
+ public static int checkEntityImmunities(Entity entity) // Paper - return # of ticks to get immunity + public static int checkEntityImmunities(Entity entity) // Paper - return # of ticks to get immunity
{ {
+ // Paper start + // Paper start
+ SpigotWorldConfig config = entity.world.spigotConfig;
+ int inactiveWakeUpImmunity = checkInactiveWakeup(entity); + int inactiveWakeUpImmunity = checkInactiveWakeup(entity);
+ if (inactiveWakeUpImmunity > -1) { + if (inactiveWakeUpImmunity > -1) {
+ return inactiveWakeUpImmunity; + return inactiveWakeUpImmunity;
@ -508,6 +500,7 @@ index 92601c581c..92f19fcbb1 100644
+ if (entity.fireTicks > 0) { + if (entity.fireTicks > 0) {
+ return 2; + return 2;
+ } + }
+ long inactiveFor = MinecraftServer.currentTick - entity.activatedTick;
+ // Paper end + // Paper end
// quick checks. // quick checks.
- if ( entity.inWater || entity.fireTicks > 0 ) - if ( entity.inWater || entity.fireTicks > 0 )
@ -544,7 +537,8 @@ index 92601c581c..92f19fcbb1 100644
{ {
- return true; - return true;
+ return 20; // Paper + return 20; // Paper
+ } }
- if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).canBreed() )
+ // Paper start + // Paper start
+ if (entity instanceof EntityBee) { + if (entity instanceof EntityBee) {
+ EntityBee bee = (EntityBee)entity; + EntityBee bee = (EntityBee)entity;
@ -559,18 +553,20 @@ index 92601c581c..92f19fcbb1 100644
+ if ( entity instanceof EntityVillager ) { + if ( entity instanceof EntityVillager ) {
+ BehaviorController<EntityVillager> behaviorController = ((EntityVillager) entity).getBehaviorController(); + BehaviorController<EntityVillager> behaviorController = ((EntityVillager) entity).getBehaviorController();
+ +
+ for (Activity activity : VILLAGER_ACTIVITY_IMMUNITIES) { + if (config.villagersActiveForPanic) {
+ for (Activity activity : VILLAGER_PANIC_IMMUNITIES) {
+ if (behaviorController.hasActivity(activity)) { + if (behaviorController.hasActivity(activity)) {
+ return 5; + return 20*5;
+ } + }
+ } + }
+ for (MemoryModuleType<?> type : VILLAGER_IMMUNITIES) { + }
+ if (behaviorController.hasMemory(type)) { +
+ return 5; + if (config.villagersWorkImmunityAfter > 0 && inactiveFor >= config.villagersWorkImmunityAfter) {
+ if (behaviorController.hasActivity(Activity.WORK)) {
+ return config.villagersWorkImmunityFor;
+ }
+ } + }
+ } + }
}
- if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).canBreed() )
+ if ( entity instanceof EntityLlama && ( (EntityLlama ) entity ).inCaravan() ) + if ( entity instanceof EntityLlama && ( (EntityLlama ) entity ).inCaravan() )
{ {
- return true; - return true;
@ -610,7 +606,7 @@ index 92601c581c..92f19fcbb1 100644
} }
/** /**
@@ -252,8 +385,19 @@ public class ActivationRange @@ -252,8 +381,19 @@ public class ActivationRange
if ( !entity.inChunk || entity instanceof EntityFireworks ) { if ( !entity.inChunk || entity instanceof EntityFireworks ) {
return true; return true;
} }
@ -631,7 +627,7 @@ index 92601c581c..92f19fcbb1 100644
// Should this entity tick? // Should this entity tick?
if ( !isActive ) if ( !isActive )
@@ -261,15 +405,19 @@ public class ActivationRange @@ -261,15 +401,19 @@ public class ActivationRange
if ( ( MinecraftServer.currentTick - entity.activatedTick - 1 ) % 20 == 0 ) if ( ( MinecraftServer.currentTick - entity.activatedTick - 1 ) % 20 == 0 )
{ {
// Check immunities every 20 ticks. // Check immunities every 20 ticks.
@ -657,10 +653,10 @@ index 92601c581c..92f19fcbb1 100644
isActive = false; isActive = 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 5e932a5d97..5a704c60fd 100644 index 5e932a5d97..9d706626bf 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
@@ -180,13 +180,53 @@ public class SpigotWorldConfig @@ -180,13 +180,59 @@ public class SpigotWorldConfig
public int monsterActivationRange = 32; public int monsterActivationRange = 32;
public int raiderActivationRange = 48; public int raiderActivationRange = 48;
public int miscActivationRange = 16; public int miscActivationRange = 16;
@ -675,11 +671,14 @@ index 5e932a5d97..5a704c60fd 100644
+ public int wakeUpInactiveMonstersEvery = 20*20; + public int wakeUpInactiveMonstersEvery = 20*20;
+ public int wakeUpInactiveMonstersFor = 5*20; + public int wakeUpInactiveMonstersFor = 5*20;
+ public int wakeUpInactiveVillagers = 4; + public int wakeUpInactiveVillagers = 4;
+ public int wakeUpInactiveVillagersEvery = 15*20; + public int wakeUpInactiveVillagersEvery = 30*20;
+ public int wakeUpInactiveVillagersFor = 5*20; + public int wakeUpInactiveVillagersFor = 5*20;
+ public int wakeUpInactiveFlying = 8; + public int wakeUpInactiveFlying = 8;
+ public int wakeUpInactiveFlyingEvery = 10*20; + public int wakeUpInactiveFlyingEvery = 10*20;
+ public int wakeUpInactiveFlyingFor = 5*20; + public int wakeUpInactiveFlyingFor = 5*20;
+ public int villagersWorkImmunityAfter = 5*20;
+ public int villagersWorkImmunityFor = 20;
+ public boolean villagersActiveForPanic = true;
+ // Paper end + // Paper end
public boolean tickInactiveVillagers = true; public boolean tickInactiveVillagers = true;
private void activationRange() private void activationRange()
@ -710,6 +709,9 @@ index 5e932a5d97..5a704c60fd 100644
+ wakeUpInactiveFlyingEvery = getInt("entity-activation-range.wake-up-inactive.flying-monsters-every", wakeUpInactiveFlyingEvery); + wakeUpInactiveFlyingEvery = getInt("entity-activation-range.wake-up-inactive.flying-monsters-every", wakeUpInactiveFlyingEvery);
+ wakeUpInactiveFlyingFor = getInt("entity-activation-range.wake-up-inactive.flying-monsters-for", wakeUpInactiveFlyingFor); + wakeUpInactiveFlyingFor = getInt("entity-activation-range.wake-up-inactive.flying-monsters-for", wakeUpInactiveFlyingFor);
+ +
+ villagersWorkImmunityAfter = getInt( "entity-activation-range.villagers-work-immunity-after", villagersWorkImmunityAfter );
+ villagersWorkImmunityFor = getInt( "entity-activation-range.villagers-work-immunity-for", villagersWorkImmunityFor );
+ villagersActiveForPanic = getBoolean( "entity-activation-range.villagers-active-for-panic", villagersActiveForPanic );
+ // Paper end + // Paper end
tickInactiveVillagers = getBoolean( "entity-activation-range.tick-inactive-villagers", tickInactiveVillagers ); tickInactiveVillagers = getBoolean( "entity-activation-range.tick-inactive-villagers", tickInactiveVillagers );
log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers ); log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers );