Pārlūkot izejas kodu

BETA: Misc fixes:
* Removing unused method at !LoginServerThread.
* Avoiding useless log from c3p0.
* Minor update for log at !L2PetInstance.
* Minor update for class JavaDoc at !EnchantGroupsData.
* Minor format for !HennaInfo.
* Minor improvement for !RaidBossSpawnManager.

Zoey76 13 gadi atpakaļ
vecāks
revīzija
7120a8797f

+ 1 - 1
L2J_Server_BETA/dist/game/log.cfg

@@ -159,4 +159,4 @@ AltPrivilegesAdmin.append = true
 AltPrivilegesAdmin.level = CONFIG
 
 # c3p0 Logging
-com.mchange.v2.c3p0.level = WARNING
+com.mchange.v2.level = WARNING

+ 0 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -790,15 +790,6 @@ public class LoginServerThread extends Thread
 		return ServerStatus.STATUS_STRING[_status];
 	}
 	
-	/**
-	 * Checks if is bracket shown.
-	 * @return true, if is bracket shown
-	 */
-	public boolean isBracketShown()
-	{
-		return Config.SERVER_LIST_BRACKET;
-	}
-	
 	/**
 	 * Gets the server name.
 	 * @return the server name.

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantGroupsData.java

@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
- * This class holds the Enchant Groups information.<br>
+ * This class holds the Enchant Groups information.
  * @author Micr0
  */
 public class EnchantGroupsData extends DocumentParser

+ 0 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -268,7 +268,6 @@ public class SpawnTable
 	
 	public void deleteSpawn(L2Spawn spawn, boolean updateDb)
 	{
-		
 		if (!_spawntable.remove(spawn))
 			return;
 		
@@ -297,7 +296,6 @@ public class SpawnTable
 			{
 				L2DatabaseFactory.close(con);
 			}
-			
 		}
 	}
 	

+ 3 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -299,11 +299,12 @@ public class RaidBossSpawnManager
 	{
 		if (spawnDat == null)
 			return;
-		if (!_spawns.containsKey(spawnDat.getNpcid()))
-			return;
 		
 		int bossId = spawnDat.getNpcid();
 		
+		if (!_spawns.containsKey(bossId))
+			return;
+		
 		SpawnTable.getInstance().deleteSpawn(spawnDat, false);
 		_spawns.remove(bossId);
 		

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -1387,7 +1387,7 @@ public class L2PetInstance extends L2Summon
 		}
 		else
 		{
-			_log.log(Level.WARNING, "Pet control item null!");
+			_log.log(Level.WARNING, "Pet control item null, for pet: " + toString());
 		}
 		super.setName(name);
 	}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java

@@ -51,7 +51,7 @@ public final class HennaInfo extends L2GameServerPacket
 		writeC(_activeChar.getHennaStatMEN()); // equip MEN
 		writeC(_activeChar.getHennaStatDEX()); // equip DEX
 		writeC(_activeChar.getHennaStatWIT()); // equip WIT
-		writeD(3); // Slots 
+		writeD(3); // Slots
 		writeD(_hennas.size()); // Size
 		for (L2Henna henna : _hennas)
 		{