Ver código fonte

Actually fixed BlockCracker + One more type of block can be cracked

nossr50 5 anos atrás
pai
commit
e6c9cc6fdd

+ 2 - 0
Changelog.txt

@@ -1,5 +1,7 @@
 Version 2.1.110
     Fixed a dupe bug
+    Actually fixed Block Cracker
+    You can now crack Infested Stone Bricks with Block Cracker
     Added Lithuanian locale (thanks Vyciokazz)
 
 Version 2.1.109

+ 2 - 1
src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.listeners;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
 import com.gmail.nossr50.config.WorldBlacklist;
@@ -588,7 +589,7 @@ public class BlockListener implements Listener {
                 blockState.update(true);
             }
         }
-        else if (mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK) && heldItem.getType() == Material.AIR) {
+        else if (mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK) && (heldItem.getType() == Material.AIR || Config.getInstance().getUnarmedItemsAsUnarmed())) {
             if (mcMMOPlayer.getUnarmedManager().canUseBlockCracker() && BlockUtils.affectedByBlockCracker(blockState)) {
                 if (EventUtils.simulateBlockBreak(block, player, true) && mcMMOPlayer.getUnarmedManager().blockCrackerCheck(blockState)) {
                     blockState.update();

+ 8 - 1
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java

@@ -92,7 +92,14 @@ public class UnarmedManager extends SkillManager {
                     return false;
                 }
 
-                blockState.setType(Material.CRACKED_STONE_BRICKS);
+                blockState.getBlock().setType(Material.CRACKED_STONE_BRICKS);
+                return true;
+            case INFESTED_STONE_BRICKS:
+                if (!Unarmed.blockCrackerSmoothBrick) {
+                    return false;
+                }
+
+                blockState.getBlock().setType(Material.INFESTED_CRACKED_STONE_BRICKS);
                 return true;
 
             default: