From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: peaches94 Date: Sun, 10 Jul 2022 15:44:38 -0500 Subject: [PATCH] Petal: Reduce sensor work Original license: GPL v3 Original project: https://github.com/Bloom-host/Petal this patch is focused around the sensors used for ai delete the line of sight cache less often and use a faster nearby comparison diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index a947acfee2d45ba29e293b196250d52af874bcc6..1467773e42a6c85121e96c492c01abe73d7b257e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1006,12 +1006,14 @@ public abstract class LivingEntity extends Entity implements Attackable { } if (entity != null) { - ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD); + // petal start - only do itemstack lookup if we need to + //ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD); EntityType entitytypes = entity.getType(); - if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.PIGLIN && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.PIGLIN_BRUTE && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) { + if (entitytypes == EntityType.SKELETON && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.PIGLIN && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.PIGLIN_HEAD) || entitytypes == EntityType.PIGLIN_BRUTE && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.PIGLIN_HEAD) || entitytypes == EntityType.CREEPER && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.CREEPER_HEAD)) { d0 *= 0.5D; } + // petal end } return d0; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java index f2eca869a9301c8e6536396f55fd5dc871a3dfbc..9a3551cf7977ef59b499871bd31bd20d33679d3a 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -896,8 +896,8 @@ public abstract class Mob extends LivingEntity implements Targeting { return; } // Paper end - this.sensing.tick(); - int i = this.level.getServer().getTickCount() + this.getId(); + int i = this.level.getServer().getTickCount() + this.getId(); // petal - move up + if (i % 10 == 0) this.sensing.tick(); // petal - only refresh line of sight cache every half second if (i % 2 != 0 && this.tickCount > 1) { this.targetSelector.tickRunningGoals(false);