@@ -372,21 +372,24 @@ void BattlescapeGame::endTurn()
 		Position p;
 
 		// check for hot grenades on the ground
-		for (int i = 0; i < _save->getMapSizeXYZ(); ++i)
+		if (_save->getSide() != FACTION_NEUTRAL)
 		{
-			for (std::vector<BattleItem*>::iterator it = _save->getTiles()[i]->getInventory()->begin(); it != _save->getTiles()[i]->getInventory()->end(); )
+			for (int i = 0; i < _save->getMapSizeXYZ(); ++i)
 			{
-				if ((*it)->getRules()->getBattleType() == BT_GRENADE && (*it)->getFuseTimer() == 0)  // it's a grenade to explode now
+				for (std::vector<BattleItem *>::iterator it = _save->getTiles()[i]->getInventory()->begin(); it != _save->getTiles()[i]->getInventory()->end(); )
 				{
-					p.x = _save->getTiles()[i]->getPosition().x*16 + 8;
-					p.y = _save->getTiles()[i]->getPosition().y*16 + 8;
-					p.z = _save->getTiles()[i]->getPosition().z*24 - _save->getTiles()[i]->getTerrainLevel();
-					statePushNext(new ExplosionBState(this, p, (*it), (*it)->getPreviousOwner()));
-					_save->removeItem((*it));
-					statePushBack(0);
-					return;
+					if ((*it)->getRules()->getBattleType() == BT_GRENADE && (*it)->getFuseTimer() == 0)  // it's a grenade to explode now
+					{
+						p.x = _save->getTiles()[i]->getPosition().x * 16 + 8;
+						p.y = _save->getTiles()[i]->getPosition().y * 16 + 8;
+						p.z = _save->getTiles()[i]->getPosition().z * 24 - _save->getTiles()[i]->getTerrainLevel();
+						statePushNext(new ExplosionBState(this, p, (*it), (*it)->getPreviousOwner()));
+						_save->removeItem((*it));
+						statePushBack(0);
+						return;
+					}
+					++it;
 				}
-				++it;
 			}
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -372,21 +372,24 @@ void BattlescapeGame::endTurn()`
`372`	`372`	`Position p;`
`373`	`373`
`374`	`374`	`// check for hot grenades on the ground`
`375`		`- for (int i = 0; i < _save->getMapSizeXYZ(); ++i)`
	`375`	`+ if (_save->getSide() != FACTION_NEUTRAL)`
`376`	`376`	`{`
`377`		`- for (std::vector<BattleItem*>::iterator it = _save->getTiles()[i]->getInventory()->begin(); it != _save->getTiles()[i]->getInventory()->end(); )`
	`377`	`+ for (int i = 0; i < _save->getMapSizeXYZ(); ++i)`
`378`	`378`	`{`
`379`		`- if ((it)->getRules()->getBattleType() == BT_GRENADE && (it)->getFuseTimer() == 0) // it's a grenade to explode now`
	`379`	`+ for (std::vector<BattleItem *>::iterator it = _save->getTiles()[i]->getInventory()->begin(); it != _save->getTiles()[i]->getInventory()->end(); )`
`380`	`380`	`{`
`381`		`- p.x = _save->getTiles()[i]->getPosition().x*16 + 8;`
`382`		`- p.y = _save->getTiles()[i]->getPosition().y*16 + 8;`
`383`		`- p.z = _save->getTiles()[i]->getPosition().z*24 - _save->getTiles()[i]->getTerrainLevel();`
`384`		`- statePushNext(new ExplosionBState(this, p, (it), (it)->getPreviousOwner()));`
`385`		`- _save->removeItem((*it));`
`386`		`- statePushBack(0);`
`387`		`- return;`
	`381`	`+ if ((it)->getRules()->getBattleType() == BT_GRENADE && (it)->getFuseTimer() == 0) // it's a grenade to explode now`
	`382`	`+ {`
	`383`	`+ p.x = _save->getTiles()[i]->getPosition().x * 16 + 8;`
	`384`	`+ p.y = _save->getTiles()[i]->getPosition().y * 16 + 8;`
	`385`	`+ p.z = _save->getTiles()[i]->getPosition().z * 24 - _save->getTiles()[i]->getTerrainLevel();`
	`386`	`+ statePushNext(new ExplosionBState(this, p, (it), (it)->getPreviousOwner()));`
	`387`	`+ _save->removeItem((*it));`
	`388`	`+ statePushBack(0);`
	`389`	`+ return;`
	`390`	`+ }`
	`391`	`+ ++it;`
`388`	`392`	`}`
`389`		`- ++it;`
`390`	`393`	`}`
`391`	`394`	`}`
`392`	`395`	`}`