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/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java vendored
View File

@@ -22,7 +22,7 @@ import java.io.PrintWriter;
import java.net.Socket;
import java.util.StringTokenizer;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -90,7 +90,7 @@ public class ChatsHandler implements ITelnetHandler
{
command = command.substring(7);
CreatureSay cs = new CreatureSay(0, Say2.ALLIANCE, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), command);
AdminTable.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs(cs);
_print.println("Your Message Has Been Sent To " + getOnlineGMS() + " GM(s).");
}
catch (StringIndexOutOfBoundsException e)
@@ -103,7 +103,7 @@ public class ChatsHandler implements ITelnetHandler
private int getOnlineGMS()
{
return AdminTable.getInstance().getAllGms(true).size();
return AdminData.getInstance().getAllGms(true).size();
}
@Override

4
trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java vendored
View File

@@ -38,7 +38,7 @@ import javolution.util.FastTable;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.LoginServerThread;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.ItemLocation;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.model.L2Object;
@@ -464,7 +464,7 @@ public class DebugHandler implements ITelnetHandler
private int getOnlineGMS()
{
return AdminTable.getInstance().getAllGms(true).size();
return AdminData.getInstance().getAllGms(true).size();
}
private String getUptime(int time)

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

@@ -24,7 +24,7 @@ import java.util.NoSuchElementException;
import java.util.StringTokenizer;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.instancemanager.PunishmentManager;
import com.l2jserver.gameserver.model.L2World;

6
trunk/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java vendored
View File

@@ -26,12 +26,12 @@ import java.util.StringTokenizer;
import javax.script.ScriptException;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.data.sql.impl.TeleportLocationTable;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.ItemTable;
import com.l2jserver.gameserver.datatables.MultisellData;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.datatables.TeleportLocationTable;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
import com.l2jserver.gameserver.instancemanager.QuestManager;

6
trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java vendored
View File

@@ -26,7 +26,7 @@ import java.util.Calendar;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.LoginServerThread;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.ItemLocation;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.model.L2Object;
@@ -103,7 +103,7 @@ public class StatusHandler implements ITelnetHandler
int igm = 0;
String gmList = "";
for (String player : AdminTable.getInstance().getAllGmNames(true))
for (String player : AdminData.getInstance().getAllGmNames(true))
{
gmList = gmList + ", " + player;
igm++;
@@ -224,7 +224,7 @@ public class StatusHandler implements ITelnetHandler
private int getOnlineGMS()
{
return AdminTable.getInstance().getAllGms(true).size();
return AdminData.getInstance().getAllGms(true).size();
}
private String getUptime(int time)