From b2829d7e7d7fc69f6b5b90fdd57bcf18bb0b1aed Mon Sep 17 00:00:00 2001
From: LeMagnesium <mg.minetest@gmail.com>
Date: Mon, 26 Oct 2015 13:27:02 +0100
Subject: [PATCH] [plantlife_modpack] Update - Update old deprecated fields

---
 mods/plantlife_modpack/dryplants/juncus.lua | 6 ++++++
 mods/plantlife_modpack/poisonivy/init.lua   | 6 +++---
 mods/plantlife_modpack/vines/functions.lua  | 4 ++--
 mods/plantlife_modpack/vines/nodes.lua      | 6 +++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/mods/plantlife_modpack/dryplants/juncus.lua b/mods/plantlife_modpack/dryplants/juncus.lua
index 6f380194..8cf35435 100755
--- a/mods/plantlife_modpack/dryplants/juncus.lua
+++ b/mods/plantlife_modpack/dryplants/juncus.lua
@@ -44,6 +44,12 @@ minetest.register_node("dryplants:juncus", {
 		fixed = {-7/16, -1/2, -7/16, 7/16, 0, 7/16},
 	},
 	on_place = function(itemstack, placer, pointed_thing)
+		local playername = placer:get_player_name()
+		if minetest.is_protected(pointed_thing.above, playername) or 
+			minetest.is_protected(pointed_thing.under, playername) then 
+			minetest.chat_send_player(playername, "Someone else owns that spot.")
+			return
+		end
 		local pos = pointed_thing.under
 		local juncus_type = math.random(2,3)
 		local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
diff --git a/mods/plantlife_modpack/poisonivy/init.lua b/mods/plantlife_modpack/poisonivy/init.lua
index bef78baf..ebbede64 100755
--- a/mods/plantlife_modpack/poisonivy/init.lua
+++ b/mods/plantlife_modpack/poisonivy/init.lua
@@ -24,7 +24,7 @@ minetest.register_node('poisonivy:seedling', {
 	description = S("Poison ivy (seedling)"),
 	drawtype = 'plantlike',
 	waving = 1,
-	tile_images = { 'poisonivy_seedling.png' },
+	tiles = { 'poisonivy_seedling.png' },
 	inventory_image = 'poisonivy_seedling.png',
 	wield_image = 'poisonivy_seedling.png',
 	sunlight_propagates = true,
@@ -39,7 +39,7 @@ minetest.register_node('poisonivy:sproutling', {
 	description = S("Poison ivy (sproutling)"),
 	drawtype = 'plantlike',
 	waving = 1,
-	tile_images = { 'poisonivy_sproutling.png' },
+	tiles = { 'poisonivy_sproutling.png' },
 	inventory_image = 'poisonivy_sproutling.png',
 	wield_image = 'poisonivy_sproutling.png',
 	sunlight_propagates = true,
@@ -53,7 +53,7 @@ minetest.register_node('poisonivy:sproutling', {
 minetest.register_node('poisonivy:climbing', {
 	description = S("Poison ivy (climbing plant)"),
 	drawtype = 'signlike',
-	tile_images = { 'poisonivy_climbing.png' },
+	tiles = { 'poisonivy_climbing.png' },
 	inventory_image = 'poisonivy_climbing.png',
 	wield_image = 'poisonivy_climbing.png',
 	sunlight_propagates = true,
diff --git a/mods/plantlife_modpack/vines/functions.lua b/mods/plantlife_modpack/vines/functions.lua
index 87024bdd..150a3f8a 100755
--- a/mods/plantlife_modpack/vines/functions.lua
+++ b/mods/plantlife_modpack/vines/functions.lua
@@ -33,7 +33,7 @@ vines.register_vine = function( name, defs, biome )
     paramtype = "light",
     paramtype2 = "wallmounted",
     buildable_to = true,
-    tile_images = { vine_image_end },
+    tiles = { vine_image_end },
     drawtype = drawtype,
     inventory_image = vine_image_end,
     groups = groups,
@@ -71,7 +71,7 @@ vines.register_vine = function( name, defs, biome )
     paramtype = "light",
     paramtype2 = "wallmounted",
     buildable_to = true,
-    tile_images = { vine_image_middle },
+    tiles = { vine_image_middle },
     wield_image = vine_image_middle,
     drawtype = drawtype,
     inventory_image = vine_image_middle,
diff --git a/mods/plantlife_modpack/vines/nodes.lua b/mods/plantlife_modpack/vines/nodes.lua
index ab14b28a..9d7df00d 100755
--- a/mods/plantlife_modpack/vines/nodes.lua
+++ b/mods/plantlife_modpack/vines/nodes.lua
@@ -2,7 +2,7 @@ minetest.register_node("vines:rope_block", {
   description = "Rope",
   sunlight_propagates = true,
   paramtype = "light",
-  tile_images = {
+  tiles = {
     "default_wood.png^vines_rope.png",
     "default_wood.png^vines_rope.png",
     "default_wood.png",
@@ -36,7 +36,7 @@ minetest.register_node("vines:rope", {
   sunlight_propagates = true,
   paramtype = "light",
   drop = "",
-  tile_images = { "vines_rope.png" },
+  tiles = { "vines_rope.png" },
   drawtype = "plantlike",
   groups = {flammable=2, not_in_creative_inventory=1},
   sounds =  default.node_sound_leaves_defaults(),
@@ -53,7 +53,7 @@ minetest.register_node("vines:rope_end", {
   sunlight_propagates = true,
   paramtype = "light",
   drop = "",
-  tile_images = { "vines_rope_end.png" },
+  tiles = { "vines_rope_end.png" },
   drawtype = "plantlike",
   groups = {flammable=2, not_in_creative_inventory=1},
   sounds =  default.node_sound_leaves_defaults(),