From f878dd5735914349c542a41e8c03166fe08d0e5a Mon Sep 17 00:00:00 2001
From: Richard Helgeby <devnull@localhost>
Date: Wed, 17 Nov 2010 15:48:57 +0100
Subject: [PATCH] Fixed players not respawning as zombies when they are
 supposed to. Updated patch list and changelog.

---
 docs/zr_3.0-b2-patch_changelog.txt |  5 +++++
 patchlist.conf                     |  1 +
 src/zr/respawn.inc                 | 10 +++++-----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/zr_3.0-b2-patch_changelog.txt b/docs/zr_3.0-b2-patch_changelog.txt
index 32865c5..587b77f 100644
--- a/docs/zr_3.0-b2-patch_changelog.txt
+++ b/docs/zr_3.0-b2-patch_changelog.txt
@@ -172,3 +172,8 @@ released. If the file is empty there are no config changes in that patch.
       ZR_GetKilledByWorld
   See addons/sourcemod/scripting/include/zr in the package for details.
   Also see addons/sourcemod/scripting/testsuite/zr for API usage examples.
+
+2010.11.17 - r648
+-------------------
+
+* Fixed players not respawning as zombies when they are supposed to.
diff --git a/patchlist.conf b/patchlist.conf
index c6457b4..f0503fe 100644
--- a/patchlist.conf
+++ b/patchlist.conf
@@ -13,3 +13,4 @@
 643
 644
 647
+648
diff --git a/src/zr/respawn.inc b/src/zr/respawn.inc
index 833be31..3aaba30 100644
--- a/src/zr/respawn.inc
+++ b/src/zr/respawn.inc
@@ -243,14 +243,14 @@ public Action:RespawnTimer(Handle:timer, any:client)
  */
 RespawnCondition:RespawnToContition(bool:zombie, bool:zombieIfSuicide)
 {
-    if (zombieIfSuicide)
-    {
-        return Respawn_ZombieIfSuicide;
-    }
-    else if (zombie)
+    if (zombie)
     {
         return Respawn_Zombie;
     }
+    else if (zombieIfSuicide)
+    {
+        return Respawn_ZombieIfSuicide;
+    }
     
     return Respawn_Human;
 }