diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-27 18:40:31 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-27 18:40:31 +0000 |
| commit | 4f1fa6eb8e89f9059f7468526c8f990e2ccbc251 (patch) | |
| tree | fef2636635b2c7858ea431cfb2feea99a1f9819f | |
| parent | a7478042cf332fde65065c0c9c0015b681fb06e2 (diff) | |
| download | hercules-4f1fa6eb8e89f9059f7468526c8f990e2ccbc251.tar.gz hercules-4f1fa6eb8e89f9059f7468526c8f990e2ccbc251.tar.bz2 hercules-4f1fa6eb8e89f9059f7468526c8f990e2ccbc251.tar.xz hercules-4f1fa6eb8e89f9059f7468526c8f990e2ccbc251.zip | |
Patched an unresolved case where knocking back a bard/dancer would cause the mapserver to crash (bugreport:1043)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12249 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 46186b2fd..cdfe88a31 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2008/02/27 + * Patched an unresolved case where knocking back a bard/dancer would + cause the mapserver to crash (bugreport:1043) * Fixed Apple of Idun not checking for bard soul link (bugreport:1028) * Fixed Advanced Adrenaline Rush not working barehanded (bugreport:1049) * Disabled idle_no_autoloot setting (bugreport:1051) diff --git a/src/map/skill.c b/src/map/skill.c index 17175b741..3ce19042a 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9822,7 +9822,8 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, i struct skill_unit *unit1; struct skill_unit *unit2; - nullpo_retr(0, group); + if (group == NULL) + return 0; if (group->unit_count<=0) return 0; if (group->unit==NULL) |