From 701240bc3a17a73d73f3a96cd81e559d662ac42c Mon Sep 17 00:00:00 2001
From: Thomas Rudin <thomas@rudin.li>
Date: Sun, 09 Dec 2018 16:01:10 +0100
Subject: [PATCH] Quarry: Check for valid facedir to fix server freeze #465 (#466)
---
technic/machines/other/injector.lua | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua
index 2099a4f..4fe78b2 100644
--- a/technic/machines/other/injector.lua
+++ b/technic/machines/other/injector.lua
@@ -3,6 +3,8 @@
local fs_helpers = pipeworks.fs_helpers
+local tube_entry = "^pipeworks_tube_connection_metallic.png"
+
local function inject_items (pos)
local meta=minetest.get_meta(pos)
local inv = meta:get_inventory()
@@ -53,7 +55,7 @@
local function set_injector_formspec(meta)
local is_stack = meta:get_string("mode") == "whole stacks"
meta:set_string("formspec",
- "invsize[8,9;]"..
+ "size[8,9;]"..
"item_image[0,0;1,1;technic:injector]"..
"label[1,0;"..S("Self-Contained Injector").."]"..
(is_stack and
@@ -64,20 +66,27 @@
"listring[]"..
fs_helpers.cycling_button(
meta,
- "image_button[0,4.3;1,0.6",
+ pipeworks.button_base,
"splitstacks",
{
- {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"},
- {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"}
+ pipeworks.button_off,
+ pipeworks.button_on
}
- ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]"
+ )..pipeworks.button_label
)
end
minetest.register_node("technic:injector", {
description = S("Self-Contained Injector"),
- tiles = {"technic_injector_top.png", "technic_injector_bottom.png", "technic_injector_side.png",
- "technic_injector_side.png", "technic_injector_side.png", "technic_injector_side.png"},
+ tiles = {
+ "technic_injector_top.png"..tube_entry,
+ "technic_injector_bottom.png",
+ "technic_injector_side.png"..tube_entry,
+ "technic_injector_side.png"..tube_entry,
+ "technic_injector_side.png"..tube_entry,
+ "technic_injector_side.png"
+ },
+ paramtype2 = "facedir",
groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, tubedevice=1, tubedevice_receiver=1},
tube = {
can_insert = function(pos, node, stack, direction)
@@ -91,7 +100,7 @@
insert_object = function(pos, node, stack, direction)
return minetest.get_meta(pos):get_inventory():add_item("main", stack)
end,
- connect_sides = {left=1, right=1, front=1, back=1, top=1, bottom=1},
+ connect_sides = {left=1, right=1, back=1, top=1, bottom=1},
},
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
--
Gitblit v1.8.0