SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität
Dieses Repository wurde am 2024-12-25 archiviert. Du kannst Dateien ansehen und es klonen, aber nicht pushen oder Issues/Pull-Requests öffnen.
c65dcad3eb
Paper-Old/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch

497 Zeilen
23 KiB
Diff
Originalformat Normale Ansicht Verlauf

Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2
2020-04-12 02:39:21 +02:00
From b8bdaa2d7bf5cd8c85ddd82c7238113f1e6ecadc Mon Sep 17 00:00:00 2001
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
From: Aikar <aikar@aikar.co>
Date: Fri, 13 May 2016 01:38:06 -0400
Subject: [PATCH] Activation Range Improvements
Optimizes performance of Activation Range
Fixes and adds new Immunities to improve gameplay behavior
Adds water Mobs to activation range config and nerfs fish
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2
2020-04-12 02:39:21 +02:00
index 0900db052d..a550a81bea 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
@@ -192,6 +192,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
public long activatedTick = Integer.MIN_VALUE;
+ 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() { }
@@ -553,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
this.recalcPosition();
} else {
if (enummovetype == EnumMoveType.PISTON) {
+ this.activatedTick = MinecraftServer.currentTick + 20; // Paper
vec3d = this.a(vec3d);
if (vec3d.equals(Vec3D.a)) {
return;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -565,6 +567,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.y = Vec3D.a;
this.setMot(Vec3D.a);
}
+ // Paper start - ignore movement changes while inactive.
Restore accidently reverted item in water fix
2020-04-03 05:12:21 +02:00
+ if (isTemporarilyActive && !(this instanceof EntityItem) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) {
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+ setMot(Vec3D.a);
+ return;
+ }
+ // Paper end
vec3d = this.a(vec3d, enummovetype);
Vec3D vec3d1 = this.e(vec3d);
@@ -2765,6 +2773,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.am;
}
+ public boolean isPushedByWater() { return this.bM(); } // Paper - OBFHELPER - the below is not an obfhelper, don't use it!
public boolean bM() {
// Paper start
return this.pushedByWater();
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index b40c8d2f83..4eda130750 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/net/minecraft/server/EntityCreature.java
+++ b/src/main/java/net/minecraft/server/EntityCreature.java
@@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
public abstract class EntityCreature extends EntityInsentient {
public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper
+ public BlockPosition movingTarget = null; public BlockPosition getMovingTarget() { return movingTarget; } // Paper
protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) {
super(entitytypes, world);
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index 6d53254f83..1991cee43d 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes: fba9f487 Improve legacy conversion of some materials that changed post flattening b1ba8749 Move Bukkit.Aware loading/saving to correct location f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles 689f429c #634: Cross platform patch scripts ab85433d Add set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
2020-02-21 18:52:20 +01:00
@@ -114,6 +114,17 @@ public abstract class EntityInsentient extends EntityLiving {
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
return this.lookController;
}
+ // Paper start
+ @Override
+ public void inactiveTick() {
+ super.inactiveTick();
+ this.goalSelector.inactiveTick();
+ if (this.targetSelector.inactiveTick()) {
+ this.targetSelector.doTick();
+ }
+ }
+ // Paper end
+
public ControllerMove getControllerMove() {
if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) {
EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle();
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index 6d4d41c88c..193dbfc5f6 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -382,6 +382,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
return this.bK != null;
}
+ public boolean inCaravan() { return this.fd(); } // Paper - OBFHELPER
public boolean fd() {
return this.bJ != null;
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index f22f12eeb0..bdb90a3466 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/net/minecraft/server/PathfinderGoal.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
@@ -20,7 +20,10 @@ public abstract class PathfinderGoal {
public void c() {}
- public void d() {}
+ public void d() {
+ onTaskReset(); // Paper
+ }
+ public void onTaskReset() {} // Paper
public void e() {}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index 41fb166ce0..e93129f0b2 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
@@ -4,12 +4,12 @@ import java.util.EnumSet;
public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
- protected final EntityCreature a;
+ protected final EntityCreature a;public EntityCreature getEntity() { return a; } // Paper - OBFHELPER
public final double b;
protected int c;
protected int d;
private int g;
- protected BlockPosition e;
+ protected BlockPosition e; public BlockPosition getTarget() { return e; } public void setTarget(BlockPosition pos) { this.e = pos; getEntity().movingTarget = pos != BlockPosition.ZERO ? pos : null; } // Paper - OBFHELPER
private boolean h;
private final int i;
private final int j;
@@ -18,6 +18,13 @@ public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
public PathfinderGoalGotoTarget(EntityCreature entitycreature, double d0, int i) {
this(entitycreature, d0, i, 1);
}
+ // Paper start - activation range improvements
+ @Override
+ public void onTaskReset() {
+ super.onTaskReset();
+ setTarget(BlockPosition.ZERO);
+ }
+ // Paper end
public PathfinderGoalGotoTarget(EntityCreature entitycreature, double d0, int i, int j) {
this.e = BlockPosition.ZERO;
@@ -100,6 +107,7 @@ public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
blockposition_mutableblockposition.g(blockposition).e(i1, k - 1, j1);
if (this.a.a((BlockPosition) blockposition_mutableblockposition) && this.a(this.a.world, blockposition_mutableblockposition)) {
this.e = blockposition_mutableblockposition;
+ setTarget(blockposition_mutableblockposition.immutableCopy()); // Paper
return true;
}
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index 44bb18c594..935136771e 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -24,10 +24,11 @@ public class PathfinderGoalSelector {
}
};
private final Map<PathfinderGoal.Type, PathfinderGoalWrapped> c = new EnumMap(PathfinderGoal.Type.class);
- private final Set<PathfinderGoalWrapped> d = Sets.newLinkedHashSet();
Properly check for running tasks in EAR
2020-01-27 00:35:34 +01:00
+ private final Set<PathfinderGoalWrapped> d = Sets.newLinkedHashSet();private Set<PathfinderGoalWrapped> getTasks() { return d; }// Paper - OBFHELPER
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
private final GameProfilerFiller e;
private final EnumSet<PathfinderGoal.Type> f = EnumSet.noneOf(PathfinderGoal.Type.class);
- private int g = 3;
+ private int g = 3;private int getTickRate() { return g; } // Paper - OBFHELPER
+ private int curRate;private int getCurRate() { return curRate; } private void incRate() { this.curRate++; } // Paper TODO
public PathfinderGoalSelector(GameProfilerFiller gameprofilerfiller) {
this.e = gameprofilerfiller;
Properly check for running tasks in EAR
2020-01-27 00:35:34 +01:00
@@ -37,6 +38,25 @@ public class PathfinderGoalSelector {
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
this.d.add(new PathfinderGoalWrapped(i, pathfindergoal));
}
+ // Paper start
+ public boolean inactiveTick() {
+ if (getCurRate() % getTickRate() != 0) {
+ incRate();
+ return false;
+ } else {
+ return true;
+ }
+ }
+ public boolean hasTasks() {
Properly check for running tasks in EAR
2020-01-27 00:35:34 +01:00
+ for (PathfinderGoalWrapped task : getTasks()) {
+ if (task.isRunning()) {
+ return true;
+ }
+ }
+ return false;
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
+ }
+ // Paper end
+
public void a(PathfinderGoal pathfindergoal) {
this.d.stream().filter((pathfindergoalwrapped) -> {
return pathfindergoalwrapped.j() == pathfindergoal;
Properly check for running tasks in EAR
2020-01-27 00:35:34 +01:00
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index 5a8c60ad90..29657fed75 100644
Properly check for running tasks in EAR
2020-01-27 00:35:34 +01:00
--- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
@@ -64,6 +64,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
return this.a.i();
}
+ public boolean isRunning() { return this.g(); } // Paper - OBFHELPER
public boolean g() {
return this.c;
}
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2
2020-04-12 02:39:21 +02:00
index 92601c581c..795817177a 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -3,11 +3,15 @@ package org.spigotmc;
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
import java.util.Collection;
import java.util.List;
import net.minecraft.server.AxisAlignedBB;
+import net.minecraft.server.BehaviorController;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+import net.minecraft.server.BlockPosition;
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
import net.minecraft.server.Chunk;
performance: Improve Activation Range entity iteration Faster Entity iteration using the chunks full entity list and array access. Faster chunk lookups skipping the cache, as the pattern of access was not suitable for cache usage (each request will likely blow cache) This reduces the cost of Entity Activation Range's initial marking.
2020-03-30 04:41:33 +02:00
+import net.minecraft.server.ChunkProviderServer; // Paper
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
import net.minecraft.server.Entity;
import net.minecraft.server.EntityAmbient;
performance: Improve Activation Range entity iteration Faster Entity iteration using the chunks full entity list and array access. Faster chunk lookups skipping the cache, as the pattern of access was not suitable for cache usage (each request will likely blow cache) This reduces the cost of Entity Activation Range's initial marking.
2020-03-30 04:41:33 +02:00
import net.minecraft.server.EntityAnimal;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
import net.minecraft.server.EntityArrow;
+import net.minecraft.server.EntityBee;
import net.minecraft.server.EntityComplexPart;
import net.minecraft.server.EntityCreature;
import net.minecraft.server.EntityCreeper;
@@ -16,10 +20,13 @@ import net.minecraft.server.EntityEnderDragon;
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
import net.minecraft.server.EntityFallingBlock; // Paper
import net.minecraft.server.EntityFireball;
import net.minecraft.server.EntityFireworks;
+import net.minecraft.server.EntityFlying;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityLightning;
import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntityMonster;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+import net.minecraft.server.EntityPillager;
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
+import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EntityProjectile;
import net.minecraft.server.EntityRaider;
import net.minecraft.server.EntitySheep;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -30,15 +37,22 @@ import net.minecraft.server.EntityThrownTrident;
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
import net.minecraft.server.EntityVillager;
import net.minecraft.server.EntityWither;
import net.minecraft.server.MathHelper;
+import net.minecraft.server.MemoryModuleType;
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.World;
import co.aikar.timings.MinecraftTimings;
+// Paper start
+import net.minecraft.server.EntityInsentient;
+import net.minecraft.server.EntityLlama;
+import net.minecraft.server.EntityWaterAnimal;
+// Paper end
public class ActivationRange
{
public enum ActivationType
{
+ WATER, // Paper
MONSTER,
ANIMAL,
RAIDER,
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -58,6 +72,7 @@ public class ActivationRange
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
*/
public static ActivationType initializeEntityActivationType(Entity entity)
{
+ if (entity instanceof EntityWaterAnimal) { return ActivationType.WATER; } // Paper
if ( entity instanceof EntityRaider )
{
return ActivationType.RAIDER;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -86,6 +101,7 @@ public class ActivationRange
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
|| ( entity.activationType == ActivationType.RAIDER && config.raiderActivationRange == 0 )
|| ( entity.activationType == ActivationType.ANIMAL && config.animalActivationRange == 0 )
|| ( entity.activationType == ActivationType.MONSTER && config.monsterActivationRange == 0 )
+ || ( entity.activationType == ActivationType.WATER && config.waterActivationRange == 0 ) // Paper
|| entity instanceof EntityHuman
|| entity instanceof EntityProjectile
|| entity instanceof EntityEnderDragon
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -118,6 +134,8 @@ public class ActivationRange
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
final int animalActivationRange = world.spigotConfig.animalActivationRange;
final int monsterActivationRange = world.spigotConfig.monsterActivationRange;
+ final int waterActivationRange = world.spigotConfig.waterActivationRange; // Paper
performance: Improve Activation Range entity iteration Faster Entity iteration using the chunks full entity list and array access. Faster chunk lookups skipping the cache, as the pattern of access was not suitable for cache usage (each request will likely blow cache) This reduces the cost of Entity Activation Range's initial marking.
2020-03-30 04:41:33 +02:00
+ final ChunkProviderServer chunkProvider = (ChunkProviderServer) world.getChunkProvider(); // Paper
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
int maxRange = Math.max( monsterActivationRange, animalActivationRange );
maxRange = Math.max( maxRange, raiderActivationRange );
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -133,6 +151,8 @@ public class ActivationRange
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
ActivationType.ANIMAL.boundingBox = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange );
ActivationType.MONSTER.boundingBox = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange );
+ ActivationType.WATER.boundingBox = player.getBoundingBox().grow( waterActivationRange, 256, waterActivationRange ); // Paper
+
int i = MathHelper.floor( maxBB.minX / 16.0D );
int j = MathHelper.floor( maxBB.maxX / 16.0D );
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -143,7 +163,7 @@ public class ActivationRange
performance: Improve Activation Range entity iteration Faster Entity iteration using the chunks full entity list and array access. Faster chunk lookups skipping the cache, as the pattern of access was not suitable for cache usage (each request will likely blow cache) This reduces the cost of Entity Activation Range's initial marking.
2020-03-30 04:41:33 +02:00
{
for ( int j1 = k; j1 <= l; ++j1 )
{
- Chunk chunk = (Chunk) world.getChunkIfLoadedImmediately( i1, j1 );
+ Chunk chunk = chunkProvider.getChunkAtIfLoadedMainThreadNoCache( i1, j1 ); // Paper
if ( chunk != null )
{
activateChunkEntities( chunk );
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -161,19 +181,15 @@ public class ActivationRange
performance: Improve Activation Range entity iteration Faster Entity iteration using the chunks full entity list and array access. Faster chunk lookups skipping the cache, as the pattern of access was not suitable for cache usage (each request will likely blow cache) This reduces the cost of Entity Activation Range's initial marking.
2020-03-30 04:41:33 +02:00
*/
private static void activateChunkEntities(Chunk chunk)
{
- for ( List<Entity> slice : chunk.entitySlices )
- {
- for ( Entity entity : (Collection<Entity>) slice )
+ // Paper start
+ Entity[] rawData = chunk.entities.getRawData();
+ for (int i = 0; i < chunk.entities.size(); i++) {
+ Entity entity = rawData[i];
+ //for ( Entity entity : (Collection<Entity>) slice )
+ // Paper end
{
- if ( MinecraftServer.currentTick > entity.activatedTick )
- {
- if ( entity.defaultActivationState )
- {
- entity.activatedTick = MinecraftServer.currentTick;
- continue;
- }
- if ( entity.activationType.boundingBox.c( entity.getBoundingBox() ) )
- {
+ if (MinecraftServer.currentTick > entity.activatedTick) {
+ if (entity.defaultActivationState || entity.activationType.boundingBox.c(entity.getBoundingBox())) { // Paper
entity.activatedTick = MinecraftServer.currentTick;
}
}
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -188,22 +204,22 @@ public class ActivationRange
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
* @param entity
* @return
*/
- public static boolean checkEntityImmunities(Entity entity)
+ public static int checkEntityImmunities(Entity entity) // Paper - return # of ticks to get immunity
{
// quick checks.
- if ( entity.inWater || entity.fireTicks > 0 )
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+ if ( (entity.activationType != ActivationType.WATER && entity.inWater && entity.pushedByWater()) || entity.fireTicks > 0 ) // Paper
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
{
- return true;
Restore accidently reverted item in water fix
2020-04-03 05:12:21 +02:00
+ return 100; // Paper
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
}
if ( !( entity instanceof EntityArrow ) )
{
- if ( !entity.onGround || !entity.passengers.isEmpty() || entity.isPassenger() )
+ if ( (!entity.onGround && !(entity instanceof EntityFlying)) || !entity.passengers.isEmpty() || entity.isPassenger() ) // Paper
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
{
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
- return true;
+ return 10; // Paper
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
}
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
} else if ( !( (EntityArrow) entity ).inGround )
{
- return true;
+ return 1; // Paper
}
// special cases.
if ( entity instanceof EntityLiving )
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -211,33 +227,63 @@ public class ActivationRange
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
EntityLiving living = (EntityLiving) entity;
if ( /*TODO: Missed mapping? living.attackTicks > 0 || */ living.hurtTicks > 0 || living.effects.size() > 0 )
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
{
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
- return true;
+ return 1; // Paper
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
}
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
- if ( entity instanceof EntityCreature && ( (EntityCreature) entity ).getGoalTarget() != null )
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+ if ( entity instanceof EntityInsentient && ((EntityInsentient) entity ).getGoalTarget() != null) // Paper
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
{
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
- return true;
+ return 20; // Paper
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+ }
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
+ // Paper start
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+ if (entity instanceof EntityBee) {
+ EntityBee bee = (EntityBee)entity;
+ BlockPosition movingTarget = bee.getMovingTarget();
+ if (bee.isAngry() ||
+ (bee.getHivePos() != null && bee.getHivePos().equals(movingTarget)) ||
+ (bee.getFlowerPos() != null && bee.getFlowerPos().equals(movingTarget))
+ ) {
+ return 20;
+ }
}
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).canBreed() )
{
- return true;
+ BehaviorController<EntityVillager> behaviorController = ((EntityVillager) entity).getBehaviorController();
+ if (behaviorController.hasMemory(MemoryModuleType.BREED_TARGET)) {
+ return 1;
+ }
+ // Paper end
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
}
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
+ // Paper start
+ if ( entity instanceof EntityLlama && ( (EntityLlama ) entity ).inCaravan() )
+ {
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
+ return 0;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+ }
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
+ // Paper end
if ( entity instanceof EntityAnimal )
{
EntityAnimal animal = (EntityAnimal) entity;
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
if ( animal.isBaby() || animal.isInLove() )
{
- return true;
+ return 1; // Paper
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
}
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
if ( entity instanceof EntitySheep && ( (EntitySheep) entity ).isSheared() )
{
- return true;
+ return 1; // Paper
}
}
if (entity instanceof EntityCreeper && ((EntityCreeper) entity).isIgnited()) { // isExplosive
- return true;
+ return 20; // Paper
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
+ }
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
+ // Paper start
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
+ if (entity instanceof EntityInsentient && ((EntityInsentient) entity).targetSelector.hasTasks() ) {
+ return 0;
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
}
+ if (entity instanceof EntityPillager) {
+ EntityPillager pillager = (EntityPillager) entity;
+ // TODO:?
performance: Improve Activation Range entity iteration Faster Entity iteration using the chunks full entity list and array access. Faster chunk lookups skipping the cache, as the pattern of access was not suitable for cache usage (each request will likely blow cache) This reduces the cost of Entity Activation Range's initial marking.
2020-03-30 04:41:33 +02:00
+ }
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
+ // Paper end
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
}
- return false;
+ return -1; // Paper
}
/**
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -254,6 +300,7 @@ public class ActivationRange
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
}
boolean isActive = entity.activatedTick >= MinecraftServer.currentTick || entity.defaultActivationState;
+ entity.isTemporarilyActive = false; // Paper
// Should this entity tick?
if ( !isActive )
Fix issues with Activation Range causing large chunk lookups. Where I blocked movement did not consider velocity buildup, which I assume then "unleashes" if something was really trying to push that entity, and moves it a very large distance. Additionally, this method was completely misnamed, as movementTick is more "doLotsOfTickThings", and ended up breaking AI too, which the whole point of temporary wake ups was to let AI run to trigger new immunity. Also fixed numerous behavioral rules for Immunity to improve vanilla gameplay, suchas bees that are angry or moving towards a flower or hive, any insentient that is targetting any enemy (Accidently made it any player), and included flying mobs such as phantoms by reducing the type check to insentient instead of Creature. Also improved inWater immunity to consider if the mob is movable by water or not.
2020-04-02 07:25:36 +02:00
@@ -261,15 +308,19 @@ public class ActivationRange
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
if ( ( MinecraftServer.currentTick - entity.activatedTick - 1 ) % 20 == 0 )
{
// Check immunities every 20 ticks.
- if ( 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;
+
}
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
// Add a little performance juice to active entities. Skip 1/4 if not immune.
- } else if ( !entity.defaultActivationState && entity.ticksLived % 4 == 0 && !checkEntityImmunities( entity ) )
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
+ } else if ( !entity.defaultActivationState && entity.ticksLived % 4 == 0 && checkEntityImmunities( entity) < 0 ) // Paper
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
{
isActive = false;
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2
2020-04-12 02:39:21 +02:00
index 5e932a5d97..1b42ba94c0 100644
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -180,6 +180,7 @@ public class SpigotWorldConfig
public int monsterActivationRange = 32;
public int raiderActivationRange = 48;
public int miscActivationRange = 16;
+ public int waterActivationRange = 16; // Paper
public boolean tickInactiveVillagers = true;
private void activationRange()
{
@@ -187,6 +188,7 @@ public class SpigotWorldConfig
monsterActivationRange = getInt( "entity-activation-range.monsters", monsterActivationRange );
raiderActivationRange = getInt( "entity-activation-range.raiders", raiderActivationRange );
miscActivationRange = getInt( "entity-activation-range.misc", miscActivationRange );
+ waterActivationRange = getInt( "entity-activation-range.water", waterActivationRange ); // Paper
tickInactiveVillagers = getBoolean( "entity-activation-range.tick-inactive-villagers", tickInactiveVillagers );
log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers );
}
--
Drop Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch This patch appears to be no longer relevant, and is seemingly a leading cause of datapack performance being horrific
2020-03-15 21:03:36 +01:00
2.25.1
Port activation range improvement patch (#2763)
2020-01-20 16:54:57 +01:00
In neuem Issue referenzieren Permalink kopieren