From 5ad1b8db0837e384276ad274af51c959b6f9ce64 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sat, 20 Apr 2013 05:42:08 +0200
Subject: [PATCH] Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev
---
technic/frames.lua | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/technic/frames.lua b/technic/frames.lua
index 0e095bd..565a2ef 100644
--- a/technic/frames.lua
+++ b/technic/frames.lua
@@ -97,6 +97,10 @@
type = "fixed",
fixed=nodeboxes,
},
+ selection_box = {
+ type="fixed",
+ fixed={-0.5,-0.5,-0.5,0.5,0.5,0.5}
+ },
paramtype = "light",
frame=1,
drop="technic:frame_111111",
@@ -373,8 +377,8 @@
end
for _,obj in ipairs(objects) do
obj:setpos(addVect(obj:getpos(),vect))
- if obj:get_luaentity().name == "pipeworks:tubed_item" then
- le=obj:get_luaentity()
+ le=obj:get_luaentity()
+ if le and le.name == "pipeworks:tubed_item" then
le.start_pos=addVect(le.start_pos,vect)
end
end
--
Gitblit v1.8.0