From c62c5f5cae1d5430a30547eff2c9e45b36f64d93 Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Thu, 25 Nov 2010 00:02:59 -0800
Subject: [PATCH] Updated for 1.6.

---
 README.txt            | 15 +++++++++++++++
 manifest.mf           |  2 +-
 worldguard.properties |  7 ++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index 85022623..631c3e76 100644
--- a/README.txt
+++ b/README.txt
@@ -119,6 +119,17 @@ unsupported by your version of hMod.
     this is an easier way to do it (this way also prints a more
     friendly message than if you used the 'tell' action of the blacklist).
 
+- login-protection (def. 3)
+    Number of seconds to keep a player invincible when the player joins.
+
+- spawn-protection (def. 0)
+    Number of seconds to keep a player invincible when the player spawns.
+    This does not apply to players joining the server.
+
+- kick-on-death (def. false)
+    Kick players when they die (and respawn). This is to work around the
+    issues of invisible players when players die.
+    
 - log-console (def. true)
     For blacklist log actions, print to console.
 
@@ -182,6 +193,10 @@ Commands
     WorldGuard. Note that disabling fire does not disable fire damage
     but fire at least won't spread.
 
+- /god
+    Toggles your invincibility. Players must have permission to use "/god"
+    to be able to use this command.
+
 Server Commands
 ---------------
 
diff --git a/manifest.mf b/manifest.mf
index 0bd11928..e7143824 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,2 +1,2 @@
 Manifest-Version: 1.0
-WorldGuard-Version: 1.5.1
\ No newline at end of file
+WorldGuard-Version: 1.6
\ No newline at end of file
diff --git a/worldguard.properties b/worldguard.properties
index a225f3b7..7321b595 100644
--- a/worldguard.properties
+++ b/worldguard.properties
@@ -30,12 +30,17 @@ block-creepers=false
 block-lighter=false
 block-tnt=false
 
+# Health related
+login-protection=3
+spawn-protection=0
+kick-on-death=false
+
 # Control fire
 disable-all-fire-spread=false
 disallowed-fire-spread-blocks=
 
 # Disable lava fire and spread
-disable-lava-fire=false
+disable-lava-fire=true
 allowed-lava-spread-blocks=
 
 # Log/blacklist