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

Conflicts:
	changelog.txt
This commit is contained in:
Uleat
2014-12-28 11:57:51 -05:00
29 changed files with 440 additions and 442 deletions
+2 -2
View File
@@ -8655,8 +8655,8 @@ void command_aggrozone(Client *c, const Seperator *sep) {
if (!m)
return;
int hate = atoi(sep->arg[1]); //should default to 0 if we don't enter anything
entity_list.AggroZone(m,hate);
uint32 hate = atoi(sep->arg[1]); //should default to 0 if we don't enter anything
entity_list.AggroZone(m, hate);
c->Message(0, "Train to you! Last chance to go invulnerable...");
}