summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-10 06:03:05 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-10 06:03:05 +0000
commitc994d7c89cba2730066eefdd183a845702b1b18c (patch)
treee94aa573e3526bcbefbeb0deee034f53923979f5
parenta1c1702fe4452adc472bcb78ff501069feaf06bc (diff)
downloadhercules-c994d7c89cba2730066eefdd183a845702b1b18c.tar.gz
hercules-c994d7c89cba2730066eefdd183a845702b1b18c.tar.bz2
hercules-c994d7c89cba2730066eefdd183a845702b1b18c.tar.xz
hercules-c994d7c89cba2730066eefdd183a845702b1b18c.zip
* Magnetic Earth will never stack even if they are from the same team.(bugreport:2568)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13750 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7497446bc..ee27cb91c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -2,6 +2,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+09/05/10
+ * Magnetic Earth will never stack(bugreport:2568) [Inkfish]
09/05/09
* Fixed GX's skill level modifier is missing [Inkfish]
* Fixed some known and unknown player attached NPC timer problems [Inkfish]
diff --git a/src/map/skill.c b/src/map/skill.c
index 4f89030f1..186c33fbd 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9428,8 +9428,7 @@ static int skill_cell_overlap(struct block_list *bl, va_list ap)
switch (skillid)
{
case SA_LANDPROTECTOR:
- if( unit->group->skill_id == SA_LANDPROTECTOR &&
- battle_check_target(bl, src, BCT_ENEMY) > 0 )
+ if( unit->group->skill_id == SA_LANDPROTECTOR )
{ //Check for offensive Land Protector to delete both. [Skotlex]
(*alive) = 0;
skill_delunit(unit);