From ddaf849ddfe2a94c7bab534dce05e37244cf6a81 Mon Sep 17 00:00:00 2001
From: Zidonuke <zidonuke@gmail.com>
Date: Wed, 21 Dec 2011 02:05:01 -0500
Subject: [PATCH] A special fix to the awesome Gravemind. Thank you.

---
 TShockAPI/GetDataHandlers.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index f821fdc3..a2a3a386 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -533,12 +533,15 @@ namespace TShockAPI
 
             args.TPlayer.hostile = pvp;
 
-            if (pvp == true && TShock.Config.AlwaysPvP)
-                args.Player.IgnoreActionsForPvP = false;
-            else
+            if (TShock.Config.AlwaysPvP)
             {
-                args.Player.Spawn();
-                args.Player.IgnoreActionsForPvP = true;
+                if (pvp == true)
+                    args.Player.IgnoreActionsForPvP = false;
+                else
+                {
+                    args.Player.Spawn();
+                    args.Player.IgnoreActionsForPvP = true;
+                }
             }
 
             NetMessage.SendData((int)PacketTypes.TogglePvp, -1, -1, "", args.Player.Index);