nalc/pipeworks
1
0
Fork 0
forked from mtcontrib/pipeworks
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nalc:77c80264008a6849ea255ab07926949d81ea08c0
Branches Tags
nalc:master mtcontrib:master mtcontrib:luacheck-builtin-std mtcontrib:chest-dupe-fix mtcontrib:repair-fixes
nalc:nalc-1.2.0 nalc:nalc-1.0 mtcontrib:2021-04-14-1 mtcontrib:2021-02-19 mtcontrib:2021-01-30 mtcontrib:20200603-1302 mtcontrib:2019-10-03-1 mtcontrib:2019-06-07-1 mtcontrib:20190430 mtcontrib:2018-12-01 mtcontrib:2018-11-23 mtcontrib:2018-11-09 mtcontrib:2018-09-13-1 mtcontrib:20180717 mtcontrib:0.4.16
...
compare: mtcontrib:2021-01-30
Branches Tags
mtcontrib:master mtcontrib:luacheck-builtin-std mtcontrib:chest-dupe-fix mtcontrib:repair-fixes nalc:master
mtcontrib:2021-04-14-1 mtcontrib:2021-02-19 mtcontrib:2021-01-30 mtcontrib:20200603-1302 mtcontrib:2019-10-03-1 mtcontrib:2019-06-07-1 mtcontrib:20190430 mtcontrib:2018-12-01 mtcontrib:2018-11-23 mtcontrib:2018-11-09 mtcontrib:2018-09-13-1 mtcontrib:20180717 mtcontrib:0.4.16 nalc:nalc-1.2.0 nalc:nalc-1.0

7 Commits
77c8026400 ... 2021-01-30

Author SHA1 Message Date
Vanessa Dannenberg
8322f256c5 Merge branch 'master' into 'master' 
Prevent the symptoms of Issue #33

See merge request VanessaE/pipeworks!31
 2020-12-18 21:44:11 +00:00
Skgland
ba7eb19317 Prevent the symptoms of Issue #33 
Try to prevent the crash from issue #33 by
replaving nil velocity or acceleration with (0,0,0).
This does not fix the underlying cause of them being nil,
but should prevent the crash.
 2020-12-18 19:28:07 +01:00
VanessaE
065c953eba use the right gear item in node breaker 2020-10-28 12:30:48 -04:00
Vanessa Dannenberg
9a63d17e4a Merge branch 'm_disable_print_message' into 'master' 
Log the "Pipeworks loaded!" message to infostream instead of printing it

See merge request VanessaE/pipeworks!30
 2020-10-17 18:55:24 +00:00
Vanessa Dannenberg
d814357ddf Merge branch 'm_table_extends_clean' into 'master' 
Make pipeworks.table_extend easier to read

See merge request VanessaE/pipeworks!29
 2020-10-17 18:55:01 +00:00
HybridDog
c2fe5fe956 Make pipeworks.table_extend easier to read 
In my opinion this clarifies that tbl2 is attached at the end of tbl
 2020-10-17 20:50:20 +02:00
HybridDog
9dbaa5f4f6 Log the "Pipeworks loaded!" message to infostream instead of printing it 2020-10-17 20:46:44 +02:00
4 changed files with 7 additions and 6 deletions
Expand all files Collapse all files

7
common.lua
View File

@ -86,10 +86,9 @@ function pipeworks.table_contains(tbl, element)
end end
function pipeworks.table_extend(tbl, tbl2) function pipeworks.table_extend(tbl, tbl2)
local index = #tbl + 1 local oldlength = #tbl
for _, elt in ipairs(tbl2) do for i = 1,#tbl2 do
tbl[index] = elt tbl[oldlength + i] = tbl2[i]
index = index + 1
end end
end end

2
init.lua
View File

@ -150,4 +150,4 @@ end
minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty") minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
print("Pipeworks loaded!") minetest.log("info", "Pipeworks loaded!")

2
luaentity.lua
View File

@ -340,6 +340,8 @@ local move_entities_globalstep_part2 = function(dtime)
entity._velocity = master_entity:get_velocity() entity._velocity = master_entity:get_velocity()
entity._acceleration = master_entity:get_acceleration() entity._acceleration = master_entity:get_acceleration()
else else
entity._velocity = entity._velocity or vector.new(0,0,0)
entity._acceleration = entity._acceleration or vector.new(0,0,0)
entity._pos = vector.add(vector.add( entity._pos = vector.add(vector.add(
entity._pos, entity._pos,
vector.multiply(entity._velocity, dtime)), vector.multiply(entity._velocity, dtime)),

2
wielder.lua
View File

@ -378,7 +378,7 @@ if pipeworks.enable_node_breaker then
minetest.register_craft({ minetest.register_craft({
output = "pipeworks:nodebreaker_off", output = "pipeworks:nodebreaker_off",
recipe = { recipe = {
{ "pipeworks:gear", "pipeworks:gear", "pipeworks:gear" }, { "basic_materials:gear_steel", "basic_materials:gear_steel", "basic_materials:gear_steel" },
{ "default:stone", "mesecons:piston", "default:stone" }, { "default:stone", "mesecons:piston", "default:stone" },
{ "group:wood", "mesecons:mesecon", "group:wood" }, { "group:wood", "mesecons:mesecon", "group:wood" },
} }