DP-Part for L2J/L2J_Server@c737f045e0ca3a52f4048df796e7b4e39d4e15e4

L2J_DataPack/dist/game/data/scripts/handlers/MasterHandler.java

@@ -18,28 +18,6 @@
  */
 package handlers;
 
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.handler.ActionHandler;
-import com.l2jserver.gameserver.handler.ActionShiftHandler;
-import com.l2jserver.gameserver.handler.AdminCommandHandler;
-import com.l2jserver.gameserver.handler.BypassHandler;
-import com.l2jserver.gameserver.handler.ChatHandler;
-import com.l2jserver.gameserver.handler.CommunityBoardHandler;
-import com.l2jserver.gameserver.handler.IHandler;
-import com.l2jserver.gameserver.handler.ItemHandler;
-import com.l2jserver.gameserver.handler.PunishmentHandler;
-import com.l2jserver.gameserver.handler.TargetHandler;
-import com.l2jserver.gameserver.handler.TelnetHandler;
-import com.l2jserver.gameserver.handler.UserCommandHandler;
-import com.l2jserver.gameserver.handler.VoicedCommandHandler;
-
 import handlers.actionhandlers.L2ArtefactInstanceAction;
 import handlers.actionhandlers.L2DecoyAction;
 import handlers.actionhandlers.L2DoorInstanceAction;
@@ -79,7 +57,6 @@ import handlers.admincommandhandlers.AdminEvents;
 import handlers.admincommandhandlers.AdminExpSp;
 import handlers.admincommandhandlers.AdminFightCalculator;
 import handlers.admincommandhandlers.AdminFortSiege;
-import handlers.admincommandhandlers.AdminGeoEditor;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
@@ -279,6 +256,28 @@ import handlers.voicedcommandhandlers.Lang;
 import handlers.voicedcommandhandlers.StatsVCmd;
 import handlers.voicedcommandhandlers.Wedding;
 
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.handler.ActionHandler;
+import com.l2jserver.gameserver.handler.ActionShiftHandler;
+import com.l2jserver.gameserver.handler.AdminCommandHandler;
+import com.l2jserver.gameserver.handler.BypassHandler;
+import com.l2jserver.gameserver.handler.ChatHandler;
+import com.l2jserver.gameserver.handler.CommunityBoardHandler;
+import com.l2jserver.gameserver.handler.IHandler;
+import com.l2jserver.gameserver.handler.ItemHandler;
+import com.l2jserver.gameserver.handler.PunishmentHandler;
+import com.l2jserver.gameserver.handler.TargetHandler;
+import com.l2jserver.gameserver.handler.TelnetHandler;
+import com.l2jserver.gameserver.handler.UserCommandHandler;
+import com.l2jserver.gameserver.handler.VoicedCommandHandler;
+
 /**
  * Master handler.
  * @author UnAfraid
@@ -354,7 +353,6 @@ public class MasterHandler
 			AdminFightCalculator.class,
 			AdminFortSiege.class,
 			AdminGeodata.class,
-			AdminGeoEditor.class,
 			AdminGm.class,
 			AdminGmChat.class,
 			AdminGraciaSeeds.class,

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java

@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2004-2015 L2J DataPack
- * 
- * This file is part of L2J DataPack.
- * 
- * L2J DataPack 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.
- * 
- * L2J DataPack 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 handlers.admincommandhandlers;
-
-import java.util.StringTokenizer;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.geoeditorcon.GeoEditorListener;
-import com.l2jserver.gameserver.handler.IAdminCommandHandler;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-
-/**
- * @author Luno, Dezmond
- */
-public class AdminGeoEditor implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_ge_status",
-		"admin_ge_mode",
-		"admin_ge_join",
-		"admin_ge_leave"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (!Config.ACCEPT_GEOEDITOR_CONN)
-		{
-			activeChar.sendMessage("Server do not accepts geoeditor connections now.");
-			return true;
-		}
-		if (command.startsWith("admin_ge_status"))
-		{
-			activeChar.sendMessage(GeoEditorListener.getInstance().getStatus());
-		}
-		else if (command.startsWith("admin_ge_mode"))
-		{
-			if (GeoEditorListener.getInstance().getThread() == null)
-			{
-				activeChar.sendMessage("Geoeditor not connected.");
-				return true;
-			}
-			try
-			{
-				String val = command.substring("admin_ge_mode".length());
-				StringTokenizer st = new StringTokenizer(val);
-				
-				if (st.countTokens() < 1)
-				{
-					activeChar.sendMessage("Usage: //ge_mode X");
-					activeChar.sendMessage("Mode 0: Don't send coordinates to geoeditor.");
-					activeChar.sendMessage("Mode 1: Send coordinates at ValidatePosition from clients.");
-					activeChar.sendMessage("Mode 2: Send coordinates each second.");
-					return true;
-				}
-				int m;
-				m = Integer.parseInt(st.nextToken());
-				GeoEditorListener.getInstance().getThread().setMode(m);
-				activeChar.sendMessage("Geoeditor connection mode set to " + m + ".");
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //ge_mode X");
-				activeChar.sendMessage("Mode 0: Don't send coordinates to geoeditor.");
-				activeChar.sendMessage("Mode 1: Send coordinates at ValidatePosition from clients.");
-				activeChar.sendMessage("Mode 2: Send coordinates each second.");
-				e.printStackTrace();
-			}
-			return true;
-		}
-		else if (command.equals("admin_ge_join"))
-		{
-			if (GeoEditorListener.getInstance().getThread() == null)
-			{
-				activeChar.sendMessage("Geoeditor not connected.");
-				return true;
-			}
-			GeoEditorListener.getInstance().getThread().addGM(activeChar);
-			activeChar.sendMessage("You added to list for geoeditor.");
-		}
-		else if (command.equals("admin_ge_leave"))
-		{
-			if (GeoEditorListener.getInstance().getThread() == null)
-			{
-				activeChar.sendMessage("Geoeditor not connected.");
-				return true;
-			}
-			GeoEditorListener.getInstance().getThread().removeGM(activeChar);
-			activeChar.sendMessage("You removed from list for geoeditor.");
-		}
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-}