pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-28 15:57:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server into trade_stacking

Browse Source 
Conflicts:
	changelog.txt
This commit is contained in:
Uleat
2014-08-24 21:38:01 -04:00
parent 9a5d2d2bc5 6100da75c5
commit ff7ff658e0
59 changed files with 1666 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/common.h
+2 -1
View File
@@ -127,7 +127,8 @@ enum {
FLEE_PERCENT = 37,
ALLOW_BENEFICIAL = 38,
DISABLE_MELEE = 39,
MAX_SPECIAL_ATTACK = 40
NPC_CHASE_DISTANCE = 40,
MAX_SPECIAL_ATTACK = 41
};