about summary refs log tree commit diff
path: root/src/game/server
diff options
context:
space:
mode:
authorMarius "Teelevision" Neugebauer <marius@teele.eu>2014-04-02 20:53:19 +0200
committerMarius "Teelevision" Neugebauer <marius@teele.eu>2014-04-02 20:53:19 +0200
commit85a79f61a3dedeedeaf864617c77476399d02aa9 (patch)
tree04800713affae2e109ef70e181346c2cabf2ff8b /src/game/server
parent7fe316d31a7340a64ebc4f5e8eb30a685d7e23bd (diff)
parent7c0f1b797f79e872f3b5672ceba14633c6b00d07 (diff)
downloadzcatch-85a79f61a3dedeedeaf864617c77476399d02aa9.tar.gz
zcatch-85a79f61a3dedeedeaf864617c77476399d02aa9.zip
Merge branch 'zCatch' into zCatch-bot-detection
Diffstat (limited to 'src/game/server')
-rw-r--r--src/game/server/entity.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/entity.cpp b/src/game/server/entity.cpp
index e1985877..3fae22f2 100644
--- a/src/game/server/entity.cpp
+++ b/src/game/server/entity.cpp
@@ -60,6 +60,6 @@ void CEntity::SetCharactersNearby()
 	CCharacter *c;
 	for(int i = 0; i < MAX_CLIENTS; ++i)
 		if((c = GameServer()->GetPlayerChar(i)))
-			m_CharactersNearby[i] = (absolute(c->m_Pos.x - m_Pos.x) <= 9000.0f && absolute(c->m_Pos.y - m_Pos.y) <= 700.0f && distance(c->m_Pos, m_Pos) <= 900.0f);
+			m_CharactersNearby[i] = (absolute(c->m_Pos.x - m_Pos.x) <= 900.0f && absolute(c->m_Pos.y - m_Pos.y) <= 700.0f && distance(c->m_Pos, m_Pos) <= 900.0f);
 	m_CharactersNearbyInitialized = true;
 }