Remove assert config.

L2_GameServer/java/com/l2jserver/Config.java

@@ -388,7 +388,6 @@ public final class Config
 	public static int LOG_GAME_DAMAGE_THRESHOLD;
 	public static boolean DEBUG;
 	public static boolean PACKET_HANDLER_DEBUG;
-	public static boolean ASSERT;
 	public static boolean DEVELOPER;
 	public static boolean ACCEPT_GEOEDITOR_CONN;
 	public static boolean TEST_SERVER;
@@ -1584,7 +1583,6 @@ public final class Config
 					LOG_GAME_DAMAGE_THRESHOLD = Integer.parseInt(General.getProperty("LogGameDamageThreshold", "5000"));
 					DEBUG = Boolean.parseBoolean(General.getProperty("Debug", "false"));
 					PACKET_HANDLER_DEBUG = Boolean.parseBoolean(General.getProperty("PacketHandlerDebug", "false"));
-					ASSERT = Boolean.parseBoolean(General.getProperty("Assert", "false"));
 					DEVELOPER = Boolean.parseBoolean(General.getProperty("Developer", "false"));
 					ACCEPT_GEOEDITOR_CONN = Boolean.parseBoolean(General.getProperty("AcceptGeoeditorConn", "false"));
 					TEST_SERVER = Boolean.parseBoolean(General.getProperty("TestServer", "false"));
@@ -2423,7 +2421,6 @@ public final class Config
 					DEBUG = Boolean.parseBoolean(serverSettings.getProperty("Debug", "false"));
 					PACKET_HANDLER_DEBUG = Boolean.parseBoolean(serverSettings.getProperty("PacketHandlerDebug", "false"));
 					DEVELOPER = Boolean.parseBoolean(serverSettings.getProperty("Developer", "false"));
-					ASSERT = Boolean.parseBoolean(serverSettings.getProperty("Assert", "false"));
 
 					ACCEPT_NEW_GAMESERVER = Boolean.parseBoolean(serverSettings.getProperty("AcceptNewGameServer","True"));
 					REQUEST_ID = Integer.parseInt(serverSettings.getProperty("RequestServerID","0"));

L2_GameServer/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -436,12 +436,12 @@ public class NpcTable
 		{
 			StatsSet npcDat = new StatsSet();
 			int id = NpcData.getInt("id");
+			int idTemp = NpcData.getInt("idTemplate");
 			
-			if (Config.ASSERT)
-				assert id < 1000000;
+			assert idTemp < 1000000;
 			
 			npcDat.set("npcId", id);
-			npcDat.set("idTemplate", NpcData.getInt("idTemplate"));
+			npcDat.set("idTemplate", idTemp);
 			int level = NpcData.getInt("level");
 			npcDat.set("level", level);
 			npcDat.set("jClass", NpcData.getString("class"));

L2_GameServer/java/com/l2jserver/gameserver/lib/Log.java

@@ -29,7 +29,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Logger;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 
@@ -115,7 +114,7 @@ public class Log
 	
 	public static final void Assert(boolean exp, String cmt)
 	{
-		if (exp || !Config.ASSERT)
+		if (exp)
 			return;
 		
 		_log.warning("Assertion error [" + cmt + "]");

L2_GameServer/java/com/l2jserver/gameserver/model/L2ItemInstance.java

@@ -225,7 +225,7 @@ public final class L2ItemInstance extends L2Object
      */
     public final void pickupMe(L2Character player)
     {
-        if (Config.ASSERT) assert getPosition().getWorldRegion() != null;
+        assert getPosition().getWorldRegion() != null;
 
         L2WorldRegion oldregion = getPosition().getWorldRegion();
 
@@ -460,7 +460,7 @@ public final class L2ItemInstance extends L2Object
 	 */
 	public int getLocationSlot()
 	{
-		if (Config.ASSERT) assert _loc == ItemLocation.PAPERDOLL || _loc == ItemLocation.PET_EQUIP || _loc == ItemLocation.INVENTORY || _loc == ItemLocation.MAIL;
+		assert _loc == ItemLocation.PAPERDOLL || _loc == ItemLocation.PET_EQUIP || _loc == ItemLocation.INVENTORY || _loc == ItemLocation.MAIL;
 		return _locData;
 	}
 
@@ -1451,8 +1451,7 @@ public final class L2ItemInstance extends L2Object
 
 		public final void run()
 		{
-			if (Config.ASSERT)
-				assert _itm.getPosition().getWorldRegion() == null;
+			assert _itm.getPosition().getWorldRegion() == null;
 
 			if (Config.GEODATA > 0 && _dropper != null)
 			{
@@ -1501,8 +1500,7 @@ public final class L2ItemInstance extends L2Object
 	 */
 	private void updateInDb()
     {
-		if (Config.ASSERT)
-			assert _existsInDb;
+		assert _existsInDb;
 
 		if (_wear)
 			return;
@@ -1559,8 +1557,7 @@ public final class L2ItemInstance extends L2Object
 	 */
 	private void insertIntoDb()
 	{
-		if (Config.ASSERT)
-			assert !_existsInDb && getObjectId() != 0;
+		assert !_existsInDb && getObjectId() != 0;
 
 		if (_wear)
 			return;
@@ -1619,8 +1616,7 @@ public final class L2ItemInstance extends L2Object
 	 */
 	private void removeFromDb()
     {
-		if (Config.ASSERT)
-			assert _existsInDb;
+		assert _existsInDb;
 
 		if (_wear)
 			return;

L2_GameServer/java/com/l2jserver/gameserver/model/L2Object.java

@@ -116,7 +116,7 @@ public abstract class L2Object
 
     public final int getX()
     {
-        if (Config.ASSERT) assert getPosition().getWorldRegion() != null || _isVisible;
+    	assert getPosition().getWorldRegion() != null || _isVisible;
         return getPosition().getX();
     }
 	/**
@@ -182,13 +182,13 @@ public abstract class L2Object
 
     public final int getY()
     {
-        if (Config.ASSERT) assert getPosition().getWorldRegion() != null || _isVisible;
+        assert getPosition().getWorldRegion() != null || _isVisible;
         return getPosition().getY();
     }
 
     public final int getZ()
     {
-        if (Config.ASSERT) assert getPosition().getWorldRegion() != null || _isVisible;
+        assert getPosition().getWorldRegion() != null || _isVisible;
         return getPosition().getZ();
     }
 
@@ -212,7 +212,7 @@ public abstract class L2Object
      */
     public final void decayMe()
     {
-        if (Config.ASSERT) assert getPosition().getWorldRegion() != null;
+        assert getPosition().getWorldRegion() != null;
 
         L2WorldRegion reg = getPosition().getWorldRegion();
 
@@ -257,7 +257,7 @@ public abstract class L2Object
      */
     public final void spawnMe()
     {
-        if (Config.ASSERT) assert getPosition().getWorldRegion() == null && getPosition().getWorldPosition().getX() != 0 && getPosition().getWorldPosition().getY() != 0 && getPosition().getWorldPosition().getZ() != 0;
+        assert getPosition().getWorldRegion() == null && getPosition().getWorldPosition().getX() != 0 && getPosition().getWorldPosition().getY() != 0 && getPosition().getWorldPosition().getZ() != 0;
 
         synchronized (this)
         {
@@ -282,7 +282,7 @@ public abstract class L2Object
 
     public final void spawnMe(int x, int y, int z)
     {
-        if (Config.ASSERT) assert getPosition().getWorldRegion() == null;
+        assert getPosition().getWorldRegion() == null;
 
         synchronized (this)
         {

L2_GameServer/java/com/l2jserver/gameserver/model/L2World.java

@@ -104,13 +104,12 @@ public final class L2World
 	 */
 	public void storeObject(L2Object object)
 	{
+		assert !_allObjects.containsKey(object.getObjectId());
+		
 		if (_allObjects.containsKey(object.getObjectId()))
 		{
 			if (Config.DEBUG)
 				_log.warning("[L2World] objectId " + object.getObjectId() + " already exist in OID map!");
-			if (Config.ASSERT)
-				throw new AssertionError();
-			
 			return;
 		}
 		

L2_GameServer/java/com/l2jserver/gameserver/model/L2WorldRegion.java

@@ -360,7 +360,7 @@ public final class L2WorldRegion
      */
     public void addVisibleObject(L2Object object)
     {
-        if (Config.ASSERT) assert object.getWorldRegion() == this;
+        assert object.getWorldRegion() == this;
         
         if (object == null) return;
         _visibleObjects.put(object.getObjectId(),object);
@@ -383,7 +383,7 @@ public final class L2WorldRegion
      */
     public void removeVisibleObject(L2Object object)
     {
-        if (Config.ASSERT) assert object.getWorldRegion() == this || object.getWorldRegion() == null;
+        assert object.getWorldRegion() == this || object.getWorldRegion() == null;
 
         if (object == null) return;
         _visibleObjects.remove(object.getObjectId());

L2_GameServer/java/com/l2jserver/gameserver/model/actor/position/ObjectPosition.java

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.model.actor.position;
 
 import java.util.logging.Logger;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
@@ -56,7 +55,7 @@ public class ObjectPosition
      */
     public final void setXYZ(int x, int y, int z)
     {
-        if (Config.ASSERT) assert getWorldRegion() != null;
+        assert getWorldRegion() != null;
 
         setWorldPosition(x, y ,z);
 
@@ -98,7 +97,7 @@ public class ObjectPosition
      */
     public final void setXYZInvisible(int x, int y, int z)
     {
-        if (Config.ASSERT) assert getWorldRegion() == null;
+        assert getWorldRegion() == null;
         if (x > L2World.MAP_MAX_X) x = L2World.MAP_MAX_X - 5000;
         if (x < L2World.MAP_MIN_X) x = L2World.MAP_MIN_X + 5000;
         if (y > L2World.MAP_MAX_Y) y = L2World.MAP_MAX_Y - 5000;

L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java

@@ -187,7 +187,7 @@ public abstract class Inventory extends ItemContainer
 			if (slot != PAPERDOLL_RHAND)
 				return;
 
-			if (Config.ASSERT) assert null == getPaperdollItem(PAPERDOLL_RHAND);
+			assert null == getPaperdollItem(PAPERDOLL_RHAND);
 
 			if (item.getItemType() == L2WeaponType.CROSSBOW)
 			{
@@ -203,7 +203,7 @@ public abstract class Inventory extends ItemContainer
 			if (slot != PAPERDOLL_RHAND)
 				return;
 
-			if (Config.ASSERT) assert item == getPaperdollItem(PAPERDOLL_RHAND);
+			assert item == getPaperdollItem(PAPERDOLL_RHAND);
 
 			if (item.getItemType() == L2WeaponType.CROSSBOW)
 			{
@@ -222,7 +222,7 @@ public abstract class Inventory extends ItemContainer
 			if (slot != PAPERDOLL_LRHAND)
 				return;
 
-			if (Config.ASSERT) assert null == getPaperdollItem(PAPERDOLL_LRHAND);
+			assert null == getPaperdollItem(PAPERDOLL_LRHAND);
 
 			if (item.getItemType() == L2WeaponType.BOW)
 			{
@@ -238,7 +238,7 @@ public abstract class Inventory extends ItemContainer
 			if (slot != PAPERDOLL_LRHAND)
 				return;
 
-			if (Config.ASSERT) assert item == getPaperdollItem(PAPERDOLL_LRHAND);
+			assert item == getPaperdollItem(PAPERDOLL_LRHAND);
 
 			if (item.getItemType() == L2WeaponType.BOW)
 			{
@@ -1026,8 +1026,8 @@ public abstract class Inventory extends ItemContainer
 	 */
 	public synchronized void addPaperdollListener(PaperdollListener listener)
 	{
-		if (Config.ASSERT) assert !_paperdollListeners.contains(listener);
-			_paperdollListeners.add(listener);
+		assert !_paperdollListeners.contains(listener);
+		_paperdollListeners.add(listener);
 	}
 
 	/** 

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java

@@ -303,12 +303,11 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 			_runSpd = cha.getOwner().getRunSpeed();
 			_walkSpd = cha.getOwner().getWalkSpeed();
 			
+			assert _idTemplate >= 13071 && _idTemplate <= 13076;
+			
 			if (_idTemplate < 13071 || _idTemplate > 13076)
 			{
-				if (Config.ASSERT)
-					throw new AssertionError("Using DecoyInfo packet with an unsupported decoy template: " + _idTemplate);
-				else
-					throw new IllegalArgumentException("Using DecoyInfo packet with an unsupported decoy template: " + _idTemplate);
+				throw new IllegalArgumentException("Using DecoyInfo packet with an unsupported decoy template: " + _idTemplate);
 			}
 			
 		}

L2_GameServer/java/com/l2jserver/gameserver/templates/StatsSet.java

@@ -18,9 +18,6 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.l2jserver.Config;
-
-
 import javolution.util.FastMap;
 
 /**
@@ -478,11 +475,9 @@ public final class StatsSet  {
 	 */
 	public void safeSet(String name, int value, int min, int max, String reference)
 	{
+		assert !((min <= max && (value < min || value >= max)));
 		if (min <= max && (value < min || value >= max))
 		{
-			if (Config.ASSERT)
-				throw new AssertionError("Incorrect value: "+value+"for: "+name+ "Ref: "+ reference);
-			
 			_log.log(Level.SEVERE, "Incorrect value: "+value+"for: "+name+ "Ref: "+ reference);
 		}
 		

L2_GameServer/java/com/l2jserver/util/L2ObjectHashMap.java

@@ -17,7 +17,6 @@ package com.l2jserver.util;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2Object;
 
 
@@ -144,7 +143,7 @@ public final class L2ObjectHashMap<T extends L2Object>
 		if (_count >= _table.length/2)
 			expand();
 		final int hashcode = obj.getObjectId();
-		if (Config.ASSERT) assert hashcode > 0;
+		assert hashcode > 0;
 		int seed = hashcode;
 		int incr = 1 + (((seed >> 5) + 1) % (_table.length - 1));
 		int ntry = 0;
@@ -173,7 +172,7 @@ public final class L2ObjectHashMap<T extends L2Object>
 				if (_table[pos] == obj)
 					return;
 				// this should never happen
-				if (Config.ASSERT) assert obj.getObjectId() != _table[pos].getObjectId();
+				 assert obj.getObjectId() != _table[pos].getObjectId();
 				// if there was no collisions at this slot, and we found a free
 				// slot previously - use found slot
 				if (slot >= 0 && _keys[pos] > 0)
@@ -203,7 +202,7 @@ public final class L2ObjectHashMap<T extends L2Object>
 	public synchronized void remove(T obj)
 	{
 		int hashcode = obj.getObjectId();
-		if (Config.ASSERT) assert hashcode > 0;
+		assert hashcode > 0;
 		int seed = hashcode;
 		int incr = 1 + (((seed >> 5) + 1) % (_table.length - 1));
 		int ntry = 0;
@@ -293,7 +292,7 @@ public final class L2ObjectHashMap<T extends L2Object>
 			if (obj == null)
 				continue;
 			final int hashcode = _keys[i] & 0x7FFFFFFF;
-			if (Config.ASSERT) assert hashcode == obj.getObjectId();
+			assert hashcode == obj.getObjectId();
 			int seed = hashcode;
 			int incr = 1 + (((seed >> 5) + 1) % (newSize - 1));
 			int ntry = 0;
@@ -302,7 +301,7 @@ public final class L2ObjectHashMap<T extends L2Object>
 				int pos = (seed % newSize) & 0x7FFFFFFF;
 				if (newTable[pos] == null)
 				{
-					if (Config.ASSERT) assert newKeys[pos] == 0 && hashcode != 0;
+					assert newKeys[pos] == 0 && hashcode != 0;
 					// found an empty slot without previous collisions,
 					// but use previously found slot
 					newKeys[pos] = hashcode;

L2_GameServer/java/com/l2jserver/util/L2ObjectHashSet.java

@@ -17,7 +17,6 @@ package com.l2jserver.util;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2Object;
 
 
@@ -145,7 +144,7 @@ public final class L2ObjectHashSet<T extends L2Object> extends L2ObjectSet<T>
 		if (_count >= _table.length/2)
 			expand();
 		final int hashcode = obj.getObjectId();
-		if (Config.ASSERT) assert hashcode > 0;
+		assert hashcode > 0;
 		int seed = hashcode;
 		int incr = 1 + (((seed >> 5) + 1) % (_table.length - 1));
 		int ntry = 0;
@@ -174,7 +173,7 @@ public final class L2ObjectHashSet<T extends L2Object> extends L2ObjectSet<T>
 				if (_table[pos] == obj)
 					return;
 				// this should never happen
-				if (Config.ASSERT) assert obj.getObjectId() != _table[pos].getObjectId();
+				assert obj.getObjectId() != _table[pos].getObjectId();
 				// if there was no collisions at this slot, and we found a free
 				// slot previously - use found slot
 				if (slot >= 0 && (_collisions[pos>>5] & (1<<(pos&31))) == 0)
@@ -207,7 +206,7 @@ public final class L2ObjectHashSet<T extends L2Object> extends L2ObjectSet<T>
 		if (!contains(obj))
 		    return;
 		int hashcode = obj.getObjectId();
-		if (Config.ASSERT) assert hashcode > 0;
+		assert hashcode > 0;
 		int seed = hashcode;
 		int incr = 1 + (((seed >> 5) + 1) % (_table.length - 1));
 		int ntry = 0;
@@ -253,7 +252,7 @@ public final class L2ObjectHashSet<T extends L2Object> extends L2ObjectSet<T>
 			return false;
 		}
 		int hashcode = obj.getObjectId();
-		if (Config.ASSERT) assert hashcode > 0;
+		assert hashcode > 0;
 		int seed = hashcode;
 		int incr = 1 + (((seed >> 5) + 1) % (size - 1));
 		int ntry = 0;

L2_GameServer/java/config/General.properties

@@ -673,9 +673,6 @@ Debug = False
 # Default: False
 PacketHandlerDebug = False
 
-# Default: False
-Assert = False
-
 # Default: False
 Developer = False