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

Moved TeleportWhereType to enums.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-30 03:13:22 +00:00
parent 8b9235ccc4
commit 9adadc4e86
385 changed files with 894 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/MapRegionTable.java
View File

@@ -28,6 +28,7 @@ import java.util.StringTokenizer;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.ArenaManager;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
@@ -52,15 +53,6 @@ public class MapRegionTable
private final int[][] _regions = new int[19][21];
private final int[][] _pointsWithKarmas;
public enum TeleportWhereType
{
Castle,
ClanHall,
SiegeFlag,
Town,
Fortress
}
private MapRegionTable()
{
FileReader reader = null;
@@ -482,7 +474,7 @@ public class MapRegionTable
if (player.getClan() != null)
{
// If teleport to clan hall
if (teleportWhere == TeleportWhereType.ClanHall)
if (teleportWhere == TeleportWhereType.CLANHALL)
{
clanhall = ClanHallManager.getInstance().getClanHallByOwner(player.getClan());
if (clanhall != null)
@@ -496,13 +488,13 @@ public class MapRegionTable
}
// If teleport to castle
if (teleportWhere == TeleportWhereType.Castle)
if (teleportWhere == TeleportWhereType.CASTLE)
{
castle = CastleManager.getInstance().getCastleByOwner(player.getClan());
}
// If teleport to fort
if (teleportWhere == TeleportWhereType.Fortress)
if (teleportWhere == TeleportWhereType.FORTRESS)
{
fort = FortManager.getInstance().getFortByOwner(player.getClan());
}
@@ -522,13 +514,13 @@ public class MapRegionTable
{
// If Teleporting to castle or
// If is on caslte with siege and player's clan is defender
if ((teleportWhere == TeleportWhereType.Castle) || ((teleportWhere == TeleportWhereType.Castle) && castle.getSiege().isInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null)))
if ((teleportWhere == TeleportWhereType.CASTLE) || ((teleportWhere == TeleportWhereType.CASTLE) && castle.getSiege().isInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null)))
{
coord = castle.getZone().getSpawn();
return new Location(coord[0], coord[1], coord[2]);
}
if ((teleportWhere == TeleportWhereType.SiegeFlag) && castle.getSiege().isInProgress())
if ((teleportWhere == TeleportWhereType.SIEGEFLAG) && castle.getSiege().isInProgress())
{
// Check if player's clan is attacker
final List<NpcInstance> flags = castle.getSiege().getFlag(player.getClan());
@@ -545,13 +537,13 @@ public class MapRegionTable
{
// teleporting to castle or fortress
// is on caslte with siege and player's clan is defender
if ((teleportWhere == TeleportWhereType.Fortress) || ((teleportWhere == TeleportWhereType.Fortress) && fort.getSiege().isInProgress() && (fort.getSiege().getDefenderClan(player.getClan()) != null)))
if ((teleportWhere == TeleportWhereType.FORTRESS) || ((teleportWhere == TeleportWhereType.FORTRESS) && fort.getSiege().isInProgress() && (fort.getSiege().getDefenderClan(player.getClan()) != null)))
{
coord = fort.getZone().getSpawn();
return new Location(coord[0], coord[1], coord[2]);
}
if ((teleportWhere == TeleportWhereType.SiegeFlag) && fort.getSiege().isInProgress())
if ((teleportWhere == TeleportWhereType.SIEGEFLAG) && fort.getSiege().isInProgress())
{
// check if player's clan is attacker
final List<NpcInstance> flags = fort.getSiege().getFlag(player.getClan());

30
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/enums/TeleportWhereType.java Normal file
View File

@@ -0,0 +1,30 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.enums;
/**
* All teleport types.
* @author xban1x
*/
public enum TeleportWhereType
{
CASTLE,
CLANHALL,
SIEGEFLAG,
TOWN,
FORTRESS
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
View File

@@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World;
@@ -120,7 +121,7 @@ public class AdminTeleport implements IAdminCommandHandler
final PlayerInstance player = World.getInstance().getPlayer(targetName);
if (player != null)
{
final Location loc = MapRegionTable.getInstance().getTeleToLocation(player, MapRegionTable.TeleportWhereType.Town);
final Location loc = MapRegionTable.getInstance().getTeleToLocation(player, TeleportWhereType.TOWN);
player.setInstanceId(0);
player.teleToLocation(loc, true);
}

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminZone.java
View File

@@ -20,6 +20,7 @@ import java.util.StringTokenizer;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.xml.AdminData;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -78,16 +79,16 @@ public class AdminZone implements IAdminCommandHandler
Location loc;
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, MapRegionTable.TeleportWhereType.Castle);
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CASTLE);
BuilderUtil.sendSysMessage(activeChar, "TeleToLocation (Castle): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, MapRegionTable.TeleportWhereType.ClanHall);
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL);
BuilderUtil.sendSysMessage(activeChar, "TeleToLocation (ClanHall): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, MapRegionTable.TeleportWhereType.SiegeFlag);
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG);
BuilderUtil.sendSysMessage(activeChar, "TeleToLocation (SiegeFlag): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, MapRegionTable.TeleportWhereType.Town);
loc = MapRegionTable.getInstance().getTeleToLocation(activeChar, TeleportWhereType.TOWN);
BuilderUtil.sendSysMessage(activeChar, "TeleToLocation (Town): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
}
else if (actualCommand.equalsIgnoreCase("admin_zone_reload"))

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
View File

@@ -21,7 +21,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
@@ -238,11 +238,11 @@ public class ScrollOfEscape implements IItemHandler
{
if (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)
{
_player.teleToLocation(MapRegionTable.TeleportWhereType.Castle);
_player.teleToLocation(TeleportWhereType.CASTLE);
}
else
{
_player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
_player.teleToLocation(TeleportWhereType.TOWN);
}
}
// escape to fortress if own's one if own's one
@@ -250,16 +250,16 @@ public class ScrollOfEscape implements IItemHandler
{
if (FortManager.getInstance().getFortByOwner(_player.getClan()) != null)
{
_player.teleToLocation(MapRegionTable.TeleportWhereType.Fortress);
_player.teleToLocation(TeleportWhereType.FORTRESS);
}
else
{
_player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
_player.teleToLocation(TeleportWhereType.TOWN);
}
}
else if (((_itemId == 1829) || (_itemId == 5858)) && (_player.getClan() != null) && (ClanHallManager.getInstance().getClanHallByOwner(_player.getClan()) != null)) // escape to clan hall if own's one
{
_player.teleToLocation(MapRegionTable.TeleportWhereType.ClanHall);
_player.teleToLocation(TeleportWhereType.CLANHALL);
}
else if (_itemId == 5858) // do nothing
{
@@ -271,7 +271,7 @@ public class ScrollOfEscape implements IItemHandler
}
else if (_itemId < 7117)
{
_player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
_player.teleToLocation(TeleportWhereType.TOWN);
}
else
{
@@ -414,7 +414,7 @@ public class ScrollOfEscape implements IItemHandler
}
default:
{
_player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
_player.teleToLocation(TeleportWhereType.TOWN);
break;
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.handler.skillhandlers;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Skill;
@@ -146,7 +146,7 @@ public class Recall implements ISkillHandler
}
}
target.teleToLocation(MapRegionTable.TeleportWhereType.Town);
target.teleToLocation(TeleportWhereType.TOWN);
}
if (skill.isMagic() && skill.useSpiritShot())

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
View File

@@ -20,7 +20,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.handler.IUserCommandHandler;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -182,7 +182,7 @@ public class Escape implements IUserCommandHandler
return;
}
_player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
_player.teleToLocation(TeleportWhereType.TOWN);
}
catch (Throwable e)
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.HeroSkillTable;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable.TeleportWhereType;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.handler.SkillHandler;

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -56,7 +56,6 @@ import org.l2jmobius.gameserver.datatables.HeroSkillTable;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.NobleSkillTable;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.sql.CharTemplateTable;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
@@ -67,6 +66,7 @@ import org.l2jmobius.gameserver.datatables.xml.FishData;
import org.l2jmobius.gameserver.datatables.xml.HennaData;
import org.l2jmobius.gameserver.datatables.xml.RecipeData;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.handler.ItemHandler;
@@ -13295,7 +13295,7 @@ public class PlayerInstance extends Playable
// if the rent of a wyvern expires while over a flying zone, tp to down before unmounting
if (checkLandingState() && (getMountType() == 2))
{
teleToLocation(MapRegionTable.TeleportWhereType.Town);
teleToLocation(TeleportWhereType.TOWN);
}
if (setMountType(0)) // this should always be true now, since we teleported already
@@ -13395,14 +13395,14 @@ public class PlayerInstance extends Playable
{
if (!isGM() && isIn7sDungeon() && (SevenSigns.getInstance().getPlayerCabal(this) != SevenSigns.getInstance().getCabalHighestScore()))
{
teleToLocation(MapRegionTable.TeleportWhereType.Town);
teleToLocation(TeleportWhereType.TOWN);
setIn7sDungeon(false);
sendMessage("You have been teleported to the nearest town due to the beginning of the Seal Validation period.");
}
}
else if (!isGM() && isIn7sDungeon() && (SevenSigns.getInstance().getPlayerCabal(this) == SevenSigns.CABAL_NULL))
{
teleToLocation(MapRegionTable.TeleportWhereType.Town);
teleToLocation(TeleportWhereType.TOWN);
setIn7sDungeon(false);
sendMessage("You have been teleported to the nearest town because you have not signed for any cabal.");
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java
View File

@@ -29,7 +29,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.handler.AutoChatHandler;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.StatSet;
@@ -1522,14 +1522,14 @@ public class SevenSigns
{
if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && !currPlayer.getString("cabal").equals(compWinner))
{
onlinePlayer.teleToLocation(MapRegionTable.TeleportWhereType.Town);
onlinePlayer.teleToLocation(TeleportWhereType.TOWN);
onlinePlayer.setIn7sDungeon(false);
onlinePlayer.sendMessage("You have been teleported to the nearest town due to the beginning of the Seal Validation period.");
}
}
else if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && !currPlayer.getString("cabal").equals(""))
{
onlinePlayer.teleToLocation(MapRegionTable.TeleportWhereType.Town);
onlinePlayer.teleToLocation(TeleportWhereType.TOWN);
onlinePlayer.setIn7sDungeon(false);
onlinePlayer.sendMessage("You have been teleported to the nearest town because you have not signed for any cabal.");
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java
View File

@@ -32,11 +32,11 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.datatables.xml.ExperienceData;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.StatSet;
@@ -4841,7 +4841,7 @@ public class SevenSignsFestival implements SpawnListener
// If an exception occurs, just move the player to the nearest town.
try
{
participant.teleToLocation(MapRegionTable.TeleportWhereType.Town);
participant.teleToLocation(TeleportWhereType.TOWN);
participant.sendMessage("You have been removed from the festival arena.");
}
catch (NullPointerException e2)

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/FortSiege.java
View File

@@ -28,9 +28,9 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.crypt.nProtect;
import org.l2jmobius.commons.crypt.nProtect.RestrictionType;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.instancemanager.FortSiegeGuardManager;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -260,13 +260,13 @@ public class FortSiege
unSpawnFlags();
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, TeleportWhereType.TOWN);
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.DefenderNotOwner, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.DefenderNotOwner, TeleportWhereType.TOWN);
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Spectator, TeleportWhereType.TOWN);
// Flag so that siege instance can be started
_isInProgress = false;
@@ -412,7 +412,7 @@ public class FortSiege
updatePlayerSiegeStateFlags(false);
// Teleport to the closest town
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, TeleportWhereType.TOWN);
// Spawn commander
spawnCommander(getFort().getFortId());
@@ -1021,7 +1021,7 @@ public class FortSiege
* @param teleportWho the teleport who
* @param teleportWhere the teleport where
*/
public void teleportPlayer(TeleportWhoType teleportWho, MapRegionTable.TeleportWhereType teleportWhere)
public void teleportPlayer(TeleportWhoType teleportWho, TeleportWhereType teleportWhere)
{
List<PlayerInstance> players;
switch (teleportWho)

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java
View File

@@ -30,9 +30,9 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.crypt.nProtect;
import org.l2jmobius.commons.crypt.nProtect.RestrictionType;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.instancemanager.MercTicketManager;
import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
@@ -330,13 +330,13 @@ public class Siege
removeFlags();
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, TeleportWhereType.TOWN);
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.DefenderNotOwner, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.DefenderNotOwner, TeleportWhereType.TOWN);
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Spectator, TeleportWhereType.TOWN);
// Flag so that siege instance can be started
_isInProgress = false;
@@ -508,10 +508,10 @@ public class Siege
}
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.SiegeFlag);
teleportPlayer(TeleportWhoType.Attacker, TeleportWhereType.SIEGEFLAG);
// Teleport to the second closest town
teleportPlayer(TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Spectator, TeleportWhereType.TOWN);
// Removes defenders' flags
removeDefenderFlags();
@@ -572,7 +572,7 @@ public class Siege
updatePlayerSiegeStateFlags(false);
// Teleport to the closest town
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, TeleportWhereType.TOWN);
_controlTowerCount = 0;
_controlTowerMaxCount = 0;
@@ -1147,7 +1147,7 @@ public class Siege
* @param teleportWho the teleport who
* @param teleportWhere the teleport where
*/
public void teleportPlayer(TeleportWhoType teleportWho, MapRegionTable.TeleportWhereType teleportWhere)
public void teleportPlayer(TeleportWhoType teleportWho, TeleportWhereType teleportWhere)
{
List<PlayerInstance> players;
switch (teleportWho)

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ArenaZone.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.zone.type;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -123,7 +123,7 @@ public class ArenaZone extends ZoneType
if (player.isOnline() == 1)
{
player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
}
}
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java
View File

@@ -23,7 +23,7 @@ import java.util.Map;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -119,7 +119,7 @@ public class BossZone extends ZoneType
if (!player.isGM() && player.isFlying() && !_IsFlyingEnable)
{
player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
return;
}
@@ -153,7 +153,7 @@ public class BossZone extends ZoneType
}
// teleport out all players who attempt "illegal" (re-)entry
player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
}
}
@@ -252,7 +252,7 @@ public class BossZone extends ZoneType
}
else
{
player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
return false;
}
}
@@ -286,7 +286,7 @@ public class BossZone extends ZoneType
if (player.isOnline() == 1)
{
player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
}
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -190,7 +190,7 @@ public class CastleZone extends ZoneType
continue;
}
((PlayerInstance) temp).teleToLocation(MapRegionTable.TeleportWhereType.Town);
((PlayerInstance) temp).teleToLocation(TeleportWhereType.TOWN);
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.zone.type;
import java.util.Map;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -150,7 +150,7 @@ public class ClanHallZone extends ZoneType
continue;
}
((PlayerInstance) temp).teleToLocation(MapRegionTable.TeleportWhereType.Town);
((PlayerInstance) temp).teleToLocation(TeleportWhereType.TOWN);
}
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CustomZone.java
View File

@@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.model.zone.type;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.zone.ZoneType;
@@ -69,7 +70,7 @@ public class CustomZone extends ZoneType
final PlayerInstance player = (PlayerInstance) creature;
if (!player.isGM() && player.isFlying() && !player.isInJail() && !_isFlyingEnable)
{
player.teleToLocation(org.l2jmobius.gameserver.datatables.csv.MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
}
if (_zoneName.equalsIgnoreCase("tradeoff"))

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/FortZone.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -190,7 +190,7 @@ public class FortZone extends ZoneType
continue;
}
((PlayerInstance) temp).teleToLocation(MapRegionTable.TeleportWhereType.Town);
((PlayerInstance) temp).teleToLocation(TeleportWhereType.TOWN);
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/OlympiadStadiumZone.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.zone.type;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable.TeleportWhereType;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -62,7 +62,7 @@ public class OlympiadStadiumZone extends ZoneType
}
else
{
creature.teleToLocation(TeleportWhereType.Town);
creature.teleToLocation(TeleportWhereType.TOWN);
}
}
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -32,8 +32,8 @@ import org.l2jmobius.commons.crypt.nProtect.RestrictionType;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.communitybbs.Manager.MailBBSManager;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.xml.AdminData;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.instancemanager.CoupleManager;
@@ -359,7 +359,7 @@ public class EnterWorld extends GameClientPacket
if (Olympiad.getInstance().playerInStadia(player))
{
player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
player.sendMessage("You have been teleported to the nearest town due to you being in an Olympiad Stadium");
}
@@ -427,7 +427,7 @@ public class EnterWorld extends GameClientPacket
if (!player.isGM() && (player.getSiegeState() < 2) && player.isInsideZone(ZoneId.SIEGE))
{
// Attacker or spectator logging in to a siege zone. Actually should be checked for inside castle only?
player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
player.teleToLocation(TeleportWhereType.TOWN);
player.sendMessage("You have been teleported to the nearest town due to you being in siege zone");
}

15
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
View File

@@ -21,6 +21,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -103,14 +104,14 @@ public class RequestRestartPoint extends GameClientPacket
Util.handleIllegalPlayerAction(_player, "Player " + _player.getName() + " used respawn cheat.", IllegalPlayerAction.PUNISH_KICK);
return;
}
loc = MapRegionTable.getInstance().getTeleToLocation(_player, MapRegionTable.TeleportWhereType.ClanHall);
loc = MapRegionTable.getInstance().getTeleToLocation(_player, TeleportWhereType.CLANHALL);
if ((ClanHallManager.getInstance().getClanHallByOwner(_player.getClan()) != null) && (ClanHallManager.getInstance().getClanHallByOwner(_player.getClan()).getFunction(ClanHall.FUNC_RESTORE_EXP) != null))
{
_player.restoreExp(ClanHallManager.getInstance().getClanHallByOwner(_player.getClan()).getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl());
}
break;
}
loc = MapRegionTable.getInstance().getTeleToLocation(_player, MapRegionTable.TeleportWhereType.Town);
loc = MapRegionTable.getInstance().getTeleToLocation(_player, TeleportWhereType.TOWN);
break;
}
case 2: // to castle
@@ -118,7 +119,7 @@ public class RequestRestartPoint extends GameClientPacket
Boolean isInDefense = false;
castle = CastleManager.getInstance().getCastle(_player);
fort = FortManager.getInstance().getFort(_player);
MapRegionTable.TeleportWhereType teleportWhere = MapRegionTable.TeleportWhereType.Town;
TeleportWhereType teleportWhere = TeleportWhereType.TOWN;
if ((castle != null) && castle.getSiege().isInProgress() && castle.getSiege().checkIsDefender(_player.getClan()))
{
isInDefense = true;
@@ -136,11 +137,11 @@ public class RequestRestartPoint extends GameClientPacket
}
if (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)
{
teleportWhere = MapRegionTable.TeleportWhereType.Castle;
teleportWhere = TeleportWhereType.CASTLE;
}
else if (FortManager.getInstance().getFortByOwner(_player.getClan()) != null)
{
teleportWhere = MapRegionTable.TeleportWhereType.Fortress;
teleportWhere = TeleportWhereType.FORTRESS;
}
loc = MapRegionTable.getInstance().getTeleToLocation(_player, teleportWhere);
break;
@@ -165,7 +166,7 @@ public class RequestRestartPoint extends GameClientPacket
Util.handleIllegalPlayerAction(_player, "Player " + _player.getName() + " used respawn cheat.", IllegalPlayerAction.PUNISH_KICK);
return;
}
loc = MapRegionTable.getInstance().getTeleToLocation(_player, MapRegionTable.TeleportWhereType.SiegeFlag);
loc = MapRegionTable.getInstance().getTeleToLocation(_player, TeleportWhereType.SIEGEFLAG);
break;
}
case 4: // Fixed or Player is a festival participant
@@ -196,7 +197,7 @@ public class RequestRestartPoint extends GameClientPacket
loc = new Location(17836, 170178, -3507); // Floran Village
break;
}
loc = MapRegionTable.getInstance().getTeleToLocation(_player, MapRegionTable.TeleportWhereType.Town);
loc = MapRegionTable.getInstance().getTeleToLocation(_player, TeleportWhereType.TOWN);
break;
}
}