BETA: Little update for [4581] and [4584]

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java

@@ -147,16 +147,8 @@ public class CharStatus
 			return;
 		
 		// invul handling
-		if (getActiveChar().isInvul())
-		{
-			// other chars can't damage
-			if (attacker != getActiveChar())
-				return;
-			
-			// only DOT and HP consumption allowed for damage self
-			if (!isDOT && !isHPConsumption)
-				return;
-		}
+        if (getActiveChar().isInvul() && !(isDOT || isHPConsumption)) 
+        	return; 
 		
 		if (attacker != null)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExNavitAdventEffect.java

@@ -22,24 +22,25 @@ package com.l2jserver.gameserver.network.serverpackets;
  */
 public class ExNavitAdventEffect extends L2GameServerPacket
 {
-       private int _timeToLeft;
-      
-       public ExNavitAdventEffect(int timeToLeft)
-       {
-               _timeToLeft = timeToLeft;
-       }
-      
-       @Override
-       protected void writeImpl()
-       {
-               writeC(0xFE);
-               writeH(0xE0);
-               writeD(_timeToLeft);
-       }
-      
-       @Override
-       public String getType()
-       {
-               return "[S] FE:E0 ExNavitAdventEffect";
-       }
-}
+	private static final String _S__FE_E0_EXNAVITADVENTEFFECT = "[S] FE:E0 ExNavitAdventEffect";
+	private final int _timeLeft;
+	
+	public ExNavitAdventEffect(int timeLeft)
+	{
+		_timeLeft = timeLeft;
+	}
+	
+	@Override
+	protected void writeImpl()
+	{
+		writeC(0xFE);
+		writeH(0xE0);
+		writeD(_timeLeft);
+	}
+	
+	@Override
+	public String getType()
+	{
+		return _S__FE_E0_EXNAVITADVENTEFFECT;
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExNavitAdventPointInfoPacket.java

@@ -22,24 +22,25 @@ package com.l2jserver.gameserver.network.serverpackets;
  */
 public class ExNavitAdventPointInfoPacket extends L2GameServerPacket
 {
-       private int _points = 0;
-      
-       public ExNavitAdventPointInfoPacket(int points)
-       {
-               _points = points;
-       }
-      
-       @Override
-       protected void writeImpl()
-       {
-               writeC(0xFE);
-               writeH(0xDF);
-               writeD(_points); // 72 = 1%
-       }
-      
-       @Override
-       public String getType()
-       {
-               return "[S] FE:DF ExNavitAdventPointInfoPacket";
-       }
+	private static final String _S__FE_DF_EXNAVITADVENTPOINTINFOPACKET = "[S] FE:DF ExNavitAdventPointInfoPacket";
+	private final int _points;
+	
+	public ExNavitAdventPointInfoPacket(int points)
+	{
+		_points = points;
+	}
+	
+	@Override
+	protected void writeImpl()
+	{
+		writeC(0xFE);
+		writeH(0xDF);
+		writeD(_points); // 72 = 1%
+	}
+	
+	@Override
+	public String getType()
+	{
+		return _S__FE_DF_EXNAVITADVENTPOINTINFOPACKET;
+	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExNavitAdventTimeChange.java

@@ -23,32 +23,28 @@ package com.l2jserver.gameserver.network.serverpackets;
  */
 public class ExNavitAdventTimeChange extends L2GameServerPacket
 {
-       private boolean _paused;
-       private int _time = 0;
-      
-       public ExNavitAdventTimeChange(int time)
-       {
-               if( time >= 0 )
-               {
-                       _time = time > 16000 ? 16000 : time;
-                       _paused = false;
-               }
-               else
-                       _paused = true;
-       }
-      
-       @Override
-       protected void writeImpl()
-       {
-               writeC(0xFE);
-               writeH(0xE1);
-               writeC(_paused ? 0x00 : 0x01);
-               writeD(_time); // time in ms (16000 = 4mins = state quit)
-       }
-      
-       @Override
-       public String getType()
-       {
-               return "[S] FE:E1 ExNavitAdventTimeChange";
-       }
-}
+	private static final String _S__FE_E1_EXNAVITADVENTTIMECHANGE = "[S] FE:E1 ExNavitAdventTimeChange";
+	private final boolean _paused;
+	private final int _time;
+	
+	public ExNavitAdventTimeChange(int time)
+	{
+		_time = time > 240000 ? 240000 : time;
+		_paused = _time < 1;
+	}
+	
+	@Override
+	protected void writeImpl()
+	{
+		writeC(0xFE);
+		writeH(0xE1);
+		writeC(_paused ? 0x00 : 0x01);
+		writeD(_time); // time in ms (16000 = 4mins = state quit)
+	}
+	
+	@Override
+	public String getType()
+	{
+		return _S__FE_E1_EXNAVITADVENTTIMECHANGE;
+	}
+}