Added God Stick, Fixed Luckyblock Proetection

diff --git a/modules.txt b/modules.txt
index 1ec42b8e3520f39a588f2df931a7d25ca79c1289..ebcf94d3c9f1fb9e5bf54f6c4989d6825194bf09 100644 (file)
--- a/modules.txt
+++ b/modules.txt
@@ -1 +1 @@
-return {common={"common","random","request","schems",},main={"alpha","commands","flower_spread","join_skyblock_mob","lobby","lucky_block","mapgen","money","netherrack_fix","plots","ranks","spawns","tpa","trade","wither_spawn",},onload={"lava_cooling","lobby_grass","monster_egg_stone_block","nether_portal","sapling_mutation","shop","spawn","void",},}
\ No newline at end of file
+return {common={"common","random","request","schems",},main={"alpha","commands","flower_spread","god_stick","join_skyblock_mob","lobby","lucky_block","mapgen","money","netherrack_fix","plots","ranks","spawns","tpa","trade","wither_spawn",},onload={"lava_cooling","lobby_grass","monster_egg_stone_block","nether_portal","sapling_mutation","shop","spawn","void",},}
\ No newline at end of file

diff --git a/src/main/god_stick.lua b/src/main/god_stick.lua
new file mode 100644 (file)
index 0000000..00d2542
--- /dev/null
+++ b/src/main/god_stick.lua
@@ -0,0 +1,28 @@
+local groupcaps = {times = {0, 0, 0}, uses = 0, maxlevel = 3},
+
+minetest.register_tool("skycraft:god_stick", {
+    description = "God Stick",
+    inventory_image = "mcl_mobitems_blaze_rod.png",
+    range = 100,
+    tool_capabilities = {
+        max_drop_level = 1,
+        groupcaps= {
+            not_in_creative_inventory = groupcaps,
+            oddly_breakable_by_hand = groupcaps,
+            pickaxey = groupcaps,
+            axey = groupcaps,
+            shovely = groupcaps,
+            fleshy = groupcaps,
+        },
+        damage_groups = {fleshy = 1000},
+    }
+})
+
+minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
+       if hitter:get_wielded_item():get_name() == "skycraft:god_stick" then
+               lightning.strike(player:get_pos())
+               minetest.ban_player(player:get_player_name())
+               return true
+       end
+end)
+

diff --git a/src/main/lucky_block.lua b/src/main/lucky_block.lua
index 6eb153778dcd4452f29bf43e40ec097308fc5d2d..a372b8e956da5f10dffbc60eea85a2248bdc22a1 100644 (file)
--- a/src/main/lucky_block.lua
+++ b/src/main/lucky_block.lua
@@ -1,7 +1,12 @@
+local old_on_dig = minetest.registered_nodes["lucky_block:lucky_block"].on_dig
+
 minetest.override_item("lucky_block:lucky_block", {
        tiles = {"skycraft_lucky_block.png"},
        inventory_image = minetest.inventorycube("skycraft_lucky_block.png"),
        light_source = nil,
+       on_dig = function(pos, node, digger)
+               if not minetest.is_protected(pos, digger) then old_on_dig(pos, node, digger) end
+       end
 })
 
 minetest.override_item("lucky_block:void_mirror", {
@@ -21,3 +26,4 @@ lucky_block:add_blocks({
        {"dro", {"mcl_core:dirt", "mcl_core:sand", "mcl_core:gravel"}, 100},
        {"dro", discs, 1}
 })
+