Compare commits

...

2 Commits

Author SHA1 Message Date
JoseDouglas26 d3b481948d Updated set_fire and placement checks 2024-06-16 18:32:36 +02:00
Mikita Wiśniewski 6654c86fb2 Update issue and PR templates (#4440)
Reviewed-on: VoxeLibre/VoxeLibre#4440
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-committed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
2024-06-16 18:00:16 +02:00
7 changed files with 21 additions and 45 deletions

View File

@ -13,16 +13,17 @@ labels:
Thanks for taking the time to fill out this bug report! Thanks for taking the time to fill out this bug report!
Please follow our contributing guidelines first: Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests https://git.minetest.land/VoxeLibre/VoxeLibre/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
By submitting this issue, you agree to follow our Code of Conduct: By submitting this issue, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md https://git.minetest.land/VoxeLibre/VoxeLibre/src/branch/master/CODE_OF_CONDUCT.md
--> -->
<!-- <!--
What version of VoxeLibre are you using? We do not provide support for outdated versions of VoxeLibre. What version of VoxeLibre are you using? We do not provide support for outdated versions of VoxeLibre.
"/ver" command will output the version you're running.
Current latest version is listed here, at the top: Current latest version is listed here, at the top:
https://git.minetest.land/MineClone2/MineClone2/tags https://git.minetest.land/VoxeLibre/VoxeLibre/tags
--> -->
VoxeLibre version: VoxeLibre version:

View File

@ -1,7 +1,7 @@
--- ---
name: "Feature request" name: "Feature request"
about: "File a feature request not in Minecraft" about: "File a feature request"
labels: labels:
- "non-Minecraft feature" - "non-Minecraft feature"
@ -10,17 +10,17 @@ labels:
--- ---
<!-- <!--
Got a new non-Minecraft feature request? Explain to us why we should consider your idea. Got a new feature request? Explain to us why we should consider your idea.
Please follow our contributing guidelines first: Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests https://git.minetest.land/VoxeLibre/VoxeLibre/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
By submitting this issue, you agree to follow our Code of Conduct: By submitting this issue, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md https://git.minetest.land/VoxeLibre/VoxeLibre/src/branch/master/CODE_OF_CONDUCT.md
--> -->
### Feature ### Feature
Tell us about your requested feature not in Minecraft! Tell us about your requested feature!
### Why ### Why
Tell us why should we implement it! Tell us why should we implement it!

View File

@ -1,25 +0,0 @@
---
name: "Missing Feature request"
about: "File a missing feature request in Minecraft but not in MineClone2"
labels:
- "missing feature"
---
<!--
Thanks for taking the time to fill out this missing feature request!
Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
By submitting this issue, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
-->
### Current feature in Minecraft
Tell us about the feature currently in Minecraft! What is it like on Minecraft?
### Current feature in VoxeLibre
Tell us about the feature currently in VoxeLibre! What is different?

View File

@ -8,13 +8,13 @@ labels:
<!-- <!--
Please follow our contributing guidelines first: Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#how-you-can-help-as-a-programmer https://git.minetest.land/VoxeLibre/VoxeLibre/src/branch/master/CONTRIBUTING.md#how-you-can-help-as-a-programmer
By submitting this pull request, you agree to follow our Code of Conduct: By submitting this pull request, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md https://git.minetest.land/VoxeLibre/VoxeLibre/src/branch/master/CODE_OF_CONDUCT.md
--> -->
Tell us about your pull request! Reference related issues, if necessary Tell us about your pull request! Reference related issues, if necessary.
### Testing ### Testing
Tell us how to test your changes! Tell us how to test your changes!

View File

@ -27,18 +27,19 @@ minetest.register_craftitem("mcl_fire:fire_charge", {
end end
-- Ignite/light fire -- Ignite/light fire
local used = nil
local node = get_node(pointed_thing.under) local node = get_node(pointed_thing.under)
if pointed_thing.type == "node" then if pointed_thing.type == "node" then
local nodedef = minetest.registered_nodes[node.name] local nodedef = minetest.registered_nodes[node.name]
if nodedef and nodedef._on_ignite then if nodedef and nodedef._on_ignite then
local overwrite = nodedef._on_ignite(user, pointed_thing) local overwrite = nodedef._on_ignite(user, pointed_thing)
if not overwrite then if not overwrite then
mcl_fire.set_fire(pointed_thing, user, false) used = mcl_fire.set_fire(pointed_thing, user, false)
end end
else else
mcl_fire.set_fire(pointed_thing, user, false) used = mcl_fire.set_fire(pointed_thing, user, false)
end end
if not minetest.is_creative_enabled(user:get_player_name()) then if not minetest.is_creative_enabled(user:get_player_name()) and used then
itemstack:take_item() itemstack:take_item()
end end
end end

View File

@ -31,23 +31,22 @@ minetest.register_tool("mcl_fire:flint_and_steel", {
{pos = pointed_thing.above, gain = 0.5, max_hear_distance = 8}, {pos = pointed_thing.above, gain = 0.5, max_hear_distance = 8},
true true
) )
local used = false local used = nil
if pointed_thing.type == "node" then if pointed_thing.type == "node" then
local nodedef = minetest.registered_nodes[get_node(pointed_thing.under).name] local nodedef = minetest.registered_nodes[get_node(pointed_thing.under).name]
if nodedef and nodedef._on_ignite then if nodedef and nodedef._on_ignite then
local overwrite = nodedef._on_ignite(user, pointed_thing) local overwrite = nodedef._on_ignite(user, pointed_thing)
if not overwrite then if not overwrite then
mcl_fire.set_fire(pointed_thing, user, false) used = mcl_fire.set_fire(pointed_thing, user, false)
end end
else else
mcl_fire.set_fire(pointed_thing, user, false) used = mcl_fire.set_fire(pointed_thing, user, false)
end end
used = true
end end
if itemstack:get_count() == 0 and idef.sound and idef.sound.breaks then if itemstack:get_count() == 0 and idef.sound and idef.sound.breaks then
minetest.sound_play(idef.sound.breaks, {pos=user:get_pos(), gain=0.5}, true) minetest.sound_play(idef.sound.breaks, {pos=user:get_pos(), gain=0.5}, true)
end end
if (not minetest.is_creative_enabled(user:get_player_name())) and used == true then if (not minetest.is_creative_enabled(user:get_player_name())) and used then
itemstack:add_wear(65535/65) -- 65 uses itemstack:add_wear(65535/65) -- 65 uses
end end
return itemstack return itemstack

View File

@ -469,7 +469,7 @@ function mcl_fire.set_fire(pointed_thing, player, allow_on_fire)
return return
end end
add_node(pointed_thing.above, {name="mcl_fire:fire"}) return add_node(pointed_thing.above, {name="mcl_fire:fire"})
end end
minetest.register_lbm({ minetest.register_lbm({