diff --git a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java index 35bd2ca..278218f 100644 --- a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java +++ b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java @@ -78,7 +78,7 @@ public class PickupHandler { if(!ListHandler.isPermitted(state.getBlock())) return false; - if(state.getDestroySpeed(level, pos) == -1 && !player.isCreative()) + if(state.getDestroySpeed(level, pos) == -1 && !player.isCreative() && !Constants.COMMON_CONFIG.settings.pickupUnbreakableBlocks) return false; if(blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks) diff --git a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java index e48c493..711ce00 100644 --- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java +++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java @@ -163,12 +163,18 @@ public class CarryConfig "minecraft:oak_trapdoor[half]", }; - @Property( - type = PropertyType.BOOLEAN, - description = "Whether Players can be picked up. Creative players can't be picked up in Survival Mode" - ) - public boolean pickupPlayers = true; - } + @Property( + type = PropertyType.BOOLEAN, + description = "Whether Players can be picked up. Creative players can't be picked up in Survival Mode" + ) + public boolean pickupPlayers = true; + + @Property( + type = PropertyType.BOOLEAN, + description = "Whether players in Survival Mode can pick up unbreakable blocks. Creative players always can." + ) + public boolean pickupUnbreakableBlocks = false; + } @Property( type = PropertyType.CATEGORY, @@ -252,7 +258,7 @@ public class CarryConfig "minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*", - "securitycraft:*", "taterzens:npc" + "securitycraft:*", "taterzens:npc", "easy_npc:*" }; @Property(