mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-30 16:49:42 +02:00
This PR contains all of Tuinity's patches. Very notable ones are: - Highly optimised collisions - Optimised entity lookups by bounding box (Mojang made regressions in 1.17, this brings it back to 1.16) - Starlight https://github.com/PaperMC/Starlight - Rewritten dataconverter system https://github.com/PaperMC/DataConverter - Random block ticking optimisation (wrongly dropped from Paper 1.17) - Chunk ticking optimisations - Anything else I've forgotten in the 60 or so patches If you are a previous Tuinity user, your config will not migrate. You must do it yourself. The config options have simply been moved into paper.yml, so it will be an easy migration. However, please note that the chunk loading options in tuinity.yml are NOT compatible with the options in paper.yml. * Port tuinity, initial patchset * Update gradle to 7.2 jmp said it fixes rebuildpatches not working for me. it fucking better * Completely clean apply * Remove tuinity config, add per player api patch * Remove paper reobf mappings patch * Properly update gradlew * Force clean rebuild * Mark fixups Comments and ATs still need to be done * grep -r "Tuinity" * Fixup * Ensure gameprofile lastaccess is written only under the state lock * update URL for dataconverter * Only clean rebuild tuinity patches might fix merge conflicts * Use UTF-8 for gradlew * Clean rb patches again * Convert block ids used as item ids Neither the converters of pre 1.13 nor DFU handled these cases, as by the time they were written the game at the time didn't consider these ids valid - they would be air. Because of this, some worlds have logspam since only DataConverter (not DFU or legacy converters) will warn when an invalid id has been seen. While quite a few do need to now be considered as air, quite a lot do not. So it makes sense to add conversion for these items, instead of simply suppressing or ignoring the logs. I've now added id -> string conversion for all block ids that could be used as items that existed in the game before 1.7.10 (I have no interest in tracking down the exact version block ids stopped working) that were on https://minecraft-ids.grahamedgecombe.com/ Items that did not directly convert to new items will be instead converted to air: stems, wheat crops, piston head, tripwire wire block * Fix LightPopulated parsing in V1466 The DFU code was checking if the number existed, not if it didn't exist. I misread the original code. * Always parse protochunk light sources unless it is marked as non-lit Chunks not marked as lit will always go through the light engine, so they should always have their block sources parsed. * Update custom names to JSON for players Missed this fix from CB, as it was inside the DataFixers class. I decided to double check all of the CB changes again: DataFixers.java was the only area I missed, as I had inspected all datafixer diffs and implemented them all into DataConverter. I also checked Bootstrap.java again, and re-evaluated their changes. I had previously done this, but determined that they were all bad. The changes to make standing_sign block map to oak_sign block in V1450 is bad, because that's not the item id V1450 accepts. Only in 1.14 did oak_sign even exist, and as expected there is a converter to rename all existing sign items/blocks. The fix to register the portal block under id 1440 is useless, as the flattenning logic will default to the lowest registered id - which is the exact blockstate that CB registers into 1440. So it just doesn't do anything. The extra item ids in the id -> string converter are already added, but I found this from EMC originally. The change for the spawn egg id 23 -> Arrow is just wrong, that id DOES correspond to TippedArrow, NOT Arrow. As expected, the spawn egg already has a dedicated mapping for Arrow, which is id 10 - which was Arrow's entity id. I also ported a fix for the cooked_fished id update. This doesn't really matter since there is already a dataconverter to fix this, but the game didn't accept cooked_fished at the time. So I see no harm. * Review all converters and walkers - Refactor V99 to have helper methods for defining entity/tile entity types - Automatically namespace all ids that should be namespaced. While vanilla never saved non-namespaced data for things that are namespaced, plugins/users might have. - Synchronised the identity ensure map in HelperBlockFlatteningV1450 - Code style consistency - Add missing log warning in V102 for ITEM_NAME type conversion - Use getBoolean instead of getByte - Use ConverterAbstractEntityRename for V143 TippedArrow -> Arrow rename, as it will affect ENTITY_NAME type - Always set isVillager to false in V502 for Zombie - Register V808's converter under subversion 1 like DFU - Register a breakpoint for V1.17.1. In the future, all final versions of major releases will have a breakpoint so that the work required to determine if a converter needs a breakpoint is minimal - Validate that a dataconverter is only registered for a version that is registered - ConverterFlattenTileEntity is actually ConverterFlattenEntity It even registered the converters under TILE_ENTITY, instead of ENTITY. - Fix id comparison in V1492 STRUCTURE_FEATURE renamer - Use ConverterAbstractStatsRename for V1510 stats renamer At the time I had written that class, the abstract renamer didn't exist. - Ensure OwnerUUID is at least set to empty string in V1904 if the ocelot is converted to a cat (this is likely so that it retains a collar) - Use generic read/write for Records in V1946 Records is actually a list, not a map. So reading map was invalid. * Always set light to zero when propagating decrease This fixes an almost infinite loop where light values would be spam queued on a very small subset on blocks. This also likely fixes the memory issues people were seeing. * re-organize patches * Apply and fix conflicts * Revert some patches getChunkAt retains chunks so that plugins don't spam loads revert mc-4 fix will remain unless issues pop up * Shuffle iterated chunks if per player is not enabled Can help with some mob spawning stacking up at locations * Make per player default, migrate all configs * Adjust comments in fixups * Rework config for player chunk loader Old config is not compatible. Move all configs to be under `settings` in paper.yml The player chunk loader has been modified to less aggressively load chunks, but to send chunks at higher rates compared to tuinity. There are new config entries to tune this behavior. * Add back old constructor to CompressionEncoder/Decoder (fixes Tuinity #358) * Raise chunk loading default limits * Reduce worldgen thread workers for lower core count cpus * Raise limits for chunk loading config Also place it under `chunk-loading` * Disable max chunk send rate by default * Fix conflicts and rebuild patches * Drop default send rate again Appears to be still causing problems for no known reason * Raise chunk send limits to 100 per player While a low limit fixes ping issues for some people, most people do not suffer from this issue and thus should not suffer from an extremely slow load-in rate. * Rebase part 1 Autosquash the fixups * Move not implemented up * Fixup mc-dev fixes Missed this one * Rebase per player viewdistance api into the original api patch * Remove old light engine patch part 1 The prioritisation must be kept from it, so that part has been rebased into the priority patch. Part 2 will deal with rebasing all of the patches _after_ * Rebase remaining patches for old light patch removal * Remove other mid tick patch * Remove Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch Replaced by `Do not copy visible chunks` * Revert AT for Vec3i setX/Y/Z The class is immutable. set should not be exposed * Remove old IntegerUtil class * Replace old CraftChunk#getEntities patch * Remove import for SWMRNibbleArray in ChunkAccess * Finished merge checklist * Remove ensureTickThread impl in urgency patch Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
764 lines
40 KiB
Diff
764 lines
40 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 13 May 2016 01:38:06 -0400
|
|
Subject: [PATCH] Entity Activation Range 2.0
|
|
|
|
Optimizes performance of Activation Range
|
|
|
|
Adds many new configurations and a new wake up inactive system
|
|
|
|
Fixes and adds new Immunities to improve gameplay behavior
|
|
|
|
Adds water Mobs to activation range config and nerfs fish
|
|
Adds flying monsters to control ghast and phantoms
|
|
Adds villagers as separate config
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
index fa5aa491c3ed6bf50b7f34c9f32a0b146e6c0aef..8a1df5b26a6ba0e2fa13a9974cf41384a8e6d4fe 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@@ -2,7 +2,6 @@ package net.minecraft.server.level;
|
|
|
|
import com.google.common.annotations.VisibleForTesting;
|
|
import co.aikar.timings.TimingHistory; // Paper
|
|
-import co.aikar.timings.Timings; // Paper
|
|
import com.google.common.collect.Lists;
|
|
import com.mojang.datafixers.DataFixer;
|
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
|
@@ -11,7 +10,6 @@ import it.unimi.dsi.fastutil.longs.LongSet;
|
|
import it.unimi.dsi.fastutil.longs.LongSets;
|
|
import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry;
|
|
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
|
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
|
|
import it.unimi.dsi.fastutil.objects.ObjectIterator;
|
|
import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
|
|
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
|
|
@@ -122,7 +120,6 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
|
|
import net.minecraft.world.level.chunk.storage.EntityStorage;
|
|
import net.minecraft.world.level.dimension.DimensionType;
|
|
import net.minecraft.world.level.dimension.end.EndDragonFight;
|
|
-import net.minecraft.world.level.entity.EntityAccess;
|
|
import net.minecraft.world.level.entity.EntityPersistentStorage;
|
|
import net.minecraft.world.level.entity.EntityTickList;
|
|
import net.minecraft.world.level.entity.EntityTypeTest;
|
|
@@ -943,17 +940,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
++TimingHistory.entityTicks; // Paper - timings
|
|
// Spigot start
|
|
co.aikar.timings.Timing timer; // Paper
|
|
- if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
|
|
+ /*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below
|
|
entity.tickCount++;
|
|
timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings
|
|
entity.inactiveTick();
|
|
} finally { timer.stopTiming(); } // Paper
|
|
return;
|
|
- }
|
|
+ }*/ // Paper - comment out EAR 2
|
|
// Spigot end
|
|
// Paper start- timings
|
|
- TimingHistory.activatedEntityTicks++;
|
|
- timer = entity.getVehicle() != null ? entity.getType().passengerTickTimer.startTiming() : entity.getType().tickTimer.startTiming();
|
|
+ final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(entity);
|
|
+ timer = isActive ? entity.getType().tickTimer.startTiming() : entity.getType().inactiveTickTimer.startTiming(); // Paper
|
|
try {
|
|
// Paper end - timings
|
|
entity.setOldPosAndRot();
|
|
@@ -964,9 +961,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
return Registry.ENTITY_TYPE.getKey(entity.getType()).toString();
|
|
});
|
|
gameprofilerfiller.incrementCounter("tickNonPassenger");
|
|
+ if (isActive) { // Paper - EAR 2
|
|
+ TimingHistory.activatedEntityTicks++;
|
|
entity.tick();
|
|
entity.postTick(); // CraftBukkit
|
|
+ } else { entity.inactiveTick(); } // Paper - EAR 2
|
|
this.getProfiler().pop();
|
|
+ } finally { timer.stopTiming(); } // Paper - timings
|
|
Iterator iterator = entity.getPassengers().iterator();
|
|
|
|
while (iterator.hasNext()) {
|
|
@@ -974,13 +975,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
|
|
this.tickPassenger(entity, entity1);
|
|
}
|
|
- } finally { timer.stopTiming(); } // Paper - timings
|
|
+ // } finally { timer.stopTiming(); } // Paper - timings - move up
|
|
|
|
}
|
|
|
|
private void tickPassenger(Entity vehicle, Entity passenger) {
|
|
if (!passenger.isRemoved() && passenger.getVehicle() == vehicle) {
|
|
if (passenger instanceof Player || this.entityTickList.contains(passenger)) {
|
|
+ // Paper - EAR 2
|
|
+ final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
|
|
+ co.aikar.timings.Timing timer = isActive ? passenger.getType().passengerTickTimer.startTiming() : passenger.getType().passengerInactiveTickTimer.startTiming(); // Paper
|
|
+ try {
|
|
+ // Paper end
|
|
passenger.setOldPosAndRot();
|
|
++passenger.tickCount;
|
|
ProfilerFiller gameprofilerfiller = this.getProfiler();
|
|
@@ -989,8 +995,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
return Registry.ENTITY_TYPE.getKey(passenger.getType()).toString();
|
|
});
|
|
gameprofilerfiller.incrementCounter("tickPassenger");
|
|
+ // Paper start - EAR 2
|
|
+ if (isActive) {
|
|
passenger.rideTick();
|
|
passenger.postTick(); // CraftBukkit
|
|
+ } else {
|
|
+ passenger.setDeltaMovement(Vec3.ZERO);
|
|
+ passenger.inactiveTick();
|
|
+ // copied from inside of if (isPassenger()) of passengerTick, but that ifPassenger is unnecessary
|
|
+ vehicle.positionRider(passenger);
|
|
+ }
|
|
+ // Paper end - EAR 2
|
|
gameprofilerfiller.pop();
|
|
Iterator iterator = passenger.getPassengers().iterator();
|
|
|
|
@@ -1000,6 +1015,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
this.tickPassenger(passenger, entity2);
|
|
}
|
|
|
|
+ } finally { timer.stopTiming(); }// Paper - EAR2 timings
|
|
}
|
|
} else {
|
|
passenger.stopRiding();
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index 8e30a0d42d422fea6bda77d16d5eae8bab01224d..3268187f77b78a04191628b06dc7693b08b8d642 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -327,6 +327,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
|
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
|
public final boolean defaultActivationState;
|
|
public long activatedTick = Integer.MIN_VALUE;
|
|
+ public long activatedImmunityTick = Integer.MIN_VALUE; // Paper
|
|
+ public boolean isTemporarilyActive = false; // Paper
|
|
public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
|
|
protected int numCollisions = 0; // Paper
|
|
public void inactiveTick() { }
|
|
@@ -773,6 +775,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
|
} else {
|
|
this.wasOnFire = this.isOnFire();
|
|
if (movementType == MoverType.PISTON) {
|
|
+ this.activatedTick = Math.max(this.activatedTick, MinecraftServer.currentTick + 20); // Paper
|
|
+ this.activatedImmunityTick = Math.max(this.activatedImmunityTick, MinecraftServer.currentTick + 20); // Paper
|
|
movement = this.limitPistonMovement(movement);
|
|
if (movement.equals(Vec3.ZERO)) {
|
|
return;
|
|
@@ -785,6 +789,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
|
this.stuckSpeedMultiplier = Vec3.ZERO;
|
|
this.setDeltaMovement(Vec3.ZERO);
|
|
}
|
|
+ // Paper start - ignore movement changes while inactive.
|
|
+ if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
|
|
+ setDeltaMovement(Vec3.ZERO);
|
|
+ this.level.getProfiler().pop();
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
movement = this.maybeBackOffFromEdge(movement, movementType);
|
|
Vec3 vec3d1 = this.collide(movement);
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
index 6e5682fed08a41c7e573e6611fca93bf85019b9f..976dbf40292b10364f9e80bebe96ec9c4dfb657e 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
@@ -203,6 +203,19 @@ public abstract class Mob extends LivingEntity {
|
|
return this.lookControl;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void inactiveTick() {
|
|
+ super.inactiveTick();
|
|
+ if (this.goalSelector.inactiveTick()) {
|
|
+ this.goalSelector.tick();
|
|
+ }
|
|
+ if (this.targetSelector.inactiveTick()) {
|
|
+ this.targetSelector.tick();
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public MoveControl getMoveControl() {
|
|
if (this.isPassenger() && this.getVehicle() instanceof Mob) {
|
|
Mob entityinsentient = (Mob) this.getVehicle();
|
|
diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
|
index 920ae9af8985705a0ada7da5b7085a1ed8ca7f27..7c82d453388a27b69207d051dec316fc14715e2b 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
|
@@ -13,6 +13,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
|
|
public abstract class PathfinderMob extends Mob {
|
|
|
|
public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper
|
|
+ public BlockPos movingTarget = null; public BlockPos getMovingTarget() { return movingTarget; } // Paper
|
|
|
|
protected PathfinderMob(EntityType<? extends PathfinderMob> type, Level world) {
|
|
super(type, world);
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
|
|
index dc7da3b806d1c759958d7c51b05efbc4b6c42653..69bf112655615337e0df3ea56b9e42fa5ff70430 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
|
|
@@ -31,6 +31,7 @@ public class GoalSelector {
|
|
private final EnumSet<Goal.Flag> disabledFlags = EnumSet.noneOf(Goal.Flag.class);
|
|
private int tickCount;
|
|
private int newGoalRate = 3;
|
|
+ private int curRate;
|
|
|
|
public GoalSelector(Supplier<ProfilerFiller> profiler) {
|
|
this.profiler = profiler;
|
|
@@ -45,6 +46,20 @@ public class GoalSelector {
|
|
this.availableGoals.clear();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ public boolean inactiveTick() {
|
|
+ this.curRate++;
|
|
+ return this.curRate % this.newGoalRate == 0;
|
|
+ }
|
|
+ public boolean hasTasks() {
|
|
+ for (WrappedGoal task : this.availableGoals) {
|
|
+ if (task.isRunning()) {
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end
|
|
public void removeGoal(Goal goal) {
|
|
this.availableGoals.stream().filter((wrappedGoal) -> {
|
|
return wrappedGoal.getGoal() == goal;
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
|
|
index 27ea9c10b7f66c2133b0829c0b1c37143dd80b56..c28ade67f6a59146064a57bf016a646197f47ac4 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
|
|
@@ -14,7 +14,7 @@ public abstract class MoveToBlockGoal extends Goal {
|
|
protected int nextStartTick;
|
|
protected int tryTicks;
|
|
private int maxStayTicks;
|
|
- protected BlockPos blockPos = BlockPos.ZERO; @Deprecated public final BlockPos getTargetPosition() { return this.blockPos; } // Paper - OBFHELPER
|
|
+ protected BlockPos blockPos = BlockPos.ZERO; @Deprecated public final BlockPos getTargetPosition() { return this.blockPos; } @Deprecated public void setTargetPosition(BlockPos pos) { this.blockPos = pos; mob.movingTarget = pos != BlockPos.ZERO ? pos : null; } // Paper - OBFHELPER
|
|
private boolean reachedTarget;
|
|
private final int searchRange;
|
|
private final int verticalSearchRange;
|
|
@@ -23,6 +23,13 @@ public abstract class MoveToBlockGoal extends Goal {
|
|
public MoveToBlockGoal(PathfinderMob mob, double speed, int range) {
|
|
this(mob, speed, range, 1);
|
|
}
|
|
+ // Paper start - activation range improvements
|
|
+ @Override
|
|
+ public void stop() {
|
|
+ super.stop();
|
|
+ setTargetPosition(BlockPos.ZERO);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
public MoveToBlockGoal(PathfinderMob mob, double speed, int range, int maxYDifference) {
|
|
this.mob = mob;
|
|
@@ -109,6 +116,7 @@ public abstract class MoveToBlockGoal extends Goal {
|
|
mutableBlockPos.setWithOffset(blockPos, m, k - 1, n);
|
|
if (this.mob.isWithinRestriction(mutableBlockPos) && this.isValidTarget(this.mob.level, mutableBlockPos)) {
|
|
this.blockPos = mutableBlockPos;
|
|
+ setTargetPosition(mutableBlockPos.immutable()); // Paper
|
|
return true;
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
|
index 0ba4e6111726a1ca3cc5b6ce21e0500cc57a4aa3..cbec6decd12dae4f1b9f05f863b493d7379f46ed 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
|
@@ -227,17 +227,29 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
|
@Override
|
|
public void inactiveTick() {
|
|
// SPIGOT-3874, SPIGOT-3894, SPIGOT-3846, SPIGOT-5286 :(
|
|
- if (level.spigotConfig.tickInactiveVillagers && this.isEffectiveAi()) {
|
|
- this.customServerAiStep();
|
|
+ // Paper start
|
|
+ if (this.getUnhappyCounter() > 0) {
|
|
+ this.setUnhappyCounter(this.getUnhappyCounter() - 1);
|
|
+ }
|
|
+ if (this.isEffectiveAi()) {
|
|
+ if (level.spigotConfig.tickInactiveVillagers) {
|
|
+ this.customServerAiStep();
|
|
+ } else {
|
|
+ this.mobTick(true);
|
|
+ }
|
|
}
|
|
+ maybeDecayGossip();
|
|
+ // Paper end
|
|
+
|
|
super.inactiveTick();
|
|
}
|
|
// Spigot End
|
|
|
|
@Override
|
|
- protected void customServerAiStep() {
|
|
+ protected void customServerAiStep() { mobTick(false); }
|
|
+ protected void mobTick(boolean inactive) {
|
|
this.level.getProfiler().push("villagerBrain");
|
|
- this.getBrain().tick((ServerLevel) this.level, this); // CraftBukkit - decompile error
|
|
+ if (!inactive) this.getBrain().tick((ServerLevel) this.level, this); // CraftBukkit - decompile error // Paper
|
|
this.level.getProfiler().pop();
|
|
if (this.assignProfessionWhenSpawned) {
|
|
this.assignProfessionWhenSpawned = false;
|
|
@@ -261,7 +273,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
|
this.lastTradedPlayer = null;
|
|
}
|
|
|
|
- if (!this.isNoAi() && this.random.nextInt(100) == 0) {
|
|
+ if (!inactive && !this.isNoAi() && this.random.nextInt(100) == 0) { // Paper
|
|
Raid raid = ((ServerLevel) this.level).getRaidAt(this.blockPosition());
|
|
|
|
if (raid != null && raid.isActive() && !raid.isOver()) {
|
|
@@ -272,6 +284,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
|
if (this.getVillagerData().getProfession() == VillagerProfession.NONE && this.isTrading()) {
|
|
this.stopTrading();
|
|
}
|
|
+ if (inactive) return; // Paper
|
|
|
|
super.customServerAiStep();
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
|
index 44b88af588f233943ab183ad45b97b051db73aab..fac722d2f5bbd86cbeacc7da4bb45155257ae97f 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -155,6 +155,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
|
public long ticksPerWaterSpawns;
|
|
public long ticksPerWaterAmbientSpawns;
|
|
public long ticksPerAmbientSpawns;
|
|
+ // Paper start
|
|
+ public int wakeupInactiveRemainingAnimals;
|
|
+ public int wakeupInactiveRemainingFlying;
|
|
+ public int wakeupInactiveRemainingMonsters;
|
|
+ public int wakeupInactiveRemainingVillagers;
|
|
+ // Paper end
|
|
public boolean populating;
|
|
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
|
|
index 9b631698d1c736f61e07a5a1253127f4081dc90d..54020a3f2b18c4f42008f5d5f4541ef1a1efbcd7 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
|
|
@@ -140,6 +140,10 @@ public class PistonMovingBlockEntity extends BlockEntity {
|
|
}
|
|
|
|
entity.setDeltaMovement(e, g, h);
|
|
+ // Paper - EAR items stuck in in slime pushed by a piston
|
|
+ entity.activatedTick = Math.max(entity.activatedTick, net.minecraft.server.MinecraftServer.currentTick + 10);
|
|
+ entity.activatedImmunityTick = Math.max(entity.activatedImmunityTick, net.minecraft.server.MinecraftServer.currentTick + 10);
|
|
+ // Paper end
|
|
break;
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
|
index 84ce3d38d5decb4a2f9fae78e0ef5d715860dc7d..2574ccd92c43f56e8be71f1bf6857c761a72a510 100644
|
|
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
|
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
|
@@ -1,39 +1,51 @@
|
|
package org.spigotmc;
|
|
|
|
-import java.util.Collection;
|
|
+import net.minecraft.core.BlockPos;
|
|
import net.minecraft.server.MinecraftServer;
|
|
+import net.minecraft.server.level.ServerChunkCache;
|
|
import net.minecraft.world.entity.Entity;
|
|
+import net.minecraft.world.entity.FlyingMob;
|
|
import net.minecraft.world.entity.LightningBolt;
|
|
import net.minecraft.world.entity.LivingEntity;
|
|
+import net.minecraft.world.entity.Mob;
|
|
import net.minecraft.world.entity.PathfinderMob;
|
|
+import net.minecraft.world.entity.ai.Brain;
|
|
import net.minecraft.world.entity.ambient.AmbientCreature;
|
|
import net.minecraft.world.entity.animal.Animal;
|
|
+import net.minecraft.world.entity.animal.Bee;
|
|
import net.minecraft.world.entity.animal.Sheep;
|
|
+import net.minecraft.world.entity.animal.WaterAnimal;
|
|
+import net.minecraft.world.entity.animal.horse.Llama;
|
|
import net.minecraft.world.entity.boss.EnderDragonPart;
|
|
import net.minecraft.world.entity.boss.enderdragon.EndCrystal;
|
|
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
|
|
import net.minecraft.world.entity.boss.wither.WitherBoss;
|
|
import net.minecraft.world.entity.item.PrimedTnt;
|
|
import net.minecraft.world.entity.monster.Creeper;
|
|
-import net.minecraft.world.entity.monster.Monster;
|
|
-import net.minecraft.world.entity.monster.Slime;
|
|
+import net.minecraft.world.entity.monster.Enemy;
|
|
+import net.minecraft.world.entity.monster.Pillager;
|
|
import net.minecraft.world.entity.npc.Villager;
|
|
import net.minecraft.world.entity.player.Player;
|
|
import net.minecraft.world.entity.projectile.AbstractArrow;
|
|
import net.minecraft.world.entity.projectile.AbstractHurtingProjectile;
|
|
+import net.minecraft.world.entity.projectile.EyeOfEnder;
|
|
import net.minecraft.world.entity.projectile.FireworkRocketEntity;
|
|
import net.minecraft.world.entity.projectile.ThrowableProjectile;
|
|
import net.minecraft.world.entity.projectile.ThrownTrident;
|
|
import net.minecraft.world.entity.raid.Raider;
|
|
+import co.aikar.timings.MinecraftTimings;
|
|
+import net.minecraft.world.entity.schedule.Activity;
|
|
import net.minecraft.world.level.Level;
|
|
import net.minecraft.world.phys.AABB;
|
|
-import co.aikar.timings.MinecraftTimings;
|
|
|
|
public class ActivationRange
|
|
{
|
|
|
|
public enum ActivationType
|
|
{
|
|
+ WATER, // Paper
|
|
+ FLYING_MONSTER, // Paper
|
|
+ VILLAGER, // Paper
|
|
MONSTER,
|
|
ANIMAL,
|
|
RAIDER,
|
|
@@ -41,6 +53,43 @@ public class ActivationRange
|
|
|
|
AABB boundingBox = new AABB( 0, 0, 0, 0, 0, 0 );
|
|
}
|
|
+ // Paper start
|
|
+
|
|
+ static Activity[] VILLAGER_PANIC_IMMUNITIES = {
|
|
+ Activity.HIDE,
|
|
+ Activity.PRE_RAID,
|
|
+ Activity.RAID,
|
|
+ Activity.PANIC
|
|
+ };
|
|
+
|
|
+ private static int checkInactiveWakeup(Entity entity) {
|
|
+ Level world = entity.level;
|
|
+ SpigotWorldConfig config = world.spigotConfig;
|
|
+ long inactiveFor = MinecraftServer.currentTick - entity.activatedTick;
|
|
+ if (entity.activationType == ActivationType.VILLAGER) {
|
|
+ if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) {
|
|
+ world.wakeupInactiveRemainingVillagers--;
|
|
+ return config.wakeUpInactiveVillagersFor;
|
|
+ }
|
|
+ } else if (entity.activationType == ActivationType.ANIMAL) {
|
|
+ if (inactiveFor > config.wakeUpInactiveAnimalsEvery && world.wakeupInactiveRemainingAnimals > 0) {
|
|
+ world.wakeupInactiveRemainingAnimals--;
|
|
+ return config.wakeUpInactiveAnimalsFor;
|
|
+ }
|
|
+ } else if (entity.activationType == ActivationType.FLYING_MONSTER) {
|
|
+ if (inactiveFor > config.wakeUpInactiveFlyingEvery && world.wakeupInactiveRemainingFlying > 0) {
|
|
+ world.wakeupInactiveRemainingFlying--;
|
|
+ return config.wakeUpInactiveFlyingFor;
|
|
+ }
|
|
+ } else if (entity.activationType == ActivationType.MONSTER || entity.activationType == ActivationType.RAIDER) {
|
|
+ if (inactiveFor > config.wakeUpInactiveMonstersEvery && world.wakeupInactiveRemainingMonsters > 0) {
|
|
+ world.wakeupInactiveRemainingMonsters--;
|
|
+ return config.wakeUpInactiveMonstersFor;
|
|
+ }
|
|
+ }
|
|
+ return -1;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
static AABB maxBB = new AABB( 0, 0, 0, 0, 0, 0 );
|
|
|
|
@@ -53,10 +102,13 @@ public class ActivationRange
|
|
*/
|
|
public static ActivationType initializeEntityActivationType(Entity entity)
|
|
{
|
|
+ if (entity instanceof WaterAnimal) { return ActivationType.WATER; } // Paper
|
|
+ else if (entity instanceof Villager) { return ActivationType.VILLAGER; } // Paper
|
|
+ else if (entity instanceof FlyingMob && entity instanceof Enemy) { return ActivationType.FLYING_MONSTER; } // Paper - doing & Monster incase Flying no longer includes monster in future
|
|
if ( entity instanceof Raider )
|
|
{
|
|
return ActivationType.RAIDER;
|
|
- } else if ( entity instanceof Monster || entity instanceof Slime )
|
|
+ } else if ( entity instanceof Enemy ) // Paper - correct monster check
|
|
{
|
|
return ActivationType.MONSTER;
|
|
} else if ( entity instanceof PathfinderMob || entity instanceof AmbientCreature )
|
|
@@ -77,10 +129,14 @@ public class ActivationRange
|
|
*/
|
|
public static boolean initializeEntityActivationState(Entity entity, SpigotWorldConfig config)
|
|
{
|
|
- if ( ( entity.activationType == ActivationType.MISC && config.miscActivationRange == 0 )
|
|
- || ( entity.activationType == ActivationType.RAIDER && config.raiderActivationRange == 0 )
|
|
- || ( entity.activationType == ActivationType.ANIMAL && config.animalActivationRange == 0 )
|
|
- || ( entity.activationType == ActivationType.MONSTER && config.monsterActivationRange == 0 )
|
|
+ if ( ( entity.activationType == ActivationType.MISC && config.miscActivationRange <= 0 )
|
|
+ || ( entity.activationType == ActivationType.RAIDER && config.raiderActivationRange <= 0 )
|
|
+ || ( entity.activationType == ActivationType.ANIMAL && config.animalActivationRange <= 0 )
|
|
+ || ( entity.activationType == ActivationType.MONSTER && config.monsterActivationRange <= 0 )
|
|
+ || ( entity.activationType == ActivationType.VILLAGER && config.villagerActivationRange <= 0 ) // Paper
|
|
+ || ( entity.activationType == ActivationType.WATER && config.waterActivationRange <= 0 ) // Paper
|
|
+ || ( entity.activationType == ActivationType.FLYING_MONSTER && config.flyingMonsterActivationRange <= 0 ) // Paper
|
|
+ || entity instanceof EyeOfEnder // Paper
|
|
|| entity instanceof Player
|
|
|| entity instanceof ThrowableProjectile
|
|
|| entity instanceof EnderDragon
|
|
@@ -113,10 +169,25 @@ public class ActivationRange
|
|
final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
|
|
final int animalActivationRange = world.spigotConfig.animalActivationRange;
|
|
final int monsterActivationRange = world.spigotConfig.monsterActivationRange;
|
|
+ // Paper start
|
|
+ final int waterActivationRange = world.spigotConfig.waterActivationRange;
|
|
+ final int flyingActivationRange = world.spigotConfig.flyingMonsterActivationRange;
|
|
+ final int villagerActivationRange = world.spigotConfig.villagerActivationRange;
|
|
+ world.wakeupInactiveRemainingAnimals = Math.min(world.wakeupInactiveRemainingAnimals + 1, world.spigotConfig.wakeUpInactiveAnimals);
|
|
+ world.wakeupInactiveRemainingVillagers = Math.min(world.wakeupInactiveRemainingVillagers + 1, world.spigotConfig.wakeUpInactiveVillagers);
|
|
+ world.wakeupInactiveRemainingMonsters = Math.min(world.wakeupInactiveRemainingMonsters + 1, world.spigotConfig.wakeUpInactiveMonsters);
|
|
+ world.wakeupInactiveRemainingFlying = Math.min(world.wakeupInactiveRemainingFlying + 1, world.spigotConfig.wakeUpInactiveFlying);
|
|
+ final ServerChunkCache chunkProvider = (ServerChunkCache) world.getChunkSource();
|
|
+ // Paper end
|
|
|
|
int maxRange = Math.max( monsterActivationRange, animalActivationRange );
|
|
maxRange = Math.max( maxRange, raiderActivationRange );
|
|
maxRange = Math.max( maxRange, miscActivationRange );
|
|
+ // Paper start
|
|
+ maxRange = Math.max( maxRange, flyingActivationRange );
|
|
+ maxRange = Math.max( maxRange, waterActivationRange );
|
|
+ maxRange = Math.max( maxRange, villagerActivationRange );
|
|
+ // Paper end
|
|
maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange );
|
|
|
|
for ( Player player : world.players() )
|
|
@@ -128,6 +199,11 @@ public class ActivationRange
|
|
ActivationType.RAIDER.boundingBox = player.getBoundingBox().inflate( raiderActivationRange, 256, raiderActivationRange );
|
|
ActivationType.ANIMAL.boundingBox = player.getBoundingBox().inflate( animalActivationRange, 256, animalActivationRange );
|
|
ActivationType.MONSTER.boundingBox = player.getBoundingBox().inflate( monsterActivationRange, 256, monsterActivationRange );
|
|
+ // Paper start
|
|
+ ActivationType.WATER.boundingBox = player.getBoundingBox().inflate( waterActivationRange, 256, waterActivationRange );
|
|
+ ActivationType.FLYING_MONSTER.boundingBox = player.getBoundingBox().inflate( flyingActivationRange, 256, flyingActivationRange );
|
|
+ ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, 256, waterActivationRange );
|
|
+ // Paper end
|
|
|
|
world.getEntities().get(maxBB, ActivationRange::activateEntity);
|
|
}
|
|
@@ -162,56 +238,108 @@ public class ActivationRange
|
|
* @param entity
|
|
* @return
|
|
*/
|
|
- public static boolean checkEntityImmunities(Entity entity)
|
|
+ public static int checkEntityImmunities(Entity entity) // Paper - return # of ticks to get immunity
|
|
{
|
|
+ // Paper start
|
|
+ SpigotWorldConfig config = entity.level.spigotConfig;
|
|
+ int inactiveWakeUpImmunity = checkInactiveWakeup(entity);
|
|
+ if (inactiveWakeUpImmunity > -1) {
|
|
+ return inactiveWakeUpImmunity;
|
|
+ }
|
|
+ if (entity.remainingFireTicks > 0) {
|
|
+ return 2;
|
|
+ }
|
|
+ if (entity.activatedImmunityTick >= MinecraftServer.currentTick) {
|
|
+ return 1;
|
|
+ }
|
|
+ long inactiveFor = MinecraftServer.currentTick - entity.activatedTick;
|
|
+ // Paper end
|
|
// quick checks.
|
|
- if ( entity.wasTouchingWater || entity.remainingFireTicks > 0 )
|
|
+ if ( (entity.activationType != ActivationType.WATER && entity.wasTouchingWater && entity.isPushedByFluid()) ) // Paper
|
|
{
|
|
- return true;
|
|
+ return 100; // Paper
|
|
}
|
|
if ( !( entity instanceof AbstractArrow ) )
|
|
{
|
|
- if ( !entity.isOnGround() || !entity.passengers.isEmpty() || entity.isPassenger() )
|
|
+ if ( (!entity.isOnGround() && !(entity instanceof FlyingMob)) ) // Paper - remove passengers logic
|
|
{
|
|
- return true;
|
|
+ return 10; // Paper
|
|
}
|
|
} else if ( !( (AbstractArrow) entity ).inGround )
|
|
{
|
|
- return true;
|
|
+ return 1; // Paper
|
|
}
|
|
// special cases.
|
|
if ( entity instanceof LivingEntity )
|
|
{
|
|
LivingEntity living = (LivingEntity) entity;
|
|
- if ( /*TODO: Missed mapping? living.attackTicks > 0 || */ living.hurtTime > 0 || living.activeEffects.size() > 0 )
|
|
+ if ( living.onClimbable() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 ) // Paper
|
|
{
|
|
- return true;
|
|
+ return 1; // Paper
|
|
}
|
|
- if ( entity instanceof PathfinderMob && ( (PathfinderMob) entity ).getTarget() != null )
|
|
+ if ( entity instanceof Mob && ((Mob) entity ).getTarget() != null) // Paper
|
|
{
|
|
- return true;
|
|
+ return 20; // Paper
|
|
}
|
|
- if ( entity instanceof Villager && ( (Villager) entity ).canBreed() )
|
|
+ // Paper start
|
|
+ if (entity instanceof Bee) {
|
|
+ Bee bee = (Bee)entity;
|
|
+ BlockPos movingTarget = bee.getMovingTarget();
|
|
+ if (bee.isAngry() ||
|
|
+ (bee.getHivePos() != null && bee.getHivePos().equals(movingTarget)) ||
|
|
+ (bee.getSavedFlowerPos() != null && bee.getSavedFlowerPos().equals(movingTarget))
|
|
+ ) {
|
|
+ return 20;
|
|
+ }
|
|
+ }
|
|
+ if ( entity instanceof Villager ) {
|
|
+ Brain<Villager> behaviorController = ((Villager) entity).getBrain();
|
|
+
|
|
+ if (config.villagersActiveForPanic) {
|
|
+ for (Activity activity : VILLAGER_PANIC_IMMUNITIES) {
|
|
+ if (behaviorController.isActive(activity)) {
|
|
+ return 20*5;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (config.villagersWorkImmunityAfter > 0 && inactiveFor >= config.villagersWorkImmunityAfter) {
|
|
+ if (behaviorController.isActive(Activity.WORK)) {
|
|
+ return config.villagersWorkImmunityFor;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ if ( entity instanceof Llama && ( (Llama) entity ).inCaravan() )
|
|
{
|
|
- return true;
|
|
+ return 1;
|
|
}
|
|
+ // Paper end
|
|
if ( entity instanceof Animal )
|
|
{
|
|
Animal animal = (Animal) entity;
|
|
if ( animal.isBaby() || animal.isInLove() )
|
|
{
|
|
- return true;
|
|
+ return 5; // Paper
|
|
}
|
|
if ( entity instanceof Sheep && ( (Sheep) entity ).isSheared() )
|
|
{
|
|
- return true;
|
|
+ return 1; // Paper
|
|
}
|
|
}
|
|
if (entity instanceof Creeper && ((Creeper) entity).isIgnited()) { // isExplosive
|
|
- return true;
|
|
+ return 20; // Paper
|
|
+ }
|
|
+ // Paper start
|
|
+ if (entity instanceof Mob && ((Mob) entity).targetSelector.hasTasks() ) {
|
|
+ return 0;
|
|
+ }
|
|
+ if (entity instanceof Pillager) {
|
|
+ Pillager pillager = (Pillager) entity;
|
|
+ // TODO:?
|
|
}
|
|
+ // Paper end
|
|
}
|
|
- return false;
|
|
+ return -1; // Paper
|
|
}
|
|
|
|
/**
|
|
@@ -226,8 +354,19 @@ public class ActivationRange
|
|
if ( entity instanceof FireworkRocketEntity ) {
|
|
return true;
|
|
}
|
|
+ // Paper start - special case always immunities
|
|
+ // immunize brand new entities, dead entities, and portal scenarios
|
|
+ if (entity.defaultActivationState || entity.tickCount < 20*10 || !entity.isAlive() || entity.isInsidePortal || entity.portalCooldown > 0) {
|
|
+ return true;
|
|
+ }
|
|
+ // immunize leashed entities
|
|
+ if (entity instanceof Mob && ((Mob)entity).leashHolder instanceof Player) {
|
|
+ return true;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
- boolean isActive = entity.activatedTick >= MinecraftServer.currentTick || entity.defaultActivationState;
|
|
+ boolean isActive = entity.activatedTick >= MinecraftServer.currentTick;
|
|
+ entity.isTemporarilyActive = false; // Paper
|
|
|
|
// Should this entity tick?
|
|
if ( !isActive )
|
|
@@ -235,15 +374,19 @@ public class ActivationRange
|
|
if ( ( MinecraftServer.currentTick - entity.activatedTick - 1 ) % 20 == 0 )
|
|
{
|
|
// Check immunities every 20 ticks.
|
|
- if ( ActivationRange.checkEntityImmunities( entity ) )
|
|
- {
|
|
- // Triggered some sort of immunity, give 20 full ticks before we check again.
|
|
- entity.activatedTick = MinecraftServer.currentTick + 20;
|
|
+ // Paper start
|
|
+ int immunity = checkEntityImmunities(entity);
|
|
+ if (immunity >= 0) {
|
|
+ entity.activatedTick = MinecraftServer.currentTick + immunity;
|
|
+ } else {
|
|
+ entity.isTemporarilyActive = true;
|
|
}
|
|
+ // Paper end
|
|
isActive = true;
|
|
+
|
|
}
|
|
// Add a little performance juice to active entities. Skip 1/4 if not immune.
|
|
- } else if ( !entity.defaultActivationState && entity.tickCount % 4 == 0 && !ActivationRange.checkEntityImmunities( entity ) )
|
|
+ } else if ( entity.tickCount % 4 == 0 && ActivationRange.checkEntityImmunities( entity ) < 0 ) // Paper
|
|
{
|
|
isActive = false;
|
|
}
|
|
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
index 45be7d1821497f13ab0da3c4bbff7585238e902e..769a492305a3ce83e0da0b3de4ebd73859d1e1d9 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
@@ -180,13 +180,59 @@ public class SpigotWorldConfig
|
|
public int monsterActivationRange = 32;
|
|
public int raiderActivationRange = 48;
|
|
public int miscActivationRange = 16;
|
|
+ // Paper start
|
|
+ public int flyingMonsterActivationRange = 32;
|
|
+ public int waterActivationRange = 16;
|
|
+ public int villagerActivationRange = 32;
|
|
+ public int wakeUpInactiveAnimals = 4;
|
|
+ public int wakeUpInactiveAnimalsEvery = 60*20;
|
|
+ public int wakeUpInactiveAnimalsFor = 5*20;
|
|
+ public int wakeUpInactiveMonsters = 8;
|
|
+ public int wakeUpInactiveMonstersEvery = 20*20;
|
|
+ public int wakeUpInactiveMonstersFor = 5*20;
|
|
+ public int wakeUpInactiveVillagers = 4;
|
|
+ public int wakeUpInactiveVillagersEvery = 30*20;
|
|
+ public int wakeUpInactiveVillagersFor = 5*20;
|
|
+ public int wakeUpInactiveFlying = 8;
|
|
+ public int wakeUpInactiveFlyingEvery = 10*20;
|
|
+ public int wakeUpInactiveFlyingFor = 5*20;
|
|
+ public int villagersWorkImmunityAfter = 5*20;
|
|
+ public int villagersWorkImmunityFor = 20;
|
|
+ public boolean villagersActiveForPanic = true;
|
|
+ // Paper end
|
|
public boolean tickInactiveVillagers = true;
|
|
private void activationRange()
|
|
{
|
|
+ boolean hasAnimalsConfig = config.getInt("entity-activation-range.animals", this.animalActivationRange) != this.animalActivationRange; // Paper
|
|
this.animalActivationRange = this.getInt( "entity-activation-range.animals", this.animalActivationRange );
|
|
this.monsterActivationRange = this.getInt( "entity-activation-range.monsters", this.monsterActivationRange );
|
|
this.raiderActivationRange = this.getInt( "entity-activation-range.raiders", this.raiderActivationRange );
|
|
this.miscActivationRange = this.getInt( "entity-activation-range.misc", this.miscActivationRange );
|
|
+ // Paper start
|
|
+ this.waterActivationRange = this.getInt( "entity-activation-range.water", this.waterActivationRange );
|
|
+ this.villagerActivationRange = this.getInt( "entity-activation-range.villagers", hasAnimalsConfig ? this.animalActivationRange : this.villagerActivationRange );
|
|
+ this.flyingMonsterActivationRange = this.getInt( "entity-activation-range.flying-monsters", this.flyingMonsterActivationRange );
|
|
+
|
|
+ this.wakeUpInactiveAnimals = this.getInt("entity-activation-range.wake-up-inactive.animals-max-per-tick", this.wakeUpInactiveAnimals);
|
|
+ this.wakeUpInactiveAnimalsEvery = this.getInt("entity-activation-range.wake-up-inactive.animals-every", this.wakeUpInactiveAnimalsEvery);
|
|
+ this.wakeUpInactiveAnimalsFor = this.getInt("entity-activation-range.wake-up-inactive.animals-for", this.wakeUpInactiveAnimalsFor);
|
|
+
|
|
+ this.wakeUpInactiveMonsters = this.getInt("entity-activation-range.wake-up-inactive.monsters-max-per-tick", this.wakeUpInactiveMonsters);
|
|
+ this.wakeUpInactiveMonstersEvery = this.getInt("entity-activation-range.wake-up-inactive.monsters-every", this.wakeUpInactiveMonstersEvery);
|
|
+ this.wakeUpInactiveMonstersFor = this.getInt("entity-activation-range.wake-up-inactive.monsters-for", this.wakeUpInactiveMonstersFor);
|
|
+
|
|
+ this.wakeUpInactiveVillagers = this.getInt("entity-activation-range.wake-up-inactive.villagers-max-per-tick", this.wakeUpInactiveVillagers);
|
|
+ this.wakeUpInactiveVillagersEvery = this.getInt("entity-activation-range.wake-up-inactive.villagers-every", this.wakeUpInactiveVillagersEvery);
|
|
+ this.wakeUpInactiveVillagersFor = this.getInt("entity-activation-range.wake-up-inactive.villagers-for", this.wakeUpInactiveVillagersFor);
|
|
+
|
|
+ this.wakeUpInactiveFlying = this.getInt("entity-activation-range.wake-up-inactive.flying-monsters-max-per-tick", this.wakeUpInactiveFlying);
|
|
+ this.wakeUpInactiveFlyingEvery = this.getInt("entity-activation-range.wake-up-inactive.flying-monsters-every", this.wakeUpInactiveFlyingEvery);
|
|
+ this.wakeUpInactiveFlyingFor = this.getInt("entity-activation-range.wake-up-inactive.flying-monsters-for", this.wakeUpInactiveFlyingFor);
|
|
+
|
|
+ this.villagersWorkImmunityAfter = this.getInt( "entity-activation-range.villagers-work-immunity-after", this.villagersWorkImmunityAfter );
|
|
+ this.villagersWorkImmunityFor = this.getInt( "entity-activation-range.villagers-work-immunity-for", this.villagersWorkImmunityFor );
|
|
+ this.villagersActiveForPanic = this.getBoolean( "entity-activation-range.villagers-active-for-panic", this.villagersActiveForPanic );
|
|
+ // Paper end
|
|
this.tickInactiveVillagers = this.getBoolean( "entity-activation-range.tick-inactive-villagers", this.tickInactiveVillagers );
|
|
this.log( "Entity Activation Range: An " + this.animalActivationRange + " / Mo " + this.monsterActivationRange + " / Ra " + this.raiderActivationRange + " / Mi " + this.miscActivationRange + " / Tiv " + this.tickInactiveVillagers );
|
|
}
|