lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for double Headquarters.

Browse Source 
Contributed by yksdtc.
This commit is contained in:
MobiusDev
2015-11-14 23:10:51 +00:00
parent 97286edf6c
commit 0096e0c03d
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
trunk/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java vendored
View File

@@ -19,17 +19,11 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.NpcData; import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.FortManager;
import com.l2jserver.gameserver.model.StatsSet; import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
import com.l2jserver.gameserver.model.conditions.Condition; import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect; import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.entity.Castle;
import com.l2jserver.gameserver.model.entity.Fort;
import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
import com.l2jserver.gameserver.model.skills.BuffInfo; import com.l2jserver.gameserver.model.skills.BuffInfo;
/** /**
@@ -68,20 +62,6 @@ public final class HeadquarterCreate extends AbstractEffect
flag.setCurrentHpMp(flag.getMaxHp(), flag.getMaxMp()); flag.setCurrentHpMp(flag.getMaxHp(), flag.getMaxMp());
flag.setHeading(player.getHeading()); flag.setHeading(player.getHeading());
flag.spawnMe(player.getX(), player.getY(), player.getZ() + 50); flag.spawnMe(player.getX(), player.getY(), player.getZ() + 50);
final Castle castle = CastleManager.getInstance().getCastle(player); // already call addFlag method in L2SiegeFlagInstance constructor
final Fort fort = FortManager.getInstance().getFort(player);
final SiegableHall hall = CHSiegeManager.getInstance().getNearbyClanHall(player);
if (castle != null)
{
castle.getSiege().getFlag(player.getClan()).add(flag);
}
else if (fort != null)
{
fort.getSiege().getFlag(player.getClan()).add(flag);
}
else
{
hall.getSiege().getFlag(player.getClan()).add(flag);
}
} }
} }