فهرست منبع

Badly placed brackets allow players attack opponent on the olympiad before battle starts :)
Also fixed possible NPE.

_DS_ 15 سال پیش
والد
کامیت
c6945a3c9e
1فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 4 3
      L2_GameServer/java/net/sf/l2j/gameserver/model/actor/L2Character.java

+ 4 - 3
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/L2Character.java

@@ -5459,12 +5459,13 @@ public abstract class L2Character extends L2Object
         	else
         		target=(L2PcInstance)player.getTarget();
         	
-        	if (target.isInOlympiadMode() && !player.isOlympiadStart() && player.getOlympiadGameId()!=target.getOlympiadGameId())
+        	if (target == null
+        			|| (target.isInOlympiadMode()
+        					&& (!player.isOlympiadStart()
+        							|| player.getOlympiadGameId() != target.getOlympiadGameId())))
         	{
         		// if L2PcInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
         		player.sendPacket(ActionFailed.STATIC_PACKET);
-        		setIsCastingSimultaneouslyNow(false);
-        		setIsCastingNow(false);
         		return;
         	}
         }