Merge branch 'master' into 'master'

Prevent the symptoms of Issue #33 See merge request VanessaE/pipeworks!31
Prevent the symptoms of Issue #33
2020-12-18 21:44:11 +00:00 · 2020-12-18 19:28:07 +01:00 · 2020-10-28 12:30:48 -04:00
2 changed files with 3 additions and 1 deletions
--- a/luaentity.lua
+++ b/luaentity.lua
@ -340,6 +340,8 @@ local move_entities_globalstep_part2 = function(dtime)
 			entity._velocity = master_entity:get_velocity()
 			entity._acceleration = master_entity:get_acceleration()
 		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.multiply(entity._velocity, dtime)),
--- a/wielder.lua
+++ b/wielder.lua
@ -378,7 +378,7 @@ if pipeworks.enable_node_breaker then
 	minetest.register_craft({
 		output = "pipeworks:nodebreaker_off",
 		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" },
 			{ "group:wood",    "mesecons:mesecon",  "group:wood" },
 		}
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