AFCMS
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflict (huge chests)

This commit is contained in:
AFCMS 2023-06-28 16:16:26 +02:00
parent 653f82198e
commit cd6dd4d851
Signed by: AFCMS
GPG Key ID: 8720389A25B652E3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ITEMS/mcl_chests/init.lua
View File

@ -65,7 +65,6 @@ local entity_animations = {
minetest.register_entity("mcl_chests:chest", { minetest.register_entity("mcl_chests:chest", {
initial_properties = { initial_properties = {
visual = "mesh", visual = "mesh",
visual_size = { x = 3, y = 3 },
pointable = false, pointable = false,
physical = false, physical = false,
static_save = false, static_save = false,
@ -150,7 +149,6 @@ minetest.register_entity("mcl_chests:chest", {
local function get_entity_pos(pos, dir, double) local function get_entity_pos(pos, dir, double)
pos = vector.copy(pos) pos = vector.copy(pos)
pos.y = pos.y - 0.49
if double then if double then
local add, mul, vec, cross = vector.add, vector.multiply, vector.new, vector.cross local add, mul, vec, cross = vector.add, vector.multiply, vector.new, vector.cross
pos = add(pos, mul(cross(dir, vec(0, 1, 0)), -0.5)) pos = add(pos, mul(cross(dir, vec(0, 1, 0)), -0.5))