Koloss blade will respect strength

legobmw99 · May 28, 2021 · ae6f96e · ae6f96e
1 parent a8ed30b
commit ae6f96e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/com/legobmw99/allomancy/api/IAllomancyData.java b/src/main/java/com/legobmw99/allomancy/api/IAllomancyData.java
@@ -15,7 +15,7 @@ public interface IAllomancyData {
      *
      * @param player the player being checked
      */
-    void updateMetalBurnTime(ServerPlayerEntity player);
+    void tickBurning(ServerPlayerEntity player);
 
     /**
      * Get if the player has the supplied power

diff --git a/src/main/java/com/legobmw99/allomancy/modules/combat/item/KolossBladeItem.java b/src/main/java/com/legobmw99/allomancy/modules/combat/item/KolossBladeItem.java
@@ -30,13 +30,11 @@ public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int i
             PlayerEntity player = (PlayerEntity) entityIn;
 
             if (isSelected && (player.getOffhandItem() != stack)) {
-                player.getCapability(AllomancyCapability.PLAYER_CAP).ifPresent(data -> {
-                    if (!data.isBurning(Metal.PEWTER)) {
-                        player.addEffect(new EffectInstance(Effects.DIG_SLOWDOWN, 10, 10, true, false));
-                        player.addEffect(new EffectInstance(Effects.WEAKNESS, 10, 10, true, false));
-                        player.addEffect(new EffectInstance(Effects.MOVEMENT_SLOWDOWN, 10, 0, true, false));
-                    }
-                });
+                if (!player.hasEffect(Effects.DAMAGE_BOOST) && !player.getCapability(AllomancyCapability.PLAYER_CAP).filter(data -> data.isBurning(Metal.PEWTER)).isPresent()) {
+                    player.addEffect(new EffectInstance(Effects.DIG_SLOWDOWN, 10, 10, true, false));
+                    player.addEffect(new EffectInstance(Effects.WEAKNESS, 10, 10, true, false));
+                    player.addEffect(new EffectInstance(Effects.MOVEMENT_SLOWDOWN, 10, 0, true, false));
+                }
             }
         }
     }

diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java b/src/main/java/com/legobmw99/allomancy/modules/powers/CommonEventHandler.java
@@ -227,7 +227,7 @@ public static void onWorldTick(final TickEvent.WorldTickEvent event) {
                         // Run the necessary updates on the player's metals
                         // Ran AFTER duralumin and aluminum to make sure they function correctly
                         if (curPlayer instanceof ServerPlayerEntity) {
-                            data.updateMetalBurnTime((ServerPlayerEntity) curPlayer);
+                            data.tickBurning((ServerPlayerEntity) curPlayer);
                         }
 
 

diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/data/DefaultAllomancyData.java b/src/main/java/com/legobmw99/allomancy/modules/powers/data/DefaultAllomancyData.java
@@ -48,7 +48,7 @@ public DefaultAllomancyData() {
     }
 
 
-    public void updateMetalBurnTime(ServerPlayerEntity player) {
+    public void tickBurning(ServerPlayerEntity player) {
         for (Metal metal : Metal.values()) {
             if (this.isBurning(metal)) {
                 if (!this.hasPower(metal)) {