Fix //allocate with 0 nodes

diff --git a/worldedit/serialization.lua b/worldedit/serialization.lua
index e796fc1477653a8afa0d64047c0734747e6970a5..ddc59cd388eb257f64b8aeac61093e359b577610 100644 (file)
--- a/worldedit/serialization.lua
+++ b/worldedit/serialization.lua
@@ -196,7 +196,7 @@ end
 -- @return The number of nodes.\r
 function worldedit.allocate(origin_pos, value)\r
        local nodes = load_schematic(value)\r
-       if not nodes then return nil end\r
+       if not nodes or #nodes == 0 then return nil end\r
        return worldedit.allocate_with_nodes(origin_pos, nodes)\r
 end\r
 \r

diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 61aafc1b7d860965d41d22edb8f6c1905bef0aca..cc169ee1bab2e237d3d0c4e96554609bcf888f1c 100644 (file)
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -1163,9 +1163,15 @@ minetest.register_chatcommand("/allocate", {
                        return\r
                elseif version > worldedit.LATEST_SERIALIZATION_VERSION then\r
                        worldedit.player_notify(name, "File was created with newer version of WorldEdit!")\r
+                       return\r
                end\r
                local nodepos1, nodepos2, count = worldedit.allocate(pos, value)\r
 \r
+               if not nodepos1 then\r
+                       worldedit.player_notify(name, "Schematic empty, nothing allocated")\r
+                       return\r
+               end\r
+\r
                worldedit.pos1[name] = nodepos1\r
                worldedit.mark_pos1(name)\r
                worldedit.pos2[name] = nodepos2\r