Kaynağa Gözat

BETA: Misc fixes:
* Improved logs.
* Minor typo.
* Unnecessary code.

Zoey76 11 yıl önce
ebeveyn
işleme
0520bbc49f

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -1318,8 +1318,8 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 							}
 						}
 					}
-				}
 					break;
+				}
 			}
 		}
 		

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

@@ -153,7 +153,7 @@ public class ClanTable
 		
 		if (Config.DEBUG)
 		{
-			_log.fine(getClass().getSimpleName() + ": " + player.getObjectId() + "(" + player.getName() + ") requested a clan creation.");
+			_log.info(getClass().getSimpleName() + ": " + player.getObjectId() + "(" + player.getName() + ") requested a clan creation.");
 		}
 		
 		if (10 > player.getLevel())

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

@@ -72,7 +72,7 @@ public class SummonSkillsTable
 					}
 					ps2.clearParameters();
 					count += map.size();
-					_log.fine(getClass().getSimpleName() + ": skill tree for pet " + npcId + " has " + map.size() + " skills");
+					_log.info(getClass().getSimpleName() + ": skill tree for pet " + npcId + " has " + map.size() + " skills.");
 				}
 			}
 		}

+ 0 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -6570,10 +6570,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				return true;
 			}
 		}
-		else
-		{
-			_log.fine("isBehindTarget's target not an L2 Character.");
-		}
 		return false;
 	}
 	

+ 0 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java

@@ -116,12 +116,6 @@ public class L2BlockInstance extends L2MonsterInstance
 		return true;
 	}
 	
-	@Override
-	public boolean isAttackable()
-	{
-		return true;
-	}
-	
 	@Override
 	public boolean doDie(L2Character killer)
 	{

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

@@ -4867,7 +4867,7 @@ public final class L2PcInstance extends L2Playable
 			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler == null)
 			{
-				_log.fine("No item handler registered for item ID " + target.getId() + ".");
+				_log.warning("No item handler registered for item ID: " + target.getId() + ".");
 			}
 			else
 			{

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

@@ -619,7 +619,7 @@ public class L2PetInstance extends L2Summon
 			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler == null)
 			{
-				_log.fine("No item handler registered for item ID " + target.getId() + ".");
+				_log.warning("No item handler registered for item ID: " + target.getId() + ".");
 			}
 			else
 			{

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

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Hero;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -83,16 +82,7 @@ public class L2RaidBossInstance extends L2MonsterInstance
 			return false;
 		}
 		
-		L2PcInstance player = null;
-		if (killer instanceof L2PcInstance)
-		{
-			player = (L2PcInstance) killer;
-		}
-		else if (killer instanceof L2Summon)
-		{
-			player = ((L2Summon) killer).getOwner();
-		}
-		
+		final L2PcInstance player = killer.getActingPlayer();
 		if (player != null)
 		{
 			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL));

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

@@ -305,7 +305,7 @@ public final class L2TeleporterInstance extends L2Npc
 			{
 				if (Config.DEBUG)
 				{
-					_log.fine("Teleporting player " + player.getName() + " to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ());
+					_log.info("Teleporting player " + player.getName() + " to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ());
 				}
 				
 				player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ(), true);

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java

@@ -1261,7 +1261,7 @@ public abstract class Inventory extends ItemContainer
 	{
 		if (Config.DEBUG)
 		{
-			_log.fine("--- unequip body slot:" + slot);
+			_log.info(Inventory.class.getSimpleName() + ": Unequip body slot:" + slot);
 		}
 		
 		int pdollSlot = -1;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Action.java

@@ -55,7 +55,7 @@ public final class Action extends L2GameClientPacket
 	{
 		if (Config.DEBUG)
 		{
-			_log.fine(getType() + ": Action: " + _actionId + " ObjId: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ);
+			_log.info(getType() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ);
 		}
 		
 		// Get the current L2PcInstance of the player

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java

@@ -93,7 +93,7 @@ public final class RequestActionUse extends L2GameClientPacket
 		
 		if (Config.DEBUG)
 		{
-			_log.finest(activeChar + " requested action use Id: " + _actionId + " Ctrl pressed:" + _ctrlPressed + " Shift pressed:" + _shiftPressed);
+			_log.info(getType() + ": " + activeChar + " requested action use ID: " + _actionId + " Ctrl pressed:" + _ctrlPressed + " Shift pressed:" + _shiftPressed);
 		}
 		
 		// Don't do anything if player is dead or confused

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/util/MinionList.java

@@ -396,7 +396,7 @@ public class MinionList
 		
 		if (Config.DEBUG)
 		{
-			_log.fine("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z");
+			_log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z");
 		}
 		
 		return minion;