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 b65a3a09e96a7656d6372ecf5d7ba73e877121ec..4425e7a6ddd34c6b1ee841ff9b15050a770f5fc6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1037,22 +1037,24 @@ 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(); // Purpur start - if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL)) { + if (entitytypes == EntityType.SKELETON && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.SKELETON_SKULL)) { d0 *= entity.level().purpurConfig.skeletonHeadVisibilityPercent; } - else if (entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD)) { + else if (entitytypes == EntityType.ZOMBIE && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.ZOMBIE_HEAD)) { d0 *= entity.level().purpurConfig.zombieHeadVisibilityPercent; } - else if (entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) { + else if (entitytypes == EntityType.CREEPER && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.CREEPER_HEAD)) { d0 *= entity.level().purpurConfig.creeperHeadVisibilityPercent; } - else if ((entitytypes == EntityType.PIGLIN || entitytypes == EntityType.PIGLIN_BRUTE) && itemstack.is(Items.PIGLIN_HEAD)) { + else if ((entitytypes == EntityType.PIGLIN || entitytypes == EntityType.PIGLIN_BRUTE) && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.PIGLIN_HEAD)) { d0 *= entity.level().purpurConfig.piglinHeadVisibilityPercent; } + // petal end // Purpur end // Purpur start diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java index 29fc0a756c4541bb5292c74edef983c4fad373f1..c675af50ca8ca221982355c87603df3f4da02513 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -931,8 +931,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) { if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking