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

Sync with L2jServer HighFive Aug 21st 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-08-21 19:26:53 +00:00
parent 4b3a3e6d1e
commit dc0694ccef
17 changed files with 116 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java vendored
View File

@ -245,7 +245,7 @@ public class TarBeetleSpawn implements IXmlReader
}
catch (Exception e)
{
e.printStackTrace();
LOGGER.warning(getClass().getSimpleName() + ": Could not refresh spawns!");
}
}

2
trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java vendored
View File

@ -104,7 +104,7 @@ public final class TeleportToRaceTrack extends AbstractNpcAI
else
{
player.teleToLocation(TELEPORT);
player.getVariables().set(MONSTER_RETURN, String.valueOf(TELEPORTERS.get(npc.getId())));
player.getVariables().set(MONSTER_RETURN, TELEPORTERS.get(npc.getId()));
}
return super.onTalk(npc, player);
}

6
trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java vendored
View File

@ -46,8 +46,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
{
new Location(45109, 112124, -1900), // 30%
new Location(47653, 110816, -2110), // 40%
new Location(47247, 109396, -2000)
// 30%
new Location(47247, 109396, -2000), // 30%
};
private L2Spawn _nurka;
@ -86,8 +85,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
}
catch (Exception e)
{
_log.warning(getName() + ": Couldnt set the Bloody Lord Nurka spawn");
e.printStackTrace();
_log.warning(getName() + ": Couldn't set the Bloody Lord Nurka spawn!");
}
}

20
trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@ -686,7 +686,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
{
if ((arena < 0) || (arena > 3))
{
_log.warning("RainbowSptringChateau siege: Wrong arena id passed: " + arena);
_log.warning("RainbowSptringChateau siege: Wrong arena ID passed: " + arena);
return;
}
for (L2PcInstance pc : leader.getParty().getMembers())
@ -725,7 +725,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
catch (Exception e)
{
e.printStackTrace();
// _log.warning("Unable to spawn guard for clan index " + i + "!");
}
}
SpawnTable.getInstance().addNewSpawn(_gourds[i], false);
@ -844,7 +844,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
catch (Exception e)
{
e.printStackTrace();
// _log.warning(RainbowSpringsChateau.class.getSigners() + ": Unable to remove attacker clan ID " + clanId + " from database!");
}
}
@ -859,7 +859,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
catch (Exception e)
{
e.printStackTrace();
// _log.warning(RainbowSpringsChateau.class.getSigners() + ": Unable add attakers for clan ID " + clanId + " and count " + count + "!");
}
}
@ -867,19 +867,17 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
public void loadAttackers()
{
try (Connection con = ConnectionFactory.getInstance().getConnection();
Statement s = con.createStatement())
Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SELECT * FROM rainbowsprings_attacker_list"))
{
try (ResultSet rset = s.executeQuery("SELECT * FROM rainbowsprings_attacker_list"))
while (rset.next())
{
while (rset.next())
{
_warDecreesCount.put(rset.getInt("clan_id"), rset.getLong("decrees_count"));
}
_warDecreesCount.put(rset.getInt("clan_id"), rset.getLong("decrees_count"));
}
}
catch (Exception e)
{
e.printStackTrace();
_log.warning(RainbowSpringsChateau.class.getSigners() + ": Unable load attakers!");
}
}

4
trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java vendored
View File

@ -547,7 +547,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
endSiege();
_log.warning(getName() + ": Problems in siege initialization!");
e.printStackTrace();
}
}
}
@ -653,8 +652,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
catch (Exception e)
{
_log.warning(getName() + ": Couldnt make clan spawns: " + e.getMessage());
e.printStackTrace();
_log.warning(getName() + ": Could not make clan spawns: " + e.getMessage());
}
}

7
trunk/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java vendored
View File

@ -22,6 +22,7 @@ import java.io.PrintWriter;
import java.net.Socket;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
@ -59,6 +60,8 @@ public class PlayerHandler implements ITelnetHandler
@Override
public boolean useCommand(String command, PrintWriter _print, Socket _cSocket, int _uptime)
{
final Logger LOGGER = Logger.getLogger(PlayerHandler.class.getName());
if (command.startsWith("kick"))
{
try
@ -246,7 +249,7 @@ public class PlayerHandler implements ITelnetHandler
{
if (Config.DEBUG)
{
e.printStackTrace();
LOGGER.info("Could not jail player via telnet!");
}
}
}
@ -276,7 +279,7 @@ public class PlayerHandler implements ITelnetHandler
{
if (Config.DEBUG)
{
e.printStackTrace();
LOGGER.info("Could not unjail player via telnet!");
}
}
}