mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
papermc/Spigot-Server-Patches/0161-Activation-Range-Improvements.patch

282 lines
14 KiB
Diff
Raw Normal View History

Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
From 5c8d5740834de57a88322d4bdb1a0fb33831dc29 Mon Sep 17 00:00:00 2001
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
From: Aikar <aikar@aikar.co>
Date: Tue, 27 Dec 2016 22:38:06 -0500
Subject: [PATCH] Activation Range Improvements
Fixes and adds new Immunities to improve gameplay behavior
Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
Adds water Mobs to activation range config and nerfs fish
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index f4ed98d2d9..1dfd71df0a 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -326,6 +326,7 @@ public class BlockPosition extends BaseBlockPosition {
this.c = i;
}
+ public BlockPosition toBlockPosition() { return h(); } // Paper - OBFHELPER
public BlockPosition h() {
return new BlockPosition(this);
}
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
index a5c147b989..9e88897a07 100644
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
--- a/src/main/java/net/minecraft/server/EntityCreature.java
+++ b/src/main/java/net/minecraft/server/EntityCreature.java
[CI-SKIP] Re-add getBukkitEntity methods to child classes Helps with development to not need to cast as much... No clue why upstream makes some of the decisions they do....
2018-08-04 21:03:53 +00:00
@@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
public abstract class EntityCreature extends EntityInsentient {
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
+ public BlockPosition movingTarget = null; public BlockPosition getMovingTarget() { return movingTarget; } // Paper
private BlockPosition a;
private float b;
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
Updated Upstream (Bukkit/CraftBukkit) 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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
2018-09-28 23:31:59 +00:00
index 4fe91b5a2f..91f831326c 100644
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
update B/CB/S
2018-07-20 19:57:43 +00:00
@@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity {
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
public float aT;
public float aU;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
public EntityHuman killer;
- protected int lastDamageByPlayerTime;
+ public int lastDamageByPlayerTime; // Paper - public
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
protected boolean aX;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
protected int ticksFarFromPlayer;
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
protected float aZ;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
index b661a86901..26184f463a 100644
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
@@ -340,6 +340,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
return this.bR != null;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
}
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
2018-08-26 18:11:49 +00:00
+ public boolean inCaravan() { return this.em(); } // Paper - OBFHELPER
public boolean em() {
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
return this.bQ != null;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
index acc099e955..339c78eec9 100644
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
--- a/src/main/java/net/minecraft/server/PathfinderGoal.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
@@ -20,7 +20,9 @@ public abstract class PathfinderGoal {
}
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
public void d() {
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
+ onTaskReset(); // Paper
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
}
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
+ public void onTaskReset() {} // Paper
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
public void e() {
}
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
index 9a75cb63ba..cf10605aaa 100644
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
--- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
@@ -1,12 +1,12 @@
package net.minecraft.server;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
- private final EntityCreature f;
+ private final EntityCreature f; public EntityCreature getEntity() { return f; } // Paper - OBFHELPER
public double a;
protected int b;
protected int c;
private int g;
- protected BlockPosition d;
+ protected BlockPosition d; public BlockPosition getTarget() { return d; } public void setTarget(BlockPosition pos) { this.d = pos; getEntity().movingTarget = pos != BlockPosition.ZERO ? pos : null; } // Paper - OBFHELPER
private boolean h;
private final int i;
private final int j;
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
@@ -15,6 +15,13 @@ public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
public PathfinderGoalGotoTarget(EntityCreature entitycreature, double d0, int ix) {
this(entitycreature, d0, ix, 1);
}
NOT WORKING! Even even more patches!
2018-07-17 20:32:05 +00:00
+ // Paper start - activation range improvements
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
+ @Override
+ public void onTaskReset() {
+ super.onTaskReset();
+ setTarget(BlockPosition.ZERO);
+ }
+ // Paper end
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
public PathfinderGoalGotoTarget(EntityCreature entitycreature, double d0, int ix, int jx) {
this.d = BlockPosition.ZERO;
@@ -93,6 +100,7 @@ public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
blockposition$mutableblockposition.g(blockposition).d(i1, k - 1, j1);
if (this.f.f(blockposition$mutableblockposition) && this.a(this.f.world, blockposition$mutableblockposition)) {
this.d = blockposition$mutableblockposition;
+ setTarget(blockposition$mutableblockposition.toBlockPosition()); // Paper
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
return true;
}
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
index f9bb19fed6..d176008f44 100644
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
@@ -13,13 +13,16 @@ import net.minecraft.server.EntityArrow;
import net.minecraft.server.EntityComplexPart;
import net.minecraft.server.EntityCreature;
import net.minecraft.server.EntityCreeper;
+import net.minecraft.server.EntityDrowned;
import net.minecraft.server.EntityEnderCrystal;
import net.minecraft.server.EntityEnderDragon;
import net.minecraft.server.EntityFallingBlock;
import net.minecraft.server.EntityFireball;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
import net.minecraft.server.EntityFireworks;
Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
+import net.minecraft.server.EntityFish;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityLiving;
+import net.minecraft.server.EntityLlama;
import net.minecraft.server.EntityMonster;
import net.minecraft.server.EntityProjectile;
import net.minecraft.server.EntitySheep;
Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
@@ -27,6 +30,7 @@ import net.minecraft.server.EntitySlime;
import net.minecraft.server.EntityTNTPrimed;
import net.minecraft.server.EntityThrownTrident;
import net.minecraft.server.EntityVillager;
+import net.minecraft.server.EntityWaterAnimal;
import net.minecraft.server.EntityWeather;
import net.minecraft.server.EntityWither;
import net.minecraft.server.MCUtil;
@@ -40,6 +44,7 @@ public class ActivationRange
static AxisAlignedBB maxBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
static AxisAlignedBB miscBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
static AxisAlignedBB animalBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
+ static AxisAlignedBB waterBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 ); // Paper
static AxisAlignedBB monsterBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
/**
@@ -51,6 +56,7 @@ public class ActivationRange
*/
public static byte initializeEntityActivationType(Entity entity)
{
+ if (entity instanceof EntityWaterAnimal) { return 4; } // Paper
if ( entity instanceof EntityMonster || entity instanceof EntitySlime )
{
return 1; // Monster
@@ -75,6 +81,7 @@ public class ActivationRange
if ( ( entity.activationType == 3 && config.miscActivationRange == 0 )
|| ( entity.activationType == 2 && config.animalActivationRange == 0 )
|| ( entity.activationType == 1 && config.monsterActivationRange == 0 )
+ || ( entity.activationType == 4 && config.waterActivationRange == 0 ) // Paper
|| entity instanceof EntityHuman
|| entity instanceof EntityProjectile
|| entity instanceof EntityEnderDragon
@@ -106,6 +113,7 @@ public class ActivationRange
final int miscActivationRange = world.spigotConfig.miscActivationRange;
final int animalActivationRange = world.spigotConfig.animalActivationRange;
final int monsterActivationRange = world.spigotConfig.monsterActivationRange;
+ final int waterActivationRange = world.spigotConfig.waterActivationRange; // Paper
int maxRange = Math.max( monsterActivationRange, animalActivationRange );
maxRange = Math.max( maxRange, miscActivationRange );
@@ -119,6 +127,7 @@ public class ActivationRange
maxBB = player.getBoundingBox().grow( playerMaxRange, 256, playerMaxRange ); // Paper - Use player view distance API
miscBB = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
animalBB = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange );
+ waterBB = player.getBoundingBox().grow( waterActivationRange, 256, waterActivationRange ); // Paper
monsterBB = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange );
int i = MathHelper.floor( maxBB.a / 16.0D );
@@ -172,6 +181,14 @@ public class ActivationRange
entity.activatedTick = MinecraftServer.currentTick;
}
break;
+ // Paper start
+ case 4:
+ if ( waterBB.c( entity.getBoundingBox() ) )
+ {
+ entity.activatedTick = MinecraftServer.currentTick;
+ }
+ break;
+ // Paper end
case 3:
default:
if ( miscBB.c( entity.getBoundingBox() ) )
@@ -193,8 +210,13 @@ public class ActivationRange
*/
public static boolean checkEntityImmunities(Entity entity)
{
+ // Paper start - optimize Water cases
+ if (entity instanceof EntityFish) {
+ return false;
+ }
// quick checks.
- if ( entity.inWater || entity.fireTicks > 0 )
+ if ( (entity.inWater && (!(entity instanceof EntityWaterAnimal || entity instanceof EntityDrowned))) || entity.fireTicks > 0 )
+ // Paper end
{
return true;
}
@@ -212,18 +234,29 @@ public class ActivationRange
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
if ( entity instanceof EntityLiving )
{
EntityLiving living = (EntityLiving) entity;
- if ( /*TODO: Missed mapping? living.attackTicks > 0 || */ living.hurtTicks > 0 || living.effects.size() > 0 )
+ if ( living.lastDamageByPlayerTime > 0 || living.hurtTicks > 0 || living.effects.size() > 0 ) // Paper
{
return true;
}
- if ( entity instanceof EntityCreature && ( (EntityCreature) entity ).getGoalTarget() != null )
+ if ( entity instanceof EntityCreature )
Update Paper to MC 1.12
2017-06-08 14:16:51 +00:00
{
- return true;
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
+ // Paper start
+ EntityCreature creature = (EntityCreature) entity;
+ if (creature.getGoalTarget() != null || creature.getMovingTarget() != null) {
+ return true;
+ }
+ // Paper end
Update Paper to MC 1.12
2017-06-08 14:16:51 +00:00
}
if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).isInLove() )
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
{
return true;
}
+ // Paper start
+ if ( entity instanceof EntityLlama && ( (EntityLlama ) entity ).inCaravan() )
Update Paper to MC 1.12
2017-06-08 14:16:51 +00:00
+ {
+ return true;
+ }
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
+ // Paper end
if ( entity instanceof EntityAnimal )
{
EntityAnimal animal = (EntityAnimal) entity;
Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
@@ -276,10 +309,10 @@ public class ActivationRange
Multitude of changes to attempt to fix #1199
2018-07-12 20:42:56 +00:00
{
isActive = false;
}
- int x = MathHelper.floor( entity.locX );
- int z = MathHelper.floor( entity.locZ );
+ //int x = MathHelper.floor( entity.locX ); // Paper
+ //int z = MathHelper.floor( entity.locZ ); // Paper
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
// Make sure not on edge of unloaded chunk
- Chunk chunk = entity.world.getChunkIfLoaded( x >> 4, z >> 4 );
Multitude of changes to attempt to fix #1199
2018-07-12 20:42:56 +00:00
+ Chunk chunk = entity.getChunkAtLocation(); // Paper
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
if ( isActive && !( chunk != null && chunk.areNeighborsLoaded( 1 ) ) )
{
isActive = false;
Fix lag caused by water mobs across the board - Fixes #1462 This update introduces Entity Activation Range for water mobs. Activation Range has been one of my biggest performance improvements I ever added to Minecraft, however "Entity is in Water" is an immunity case that keeps an entity active. This update ignores the water check for known water based mobs, allowing them to actually go inactive. In addition to that, a new config option was added to spigot.yml to go with the rest of the entity-activation-range options to let you configure aquatic mobs like fish, squid and dolphins separately. This should overall fix all lag caused by water mobs.
2018-10-04 05:21:02 +00:00
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 87bc8e2d9c..06d84a0b66 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -144,12 +144,14 @@ public class SpigotWorldConfig
public int animalActivationRange = 32;
public int monsterActivationRange = 32;
public int miscActivationRange = 16;
+ public int waterActivationRange = 16; // Paper
public boolean tickInactiveVillagers = true;
private void activationRange()
{
animalActivationRange = getInt( "entity-activation-range.animals", animalActivationRange );
monsterActivationRange = getInt( "entity-activation-range.monsters", monsterActivationRange );
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 + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers );
}
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
--
Updated Upstream (Bukkit/CraftBukkit) 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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
2018-09-28 23:31:59 +00:00
2.19.0
Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior
2016-12-28 05:19:58 +00:00
Reference in a new issue Copy permalink