From: terencehill <piuntn@gmail.com>
Date: Wed, 19 Aug 2015 12:19:16 +0000 (+0200)
Subject: Don't reset times of items that are not available in the map
X-Git-Tag: xonotic-v0.8.2~2037^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=56bf236ff6db9c4123a74b66d5c5790b777e0e04;p=xonotic%2Fxonotic-data.pk3dir.git

Don't reset times of items that are not available in the map
---

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 4bd4e414a..daff32f9c 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -361,7 +361,10 @@ void reset_map(float dorespawn)
 	// since Item_Reset schedules respawn of superweapons and powerups
 	for(self = world; (self = nextent(self)); )
 	if(IS_NOT_A_CLIENT(self))
-		Item_ItemsTime_SetTime(self, 0);
+	{
+		if(self.reset)
+			Item_ItemsTime_SetTime(self, 0);
+	}
 
 	for(self = world; (self = nextent(self)); )
 	if(IS_NOT_A_CLIENT(self))