From 6158272f4a25cac3a444ac17c57fbf4c76e13254 Mon Sep 17 00:00:00 2001 From: Cassian Godsted Date: Thu, 6 Feb 2025 12:15:04 -0500 Subject: [PATCH] Alternate fix Checking to see if the block is Frosted Ice is failing, possibly due to the event happening before the block is placed. --- .../equipment/extendoGrip/ExtendoGripItem.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java index ccb51a17bd..d142a90340 100644 --- a/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java @@ -31,7 +31,9 @@ import net.minecraft.world.entity.projectile.ProjectileUtil; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.item.enchantment.FrostWalkerEnchantment; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; @@ -49,6 +51,7 @@ import net.minecraftforge.event.entity.living.LivingKnockBackEvent; import net.minecraftforge.event.entity.player.AttackEntityEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.event.level.BlockEvent.BreakEvent; import net.minecraftforge.event.level.BlockEvent.EntityPlaceEvent; import net.minecraftforge.eventbus.api.EventPriority; @@ -187,16 +190,8 @@ public class ExtendoGripItem extends Item { public static void consumeDurabilityOnPlace(EntityPlaceEvent event) { Entity entity = event.getEntity(); if (entity instanceof Player player) { - if (event.getPlacedBlock().is(Blocks.FROSTED_ICE)) { - for (ItemStack armorSlot : player.getArmorSlots()) { - for (Enchantment enchantment : armorSlot.getAllEnchantments().keySet()) { - if (!enchantment.equals(Enchantments.FROST_WALKER)) { - findAndDamageExtendoGrip(player); - } - } - } - } - else findAndDamageExtendoGrip(player); + if (!event.getBlockSnapshot().getReplacedBlock().is(Blocks.WATER) && !event.getBlockSnapshot().getCurrentBlock().is(Blocks.WATER)) + findAndDamageExtendoGrip(player); } }