mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-20 07:19:23 +00:00
361a0e5785
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@70a76c4 Updated Upstream (Paper) PurpurMC/Purpur@770fbe6 clean up damage type code for stonecutter and scissor patches
38 lines
2.4 KiB
Diff
38 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Sat, 10 Jun 2023 19:43:52 +0300
|
|
Subject: [PATCH] Reduce sensor work
|
|
|
|
Original project: Bloom-host/Petal
|
|
Link: https://github.com/Bloom-host/Petal
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index cc490788b18209d27b339a8557084049002cff09..34e80ae2a8cb4d2cebb7b5a739917aa19e8e1ca0 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -1038,20 +1038,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
|
|
if (entity != null) {
|
|
- 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)) { // DivineMC - Reduce sensor work
|
|
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)) { // DivineMC - Reduce sensor work
|
|
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)) { // DivineMC - Reduce sensor work
|
|
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)) { // DivineMC - Reduce sensor work
|
|
d0 *= entity.level().purpurConfig.piglinHeadVisibilityPercent;
|
|
}
|
|
// Purpur end
|