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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/java/com/l2jserver/gameserver/model/zone/type/L2BattalionZone.java
View File

@@ -175,7 +175,7 @@ public class L2BattalionZone extends L2ZoneRespawn
player.stopAllEffectsExceptThoseThatLastThroughDeath();
if (Config.BTZ_REMOVE_PETS)
{
L2Summon pet = player.getSummon();
L2Summon pet = player.getPet();
if (pet != null)
{
pet.stopAllEffectsExceptThoseThatLastThroughDeath();
@@ -187,7 +187,7 @@ public class L2BattalionZone extends L2ZoneRespawn
{
if (Config.BTZ_REMOVE_PETS)
{
L2Summon pet = player.getSummon();
L2Summon pet = player.getPet();
if (pet != null)
{
pet.unSummon(player);
@@ -213,7 +213,7 @@ public class L2BattalionZone extends L2ZoneRespawn
{
final PcInventory inv = player.getInventory();
if (ItemTable.getInstance().createDummyItem(reward[0]).isStackable())
if (ItemTable.getInstance().getTemplate(reward[0]).isStackable())
{
inv.addItem("L2MultiFunctionZone ", reward[0], reward[1], player, player);

12
trunk/java/com/l2jserver/gameserver/model/zone/type/L2OlympiadStadiumZone.java
View File

@@ -29,6 +29,7 @@ import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jserver.gameserver.model.actor.instance.L2OlympiadManagerInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -193,9 +194,10 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn
else
{
// check for pet
if (player.hasPet())
final L2Summon pet = player.getPet();
if (pet != null)
{
player.getSummon().unSummon(player);
pet.unSummon(player);
}
}
}
@@ -278,10 +280,10 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn
{
if (_player != null)
{
if (_player.hasSummon())
_player.getServitors().values().forEach(s ->
{
_player.getSummon().unSummon(_player);
}
s.unSummon(_player);
});
_player.teleToLocation(TeleportWhereType.TOWN);
_player.setInstanceId(0);