chmodsayshello
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge beacon-branch into fork beacon branch #7

Merged
chmodsayshello merged 453 commits from VoxeLibre/VoxeLibre:beacons into beacon-"fork" 2022-07-23 11:30:49 +02:00
Conversation 0 Commits 453 Files Changed 366 +8 -8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44abef44e1 - Show all commits

6
mods/ENTITIES/mobs_mc/cod.lua
View File

@ -101,9 +101,9 @@ local cod = {
end,
on_rightclick = function(self, clicker)
if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
--self.object:remove()
--clicker:set_wielded_item("mcl_fishing:bucket_cod")
--awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
self.object:remove()
clicker:set_wielded_item("mcl_fishing:bucket_cod")
awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
end
end
}

6
mods/ENTITIES/mobs_mc/salmon.lua
View File

@ -58,9 +58,9 @@ local salmon = {
fear_height = 4,
on_rightclick = function(self, clicker)
if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
--self.object:remove()
--clicker:set_wielded_item("mcl_fishing:bucket_salmon")
--awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
self.object:remove()
clicker:set_wielded_item("mcl_fishing:bucket_salmon")
awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
end
end
}

4
mods/ITEMS/mcl_fishing/init.lua
View File

@ -529,10 +529,10 @@ for _, fish in pairs(fish_names) do
mcl_buckets.register_liquid({
bucketname = "mcl_fishing:bucket_" .. fish.techname,
source_place = function(pos)
minetest.add_entity(pos, "extra_mobs:" .. fish.techname)
minetest.add_entity(pos, "mobs_mc:" .. fish.techname)
return "mcl_core:water_source"
end,
source_take = {"extra_mobs:" .. fish.techname},
source_take = {"mobs_mc:" .. fish.techname},
inventory_image = fish.techname .. "_bucket.png",
name = S("Bucket of @1", S(fish.name)),
longdesc = S("This bucket is filled with water and @1.", S(fish.name)),