ソースを参照

remove some old stuff.

JIV 14 年 前
コミット
921bc3e046

+ 0 - 3
L2_GameServer/java/com/l2jserver/Config.java

@@ -57,7 +57,6 @@ public final class Config
 	// L2J Property File Definitions
 	//--------------------------------------------------
 	public static final String CHARACTER_CONFIG_FILE = "./config/Character.properties";
-	public static final String EXTENSIONS_CONFIG_FILE = "./config/extensions.properties";
 	public static final String FEATURE_CONFIG_FILE = "./config/Feature.properties";
 	public static final String FORTSIEGE_CONFIGURATION_FILE = "./config/fortsiege.properties";
 	public static final String GENERAL_CONFIG_FILE = "./config/General.properties";
@@ -484,7 +483,6 @@ public final class Config
 	public static boolean MOVE_BASED_KNOWNLIST;
 	public static long KNOWNLIST_UPDATE_INTERVAL;
 	public static int ZONE_TOWN;
-	public static boolean ACTIVATE_POSITION_RECORDER;
 	public static String DEFAULT_GLOBAL_CHAT;
 	public static String DEFAULT_TRADE_CHAT;
 	public static boolean ALLOW_WAREHOUSE;
@@ -1872,7 +1870,6 @@ public final class Config
 					ENABLE_FALLING_DAMAGE = "auto".equalsIgnoreCase(str) ? GEODATA > 0 : Boolean.parseBoolean(str);
 					
 					ZONE_TOWN = Integer.parseInt(General.getProperty("ZoneTown", "0"));
-					ACTIVATE_POSITION_RECORDER = Boolean.parseBoolean(General.getProperty("ActivatePositionRecorder", "False"));
 					DEFAULT_GLOBAL_CHAT = General.getProperty("GlobalChat", "ON");
 					DEFAULT_TRADE_CHAT = General.getProperty("TradeChat", "ON");
 					ALLOW_WAREHOUSE = Boolean.parseBoolean(General.getProperty("AllowWarehouse", "True"));

+ 0 - 89
L2_GameServer/java/com/l2jserver/gameserver/Crypt.java

@@ -1,89 +0,0 @@
-/*
- * 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 com.l2jserver.gameserver;
-
-import java.nio.ByteBuffer;
-
-
-/**
- * This class ...
- *
- * @version $Revision: 1.3.4.3 $ $Date: 2005/03/27 15:29:18 $
- */
-public class Crypt
-{
-	private final byte[] _key = new byte[16];
-	private boolean _isEnabled;
-	
-	public void setKey(byte[] key)
-	{
-		System.arraycopy(key,0, _key, 0, key.length);
-		_isEnabled = true;
-	}
-	
-	public void decrypt(ByteBuffer buf)
-	{
-		if (!_isEnabled)
-			return;
-		
-		final int sz = buf.remaining();
-		int temp = 0;
-		for (int i = 0; i < sz; i++)
-		{
-			int temp2 = buf.get(i);
-			buf.put(i, (byte)(temp2 ^ _key[i&15] ^ temp));
-			temp = temp2;
-		}
-		
-		int old = _key[8] &0xff;
-		old |= _key[9] << 8 &0xff00;
-		old |= _key[10] << 0x10 &0xff0000;
-		old |= _key[11] << 0x18 &0xff000000;
-		
-		old += sz;
-		
-		_key[8] = (byte)(old &0xff);
-		_key[9] = (byte)(old >> 0x08 &0xff);
-		_key[10] = (byte)(old >> 0x10 &0xff);
-		_key[11] = (byte)(old >> 0x18 &0xff);
-	}
-	
-	public void encrypt(ByteBuffer buf)
-	{
-		if (!_isEnabled)
-			return;
-		
-		int temp = 0;
-		final int sz = buf.remaining();
-		for (int i = 0; i < sz; i++)
-		{
-			int temp2 = buf.get(i);
-			temp = temp2 ^ _key[i&15] ^ temp;
-			buf.put(i, (byte) temp);
-		}
-		
-		int old = _key[8] &0xff;
-		old |= _key[9] << 8 &0xff00;
-		old |= _key[10] << 0x10 &0xff0000;
-		old |= _key[11] << 0x18 &0xff000000;
-		
-		old += sz;
-		
-		_key[8] = (byte)(old &0xff);
-		_key[9] = (byte)(old >> 0x08 &0xff);
-		_key[10] = (byte)(old >> 0x10 &0xff);
-		_key[11] = (byte)(old >> 0x18 &0xff);
-	}
-}

+ 0 - 48
L2_GameServer/java/com/l2jserver/gameserver/CustomPacketHandlerInterface.java

@@ -1,48 +0,0 @@
-/*
- * $HeadURL: $
- *
- * $Author: $
- * $Date: $
- * $Revision: $
- *
- *
- * 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 com.l2jserver.gameserver;
-
-import java.nio.ByteBuffer;
-
-import com.l2jserver.gameserver.network.L2GameClient;
-import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket;
-
-
-/**
- * This interface can be implemented by custom extensions to l2j to get packets
- * before the normal processing of PacketHandler
- *
- * @version $Revision: $ $Date: $
- * @author  galun
- */
-public interface CustomPacketHandlerInterface
-{
-	
-	/**
-	 * interface for a custom packethandler to ckeck received packets
-	 * PacketHandler will take care of the packet if this function returns null.
-	 * @param data the packet
-	 * @param client the ClientThread
-	 * @return a ClientBasePacket if the packet has been processed, null otherwise
-	 */
-	public L2GameClientPacket handlePacket(ByteBuffer data, L2GameClient client);
-}

+ 1 - 14
L2_GameServer/java/com/l2jserver/gameserver/GameServer.java

@@ -64,7 +64,6 @@ import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.NpcWalkerRoutesTable;
 import com.l2jserver.gameserver.datatables.OfflineTradersTable;
 import com.l2jserver.gameserver.datatables.PetDataTable;
-import com.l2jserver.gameserver.datatables.SummonSkillsTable;
 import com.l2jserver.gameserver.datatables.ResidentialSkillTable;
 import com.l2jserver.gameserver.datatables.SkillSpellbookTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
@@ -73,6 +72,7 @@ import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.datatables.StaticObjects;
 import com.l2jserver.gameserver.datatables.SubPledgeSkillTree;
 import com.l2jserver.gameserver.datatables.SummonItemsData;
+import com.l2jserver.gameserver.datatables.SummonSkillsTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
 import com.l2jserver.gameserver.datatables.UITable;
 import com.l2jserver.gameserver.geoeditorcon.GeoEditorListener;
@@ -133,7 +133,6 @@ import com.l2jserver.gameserver.scripting.L2ScriptEngineManager;
 import com.l2jserver.gameserver.taskmanager.AutoAnnounceTaskManager;
 import com.l2jserver.gameserver.taskmanager.KnownListUpdateTaskManager;
 import com.l2jserver.gameserver.taskmanager.TaskManager;
-import com.l2jserver.gameserver.util.DynamicExtension;
 import com.l2jserver.status.Status;
 import com.l2jserver.util.DeadLockDetector;
 import com.l2jserver.util.IPv4Filter;
@@ -397,8 +396,6 @@ public class GameServer
 		if (Config.ALLOW_MAIL)
 			MailManager.getInstance();
 		
-		//Universe.getInstance();
-		
 		if (Config.ACCEPT_GEOEDITOR_CONN)
 			GeoEditorListener.getInstance();
 		
@@ -406,16 +403,6 @@ public class GameServer
 		
 		_log.info("IdFactory: Free ObjectID's remaining: " + IdFactory.getInstance().size());
 		
-		// initialize the dynamic extension loader
-		try
-		{
-			DynamicExtension.getInstance();
-		}
-		catch (Exception ex)
-		{
-			_log.log(Level.WARNING, "DynamicExtension could not be loaded and initialized", ex);
-		}
-		
 		TvTManager.getInstance();
 		KnownListUpdateTaskManager.getInstance();
 		

+ 0 - 79
L2_GameServer/java/com/l2jserver/gameserver/PacketHistory.java

@@ -1,79 +0,0 @@
-/*
- * $Header: PacketHistory.java, 27/11/2005 01:57:03 luisantonioa Exp $
- *
- * $Author: luisantonioa $
- * $Date: 27/11/2005 01:57:03 $
- * $Revision: 1 $
- * $Log: PacketHistory.java,v $
- * Revision 1  27/11/2005 01:57:03  luisantonioa
- * Added copyright notice
- *
- *
- * 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 com.l2jserver.gameserver;
-
-import java.util.Date;
-import java.util.Map;
-
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-class PacketHistory
-{
-	protected Map<Class<?>, Long> _info;
-	protected long _timeStamp;
-	
-	protected static final XMLFormat<PacketHistory> PACKET_HISTORY_XML = new XMLFormat<PacketHistory>(PacketHistory.class)
-	{
-		@Override
-		public void read(InputElement xml, PacketHistory packetHistory) throws XMLStreamException
-		{
-			packetHistory._timeStamp = xml.getAttribute("time-stamp", 0);
-			packetHistory._info = xml.<Map<Class<?>, Long>> get("info");
-		}
-		
-		@Override
-		public void write(PacketHistory packetHistory, OutputElement xml) throws XMLStreamException
-		{
-			xml.setAttribute("time-stamp", new Date(packetHistory._timeStamp).toString());
-			
-			for (Class<?> cls : packetHistory._info.keySet())
-				xml.setAttribute(cls.getSimpleName(), packetHistory._info.get(cls));
-		}
-		
-		//		public void format(PacketHistory packetHistory, XmlElement xml)
-		//        {
-		//            xml.setAttribute("time-stamp", new Date(packetHistory.timeStamp).toString());
-		//
-		//            for (Class cls : packetHistory.info.keySet())
-		//            {
-		//                xml.setAttribute(cls.getSimpleName(), packetHistory.info.get(cls));
-		//            }
-		//        }
-		//
-		//        public PacketHistory parse(XmlElement xml)
-		//        {
-		//            PacketHistory packetHistory = new PacketHistory();
-		//            packetHistory.timeStamp     = xml.getAttribute("time-stamp", (long) 0);
-		//            packetHistory.info          = xml.<Map<Class, Long>> get("info");
-		//            return packetHistory;
-		//        }
-		//
-		//        public String defaultName()
-		//        {
-		//            return "packet-history";
-		//        }
-	};
-}

+ 0 - 494
L2_GameServer/java/com/l2jserver/gameserver/Universe.java

@@ -1,494 +0,0 @@
-/*
- * 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 com.l2jserver.gameserver;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.zip.GZIPInputStream;
-
-import javax.imageio.ImageIO;
-
-import com.l2jserver.Config;
-
-
-public class Universe implements java.io.Serializable
-{
-	
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = -2040223695811104704L;
-	public static final int MIN_X = -127900;
-	public static final int MAX_X = 194327;
-	public static final int MIN_Y = -30000;
-	public static final int MAX_Y = 259536;
-	public static final int MIN_Z = -17000;
-	public static final int MAX_Z = 17000;
-	public static final int MIN_X_GRID = 60;
-	public static final int MIN_Y_GRID = 60;
-	public static final int MIN_Z_GRID = 60;
-	public static final int MIN_GRID = 360;
-	protected static final Logger _log = Logger.getLogger(Universe.class.getName());
-	
-	protected List<Coord> _coordList;
-	
-	private HashSet<Integer> _logPlayers;
-	private boolean _logAll = true;
-	
-	public static void main(String[] args)
-	{
-		Universe u = new Universe();
-		u.load();
-		//u.removeDoubles();
-		u.implode(false);
-	}
-	
-	private static class Position implements Comparable<Position>, java.io.Serializable
-	{
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 */
-		private static final long serialVersionUID = -8798746764450022287L;
-		protected int _x;
-		protected int _flag;
-		protected int _y;
-		protected int _z;
-		
-		public int compareTo(Position obj)
-		{
-			int res = Integer.valueOf(_x).compareTo(obj._x);
-			if (res != 0)
-				return res;
-			res = Integer.valueOf(_y).compareTo(obj._y);
-			if (res != 0)
-				return res;
-			res = Integer.valueOf(_z).compareTo(obj._z);
-			return res;
-		}
-		
-		@Override
-		public String toString()
-		{
-			return String.valueOf(_x) + " " + _y + " " + _z + " " + _flag;
-		}
-	}
-	
-	private static class Coord implements Comparable<Position>, java.io.Serializable
-	{
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 */
-		private static final long serialVersionUID = -558060332886829552L;
-		protected int _x;
-		protected int _y;
-		protected int _z;
-		
-		public Coord(int x, int y, int z)
-		{
-			_x = x;
-			_y = y;
-			_z = z;
-		}
-		
-		public int compareTo(Position obj)
-		{
-			int res = Integer.valueOf(_x).compareTo(obj._x);
-			if (res != 0)
-				return res;
-			res = Integer.valueOf(_y).compareTo(obj._y);
-			if (res != 0)
-				return res;
-			res = Integer.valueOf(_z).compareTo(obj._z);
-			return res;
-		}
-		
-		@Override
-		public String toString()
-		{
-			return String.valueOf(_x) + " " + _y + " " + _z;
-		}
-	}
-	
-	public static Universe getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
-	private Universe()
-	{
-		_coordList = new LinkedList<Coord>();
-		_logPlayers = new HashSet<Integer>();
-		
-		ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new UniverseDump(), 30000, 30000);
-	}
-	
-	public void registerHeight(int x, int y, int z)
-	{
-		// don't overwrite obstacle entries
-		//Position p  = new Position(x, y, z, 0);
-		//_map.add(p);
-		_coordList.add(new Coord(x, y, z));
-	}
-	
-	public void registerObstacle(int x, int y, int z)
-	{
-		//Position p = new Position(x, y, z, -1);
-		//_map.add(p);
-		_coordList.add(new Coord(x, y, z));
-	}
-	
-	public boolean shouldLog(Integer id)
-	{
-		return (_logPlayers.contains(id) || _logAll);
-	}
-	
-	public void setLogAll(boolean flag)
-	{
-		_logAll = flag;
-	}
-	
-	public void addLogPlayer(Integer id)
-	{
-		_logPlayers.add(id);
-		_logAll = false;
-	}
-	
-	public void removeLogPlayer(Integer id)
-	{
-		_logPlayers.remove(id);
-	}
-	
-	public void loadAscii()
-	{
-		int initialSize = _coordList.size();
-		BufferedReader r = null;
-		try
-		{
-			r = new BufferedReader(new FileReader("data/universe.txt"));
-			String line;
-			while ((line = r.readLine()) != null)
-			{
-				StringTokenizer st = new StringTokenizer(line);
-				String x1 = st.nextToken();
-				String y1 = st.nextToken();
-				String z1 = st.nextToken();
-				//				String f1 = st.nextToken();
-				int x = Integer.parseInt(x1);
-				int y = Integer.parseInt(y1);
-				int z = Integer.parseInt(z1);
-				//				int f = Integer.parseInt(f1);
-				_coordList.add(new Coord(x, y, z));
-			}
-			_log.info((_coordList.size() - initialSize) + " additional nodes loaded from text file.");
-		}
-		catch (Exception e)
-		{
-			_log.info("could not read text file universe.txt");
-		}
-		finally
-		{
-			try
-			{
-				r.close();
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	public void createMap()
-	{
-		int zoom = 100;
-		int w = (MAX_X - MIN_X) / zoom;
-		int h = (MAX_Y - MIN_Y) / zoom;
-		BufferedImage bi = new BufferedImage(w, h, BufferedImage.TYPE_USHORT_GRAY);
-		Graphics2D gr = bi.createGraphics();
-		int min_z = 0, max_z = 0;
-		for (Coord pos : _coordList)
-		{
-			if (pos == null)
-				continue;
-			
-			if (pos._z < min_z)
-				min_z = pos._z;
-			if (pos._z > max_z)
-				max_z = pos._z;
-		}
-		for (Coord pos : _coordList)
-		{
-			if (pos == null)
-				continue;
-			
-			int x = (pos._x - MIN_X) / zoom;
-			int y = (pos._y - MIN_Y) / zoom;
-			int color = (int) (((long) pos._z - MIN_Z) * 0xFFFFFF / (MAX_Z - MIN_Z));
-			gr.setColor(new Color(color));
-			gr.drawLine(x, y, x, y);
-		}
-		try
-		{
-			ImageIO.write(bi, "png", new File("universe.png"));
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.WARNING, "Cannot create universe.png: " + e.getMessage(), e);
-		}
-	}
-	
-	public static class UniverseFilter implements FilenameFilter
-	{
-		String _ext = "";
-		
-		public UniverseFilter(String pExt)
-		{
-			_ext = pExt;
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
-		 */
-		public boolean accept(File arg0, String name)
-		{
-			return name.startsWith("universe") && name.endsWith("." + _ext);
-		}
-		
-	}
-	
-	public void load()
-	{
-		int total = 0;
-		if (_coordList == null)
-		{
-			_coordList = new LinkedList<Coord>();
-		}
-		try
-		{
-			loadBinFiles();
-			
-			loadHexFiles();
-			
-			loadFinFiles();
-			
-			_log.info(_coordList.size() + " map vertices loaded in total.");
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.WARNING, "", e);
-		}
-		_log.info("Total: " + total);
-	}
-	
-	/**
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	private void loadFinFiles() throws FileNotFoundException, IOException
-	{
-		FilenameFilter filter = new UniverseFilter("fin");
-		File directory = new File("data");
-		File[] files = directory.listFiles(filter);
-		for (File file : files)
-		{
-			FileInputStream fos = new FileInputStream(file); // Save to file
-			DataInputStream data = new DataInputStream(fos);
-			int count = data.readInt();
-			List<Coord> newMap = new LinkedList<Coord>();
-			for (int i = 0; i < count; i++)
-			{
-				newMap.add(new Coord(data.readInt(), data.readInt(), data.readInt()));
-			}
-			data.close(); // Close the stream.
-			
-			_log.info(newMap.size() + " map vertices loaded from file " + file.getName());
-			
-			_coordList.addAll(newMap);
-		}
-	}
-	
-	/**
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	private void loadHexFiles() throws FileNotFoundException, IOException
-	{
-		FilenameFilter filter = new UniverseFilter("hex");
-		File directory = new File("data");
-		File[] files = directory.listFiles(filter);
-		for (File file : files)
-		{
-			FileInputStream fos = new FileInputStream(file); // Save to file
-			GZIPInputStream gzos = new GZIPInputStream(fos);
-			DataInputStream data = new DataInputStream(gzos);
-			int count = data.readInt();
-			List<Coord> newMap = new LinkedList<Coord>();
-			for (int i = 0; i < count; i++)
-			{
-				newMap.add(new Coord(data.readInt(), data.readInt(), data.readInt()));
-				data.readInt();
-			}
-			data.close(); // Close the stream.
-			
-			_log.info(newMap.size() + " map vertices loaded from file " + file.getName());
-			
-			_coordList.addAll(newMap);
-		}
-	}
-	
-	/**
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 */
-	@SuppressWarnings(value = { "unchecked" })
-	private void loadBinFiles() throws FileNotFoundException, IOException, ClassNotFoundException
-	{
-		FilenameFilter filter = new UniverseFilter("bin");
-		File directory = new File("data");
-		File[] files = directory.listFiles(filter);
-		for (File file : files)
-		{
-			//Create necessary input streams
-			FileInputStream fis = new FileInputStream(file); // Read from file
-			GZIPInputStream gzis = new GZIPInputStream(fis); // Uncompress
-			ObjectInputStream in = new ObjectInputStream(gzis); // Read objects
-			// Read in an object. It should be a vector of scribbles
-			
-			TreeSet<Position> temp = (TreeSet<Position>) in.readObject();
-			_log.info(temp.size() + " map vertices loaded from file " + file.getName());
-			in.close(); // Close the stream.
-			for (Position p : temp)
-			{
-				_coordList.add(new Coord(p._x, p._y, p._z));
-			}
-		}
-	}
-	
-	public class UniverseDump implements Runnable
-	{
-		/* (non-Javadoc)
-		 * @see java.lang.Runnable#run()
-		 */
-		public void run()
-		{
-			int size = _coordList.size();
-			//_log.info("Univere Map has " + _map.size() + " nodes.");
-			if (size > 100000)
-			{
-				flush();
-			}
-		}
-	}
-	
-	public void flush()
-	{
-		//_log.info("Size of dump: "+coordList.size());
-		List<Coord> oldMap = _coordList;
-		_coordList = new LinkedList<Coord>();
-		int size = oldMap.size();
-		dump(oldMap, true);
-		_log.info("Universe Map : Dumped " + size + " vertices.");
-	}
-	
-	public int size()
-	{
-		int size = 0;
-		if (_coordList != null)
-			size = _coordList.size();
-		return size;
-	}
-	
-	public void dump(List<Coord> _map, boolean b)
-	{
-		FileOutputStream fos = null;
-		DataOutputStream data = null;
-		try
-		{
-			String pad = "";
-			if (b)
-				pad = "" + System.currentTimeMillis();
-			fos = new FileOutputStream("data/universe" + pad + ".fin"); // Save to file
-			data = new DataOutputStream(fos);
-			int count = _map.size();
-			//_log.info("Size of dump: "+count);
-			data.writeInt(count);
-			
-			for (Coord p : _map)
-			{
-				if (p != null)
-				{
-					data.writeInt(p._x);
-					data.writeInt(p._y);
-					data.writeInt(p._z);
-				}
-			}
-			_log.info("Universe Map saved to: " + "data/universe" + pad + ".fin");
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.WARNING, "", e);
-		}
-		finally
-		{
-			try
-			{
-				data.close();
-			}
-			catch (Exception e)
-			{
-			}
-			
-			try
-			{
-				fos.close();
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	// prepare for shutdown
-	public void implode(boolean b)
-	{
-		createMap();
-		dump(_coordList, b);
-	}
-	
-	@SuppressWarnings("synthetic-access")
-	private static class SingletonHolder
-	{
-		protected static final Universe _instance = Config.ACTIVATE_POSITION_RECORDER ? new Universe() : null;
-	}
-}

+ 0 - 6
L2_GameServer/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -28,7 +28,6 @@ import java.util.List;
 
 import javolution.util.FastList;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Effect;
@@ -680,11 +679,6 @@ public class L2CharacterAI extends AbstractAI
 	@Override
 	protected void onEvtArrived()
 	{
-		// Launch an explore task if necessary
-		if (Config.ACTIVATE_POSITION_RECORDER && _accessor.getActor() instanceof L2PcInstance)
-		{
-			((L2PcInstance) _accessor.getActor()).explore();
-		}
 		_accessor.getActor().revalidateZone(true);
 		
 		if (_accessor.getActor().moveToNextRoutePoint())

+ 0 - 32
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -48,7 +48,6 @@ import com.l2jserver.gameserver.RecipeController;
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.SevenSignsFestival;
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.Universe;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2CharacterAI;
 import com.l2jserver.gameserver.ai.L2PlayerAI;
@@ -96,7 +95,6 @@ import com.l2jserver.gameserver.model.CharEffectList;
 import com.l2jserver.gameserver.model.Elementals;
 import com.l2jserver.gameserver.model.FishData;
 import com.l2jserver.gameserver.model.L2AccessLevel;
-import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2Effect;
@@ -1349,36 +1347,6 @@ public final class L2PcInstance extends L2Playable
 		return ai;
 	}
 	
-	
-	/**
-	 * Calculate a destination to explore the area and set the AI Intention to AI_INTENTION_MOVE_TO.<BR><BR>
-	 */
-	public void explore()
-	{
-		if (!_exploring) return;
-		
-		if(getMountType() == 2)
-			return;
-		
-		// Calculate the destination point (random)
-		
-		int x = getX()+Rnd.nextInt(6000)-3000;
-		int y = getY()+Rnd.nextInt(6000)-3000;
-		
-		if (x > Universe.MAX_X) x = Universe.MAX_X;
-		if (x < Universe.MIN_X) x = Universe.MIN_X;
-		if (y > Universe.MAX_Y) y = Universe.MAX_Y;
-		if (y < Universe.MIN_Y) y = Universe.MIN_Y;
-		
-		int z = getZ();
-		
-		L2CharPosition pos = new L2CharPosition(x,y,z,0);
-		
-		// Set the AI Intention to AI_INTENTION_MOVE_TO
-		getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO,pos);
-		
-	}
-	
 	/** Return the Level of the L2PcInstance. */
 	@Override
 	public final int getLevel() { return getStat().getLevel(); }

+ 0 - 299
L2_GameServer/java/com/l2jserver/gameserver/util/DynamicExtension.java

@@ -1,299 +0,0 @@
-/*
- * 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 com.l2jserver.gameserver.util;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.l2jserver.Config;
-
-
-/**
- * extension loader for l2j
- * @author galun
- * @version $Id: DynamicExtension.java,v 1.3 2006/05/14 17:19:39 galun Exp $
- */
-public class DynamicExtension
-{
-	private static Logger _log = Logger.getLogger(DynamicExtension.class.getCanonicalName());
-	private JarClassLoader _classLoader;
-	private Properties _prop;
-	private ConcurrentHashMap<String, Object> _loadedExtensions;
-	private ConcurrentHashMap<String, ExtensionFunction> _getters;
-	private ConcurrentHashMap<String, ExtensionFunction> _setters;
-	
-	/**
-	 * create an instance of DynamicExtension
-	 * this will be done by GameServer according to the altsettings.properties
-	 *
-	 */
-	private DynamicExtension()
-	{
-		_getters = new ConcurrentHashMap<String, ExtensionFunction>();
-		_setters = new ConcurrentHashMap<String, ExtensionFunction>();
-		initExtensions();
-	}
-	
-	/**
-	 * get the singleton of DynamicInstance
-	 * @return the singleton instance
-	 */
-	public static DynamicExtension getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
-	/**
-	 * get an extension object by class name
-	 * @param className he class name as defined in the extension properties
-	 * @return the object or null if not found
-	 */
-	public Object getExtension(String className)
-	{
-		return _loadedExtensions.get(className);
-	}
-	
-	/**
-	 * initialize all configured extensions
-	 *
-	 */
-	public String initExtensions()
-	{
-		_prop = new Properties();
-		String res = "";
-		_loadedExtensions = new ConcurrentHashMap<String, Object>();
-		try
-		{
-			_prop.load(new FileInputStream(Config.EXTENSIONS_CONFIG_FILE));
-		}
-		catch (FileNotFoundException ex)
-		{
-			_log.info(ex.getMessage() + ": no extensions to load");
-		}
-		catch (Exception ex)
-		{
-			_log.log(Level.WARNING, "could not load properties", ex);
-		}
-		_classLoader = new JarClassLoader();
-		for (Object o : _prop.keySet())
-		{
-			String k = (String) o;
-			if (k.endsWith("Class"))
-			{
-				res += initExtension(_prop.getProperty(k)) + "\n";
-			}
-		}
-		return res;
-	}
-	
-	/**
-	 * init a named extension
-	 * @param name the class name and optionally a jar file name delimited with a '@' if the jar file is not
-	 * in the class path
-	 */
-	public String initExtension(String name)
-	{
-		String className = name;
-		String[] p = name.split("@");
-		String res = name + " loaded";
-		if (p.length > 1)
-		{
-			_classLoader.addJarFile(p[1]);
-			className = p[0];
-		}
-		if (_loadedExtensions.containsKey(className))
-			return "already loaded";
-		try
-		{
-			Class<?> extension = Class.forName(className, true, _classLoader);
-			Object obj = extension.newInstance();
-			extension.getMethod("init", new Class[0]).invoke(obj, new Object[0]);
-			_log.info("Extension " + className + " loaded.");
-			_loadedExtensions.put(className, obj);
-		}
-		catch (Exception ex)
-		{
-			_log.log(Level.WARNING, name, ex);
-			res = ex.toString();
-		}
-		return res;
-	}
-	
-	/**
-	 * create a new class loader which resets the cache (jar files and loaded classes)
-	 * on next class loading request it will read the jar again
-	 */
-	protected void clearCache()
-	{
-		_classLoader = new JarClassLoader();
-	}
-	
-	/**
-	 * call unloadExtension() for all known extensions
-	 *
-	 */
-	public String unloadExtensions()
-	{
-		String res = "";
-		for (String e : _loadedExtensions.keySet())
-			res += unloadExtension(e) + "\n";
-		return res;
-	}
-	
-	/**
-	 * get all loaded extensions
-	 * @return a String array with the class names
-	 */
-	public String[] getExtensions()
-	{
-		String[] l = new String[_loadedExtensions.size()];
-		_loadedExtensions.keySet().toArray(l);
-		return l;
-	}
-	
-	/**
-	 * unload a named extension
-	 * @param name the class name and optionally a jar file name delimited with a '@'
-	 */
-	public String unloadExtension(String name)
-	{
-		String className = name;
-		String[] p = name.split("@");
-		if (p.length > 1)
-		{
-			_classLoader.addJarFile(p[1]);
-			className = p[0];
-		}
-		String res = className + " unloaded";
-		try
-		{
-			Object obj = _loadedExtensions.get(className);
-			Class<?> extension = obj.getClass();
-			_loadedExtensions.remove(className);
-			extension.getMethod("unload", new Class[0]).invoke(obj, new Object[0]);
-			_log.info("Extension " + className + " unloaded.");
-		}
-		catch (Exception ex)
-		{
-			_log.log(Level.WARNING, "could not unload " + className, ex);
-			res = ex.toString();
-		}
-		return res;
-	}
-	
-	/**
-	 * unloads all extensions, resets the cache and initializes all configured extensions
-	 *
-	 */
-	public void reload()
-	{
-		unloadExtensions();
-		clearCache();
-		initExtensions();
-	}
-	
-	/**
-	 * unloads a named extension, resets the cache and initializes the extension
-	 * @param name the class name and optionally a jar file name delimited with a '@' if the jar file is not
-	 * in the class path
-	 */
-	public void reload(String name)
-	{
-		unloadExtension(name);
-		clearCache();
-		initExtension(name);
-	}
-	
-	/**
-	 * register a getter function given a (hopefully) unique name
-	 * @param name the name of the function
-	 * @param function the ExtensionFunction implementation
-	 */
-	public void addGetter(String name, ExtensionFunction function)
-	{
-		_getters.put(name, function);
-	}
-	
-	/**
-	 * deregister a getter function
-	 * @param name the name used for registering
-	 */
-	public void removeGetter(String name)
-	{
-		_getters.remove(name);
-	}
-	
-	/**
-	 * call a getter function registered with DynamicExtension
-	 * @param name the function name
-	 * @param arg a function argument
-	 * @return an object from the extension
-	 */
-	public Object get(String name, String arg)
-	{
-		ExtensionFunction func = _getters.get(name);
-		if (func != null)
-			return func.get(arg);
-		return "<none>";
-	}
-	
-	/**
-	 * register a setter function given a (hopefully) unique name
-	 * @param name the name of the function
-	 * @param function the ExtensionFunction implementation
-	 */
-	public void addSetter(String name, ExtensionFunction function)
-	{
-		_setters.put(name, function);
-	}
-	
-	/**
-	 * deregister a setter function
-	 * @param name the name used for registering
-	 */
-	public void removeSetter(String name)
-	{
-		_setters.remove(name);
-	}
-	
-	/**
-	 * call a setter function registered with DynamicExtension
-	 * @param name the function name
-	 * @param arg a function argument
-	 * @param obj an object to set
-	 */
-	public void set(String name, String arg, Object obj)
-	{
-		ExtensionFunction func = _setters.get(name);
-		if (func != null)
-			func.set(arg, obj);
-	}
-	
-	public JarClassLoader getClassLoader()
-	{
-		return _classLoader;
-	}
-	
-	@SuppressWarnings("synthetic-access")
-	private static class SingletonHolder
-	{
-		protected static final DynamicExtension _instance = new DynamicExtension();
-	}
-}

+ 0 - 63
L2_GameServer/java/com/l2jserver/status/GameStatusThread.java

@@ -86,7 +86,6 @@ import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.UserInfo;
 import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
-import com.l2jserver.gameserver.util.DynamicExtension;
 import com.l2jserver.gameserver.util.GMAudit;
 
 
@@ -251,10 +250,6 @@ public class GameStatusThread extends Thread
 					_print.println("abort                 - aborts shutdown/restart.");
 					_print.println("give <player> <itemid> <amount>");
 					_print.println("enchant <player> <itemType> <enchant> (itemType: 1 - Helmet, 2 - Chest, 3 - Gloves, 4 - Feet, 5 - Legs, 6 - Right Hand, 7 - Left Hand, 8 - Left Ear, 9 - Right Ear , 10 - Left Finger, 11 - Right Finger, 12- Necklace, 13 - Underwear, 14 - Back, 15 - Belt, 0 - No Enchant)");
-					_print.println("extlist               - list all loaded extension classes");
-					_print.println("extreload <name>      - reload and initializes the named extension or all if used without argument");
-					_print.println("extinit <name>        - initilizes the named extension or all if used without argument");
-					_print.println("extunload <name>      - unload the named extension or all if used without argument");
 					_print.println("debug <cmd>           - executes the debug command (see 'help debug').");
 					_print.println("reload <type>         - reload data");
 					_print.println("jail <player> [time]");
@@ -887,64 +882,6 @@ public class GameStatusThread extends Thread
 					}
 					catch(Exception e){}
 				}
-				else if (_usrCommand.startsWith("extreload")) {
-					String[] args = _usrCommand.split("\\s+");
-					if (args.length > 1) {
-						for (int i = 1; i < args.length; i++)
-							DynamicExtension.getInstance().reload(args[i]);
-					} else {
-						DynamicExtension.getInstance().reload();
-					}
-				}
-				else if (_usrCommand.startsWith("extinit")) {
-					String[] args = _usrCommand.split("\\s+");
-					if (args.length > 1) {
-						for (int i = 1; i < args.length; i++)
-							_print.print(DynamicExtension.getInstance().initExtension(args[i]) + "\r\n");
-					} else {
-						_print.print(DynamicExtension.getInstance().initExtensions());
-					}
-				}
-				else if (_usrCommand.startsWith("extunload")) {
-					String[] args = _usrCommand.split("\\s+");
-					if (args.length > 1) {
-						for (int i = 1; i < args.length; i++)
-							_print.print(DynamicExtension.getInstance().unloadExtension(args[i]) + "\r\n");
-					} else {
-						_print.print(DynamicExtension.getInstance().unloadExtensions());
-					}
-				}
-				else if (_usrCommand.startsWith("extlist")) {
-					for (String e : DynamicExtension.getInstance().getExtensions())
-						_print.print(e + "\r\n");
-				}
-				else if (_usrCommand.startsWith("get")) {
-					Object o = null;
-					try {
-						String[] args = _usrCommand.substring(3).split("\\s+");
-						if (args.length == 1)
-							o = DynamicExtension.getInstance().get(args[0], null);
-						else
-							o = DynamicExtension.getInstance().get(args[0], args[1]);
-					} catch (Exception ex) {
-						_print.print(ex.toString() + "\r\n");
-					}
-					if (o != null)
-						_print.print(o.toString() + "\r\n");
-				}
-				else if (_usrCommand.length() > 0) {
-					try {
-						String[] args = _usrCommand.split("\\s+");
-						if (args.length == 1)
-							DynamicExtension.getInstance().set(args[0], null, null);
-						else if (args.length == 2)
-							DynamicExtension.getInstance().set(args[0], null, args[1]);
-						else
-							DynamicExtension.getInstance().set(args[0], args[1], args[2]);
-					} catch (Exception ex) {
-						_print.print(ex.toString());
-					}
-				}
 				else if (_usrCommand.length() == 0) { /* Do Nothing Again - Same reason as the quit part */ }
 				_print.print("");
 				_print.flush();

+ 0 - 94
L2_GameServer/java/com/l2jserver/util/lib/memcache.java

@@ -1,94 +0,0 @@
-/*
- * 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 com.l2jserver.util.lib;
-
-import java.util.HashMap;
-import java.util.logging.Logger;
-
-@Deprecated
-public class memcache
-{
-	private static Logger _log = Logger.getLogger(memcache.class.getName());
-	private HashMap<Integer, String> _hms;
-	private HashMap<Integer, Integer> _hmi;
-	private HashMap<Integer, Long> _lastAccess;
-	
-	public static memcache getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
-	private memcache()
-	{
-		_hms = new HashMap<Integer, String>();
-		_hmi = new HashMap<Integer, Integer>();
-		_lastAccess = new HashMap<Integer, Long>();
-	}
-	
-	private void checkExpired()
-	{
-		for (Integer k : _hmi.keySet())
-			if (_lastAccess.get(k) + 3600000 < System.currentTimeMillis())
-			{
-				//				_hmi.remove(k);
-				//				_last_access.remove(k);
-			}
-		
-		for (Integer k : _hms.keySet())
-			if (_lastAccess.get(k) + 3600000 < System.currentTimeMillis())
-			{
-				//				_hms.remove(k);
-				//				_last_access.remove(k);
-			}
-	}
-	
-	public void set(String type, String key, int value)
-	{
-		int hash = (type + "->" + key).hashCode();
-		//_log.fine("Set memcache "+type+"("+key+")["+hash+"] to "+value);
-		_hmi.put(hash, value);
-		_lastAccess.put(hash, System.currentTimeMillis());
-		checkExpired();
-	}
-	
-	@Deprecated
-	public boolean isSet(String type, String key)
-	{
-		int hash = (type + "->" + key).hashCode();
-		boolean exists = _hmi.containsKey(hash) || _hms.containsKey(hash);
-		if (exists)
-			_lastAccess.put(hash, System.currentTimeMillis());
-		
-		checkExpired();
-		_log.fine("Check exists memcache " + type + "(" + key + ")[" + hash + "] is " + exists);
-		return exists;
-	}
-	
-	@Deprecated
-	public Integer getInt(String type, String key)
-	{
-		int hash = (type + "->" + key).hashCode();
-		_lastAccess.put(hash, System.currentTimeMillis());
-		checkExpired();
-		_log.fine("Get memcache " + type + "(" + key + ")[" + hash + "] = " + _hmi.get(hash));
-		return _hmi.get(hash);
-	}
-	
-	@SuppressWarnings("synthetic-access")
-	private static class SingletonHolder
-	{
-		protected static final memcache _instance = new memcache();
-	}
-}

+ 0 - 4
L2_GameServer/java/config/General.properties

@@ -478,10 +478,6 @@ EnableFallingDamage = Auto
 # Default: 0
 ZoneTown = 0
 
-# Activates the position recorder. Valid 3D points will be recorded and written to data/universe.txt on shutdown.
-# Default: False
-ActivatePositionRecorder = False
-
 # Global Chat.
 # Available Options: ON, OFF, GM, GLOBAL
 # Default: ON

+ 0 - 1
L2_GameServer/java/config/extensions.properties

@@ -1 +0,0 @@
-# Configuration file for dynamic extensions