Browse Source

Gnat: Spawn protection update

JIV 15 years ago
parent
commit
2dbdad9501
32 changed files with 183 additions and 4 deletions
  1. 4 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java
  2. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  3. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/SystemMessageId.java
  4. 5 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java
  5. 5 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java
  6. 6 1
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java
  7. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java
  8. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPost.java
  9. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java
  10. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
  11. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
  12. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java
  13. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDominionInfo.java
  14. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
  15. 5 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestGetBossRecord.java
  16. 5 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java
  17. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java
  18. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java
  19. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeInfo.java
  20. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java
  21. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPostItemList.java
  22. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPost.java
  23. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPostList.java
  24. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
  25. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java
  26. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java
  27. 8 2
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPostList.java
  28. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java
  29. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java
  30. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShowBoard.java
  31. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java
  32. 6 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSkillList.java

+ 4 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -6113,7 +6113,10 @@ public abstract class L2Character extends L2Object
 			// Launch the magic skill in order to calculate its effects
 			// Launch the magic skill in order to calculate its effects
 			callSkill(skill, targets);
 			callSkill(skill, targets);
 		}
 		}
-		catch (NullPointerException e) {}
+		catch (NullPointerException e)
+		{
+			_log.log(Level.WARNING, "", e);
+		}
 
 
 		if (instant || coolTime == 0)
 		if (instant || coolTime == 0)
 			onMagicFinalizer(skill, targets[0], simultaneously);
 			onMagicFinalizer(skill, targets[0], simultaneously);

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

@@ -11144,6 +11144,7 @@ public final class L2PcInstance extends L2Playable
 	public void onActionRequest()
 	public void onActionRequest()
 	{
 	{
 		setProtection(false);
 		setProtection(false);
+		sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS));
 	}
 	}
 
 
 	/**
 	/**

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -14612,6 +14612,12 @@ public enum SystemMessageId
 	*/
 	*/
 	YOU_CANNOT_SEND_MAIL_TO_CHAR_BLOCK_YOU(3082),
 	YOU_CANNOT_SEND_MAIL_TO_CHAR_BLOCK_YOU(3082),
 
 
+	/**
+	* ID: 3108<br>
+	* Message: You are no longer protected from aggressive monsters.
+	*/
+	YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS(3108),
+
 	/** 
 	/** 
 	* ID: 6501<br>
 	* ID: 6501<br>
 	* Message: You cannot bookmark this location because you do not have a My Teleport Flag.
 	* Message: You cannot bookmark this location because you do not have a My Teleport Flag.

+ 5 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java

@@ -72,4 +72,9 @@ public class GameGuardReply extends L2GameClientPacket
         return _C__CA_GAMEGUARDREPLY;
         return _C__CA_GAMEGUARDREPLY;
     }
     }
 
 
+    @Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 5 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java

@@ -55,4 +55,9 @@ public class RequestAllCastleInfo extends L2GameClientPacket
         }
         }
     }
     }
     
     
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java

@@ -54,5 +54,10 @@ public class RequestAllFortressInfo extends L2GameClientPacket
             client.sendPacket(new ExShowFortressInfo());
             client.sendPacket(new ExShowFortressInfo());
         }
         }
     }
     }
-    
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java

@@ -69,4 +69,10 @@ public final class RequestAllyCrest extends L2GameClientPacket
 	{
 	{
 		return _C__88_REQUESTALLYCREST;
 		return _C__88_REQUESTALLYCREST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPost.java

@@ -210,4 +210,10 @@ public final class RequestCancelPost extends L2GameClientPacket
 	{
 	{
 		return _C__D0_6F_REQUESTCANCELPOSTATTACHMENT;
 		return _C__D0_6F_REQUESTCANCELPOSTATTACHMENT;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java

@@ -62,4 +62,10 @@ public class RequestCursedWeaponList extends L2GameClientPacket
 	{
 	{
 		return _C__D0_22_REQUESTCURSEDWEAPONLIST;
 		return _C__D0_22_REQUESTCURSEDWEAPONLIST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java

@@ -73,4 +73,10 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket
 	{
 	{
 		return _C__D0_23_REQUESTCURSEDWEAPONLOCATION;
 		return _C__D0_23_REQUESTCURSEDWEAPONLOCATION;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java

@@ -88,4 +88,10 @@ public final class RequestDeleteReceivedPost extends L2GameClientPacket
 	{
 	{
 		return _C__D0_68_REQUESTDELETERECEIVEDPOST;
 		return _C__D0_68_REQUESTDELETERECEIVEDPOST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java

@@ -88,4 +88,10 @@ public final class RequestDeleteSentPost extends L2GameClientPacket
 	{
 	{
 		return _C__D0_6C_REQUESTDELETESENTPOST;
 		return _C__D0_6C_REQUESTDELETESENTPOST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDominionInfo.java

@@ -50,4 +50,10 @@ public class RequestDominionInfo extends L2GameClientPacket
 		sendPacket(new ExReplyDominionInfo());
 		sendPacket(new ExReplyDominionInfo());
 		sendPacket(new ExShowOwnthingPos());
 		sendPacket(new ExShowOwnthingPos());
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java

@@ -62,4 +62,10 @@ public class RequestFortressSiegeInfo extends L2GameClientPacket
         	}
         	}
         }
         }
     }
     }
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 5 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestGetBossRecord.java

@@ -71,4 +71,9 @@ public class RequestGetBossRecord extends L2GameClientPacket
         return _C__D0_18_REQUESTGETBOSSRECORD;
         return _C__D0_18_REQUESTGETBOSSRECORD;
     }
     }
 
 
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 5 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java

@@ -57,4 +57,9 @@ public class RequestKeyMapping extends L2GameClientPacket
 			activeChar.sendPacket(new ExUISetting(activeChar));
 			activeChar.sendPacket(new ExUISetting(activeChar));
 	}
 	}
 	
 	
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java

@@ -60,4 +60,10 @@ public class RequestManorList extends L2GameClientPacket
 	{
 	{
 		return _C__D0_01_REQUESTMANORLIST;
 		return _C__D0_01_REQUESTMANORLIST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java

@@ -67,4 +67,10 @@ public final class RequestPledgeCrest extends L2GameClientPacket
 	{
 	{
 		return _C__68_REQUESTPLEDGECREST;
 		return _C__68_REQUESTPLEDGECREST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeInfo.java

@@ -77,4 +77,10 @@ public final class RequestPledgeInfo extends L2GameClientPacket
 	{
 	{
 		return _C__66_REQUESTPLEDGEINFO;
 		return _C__66_REQUESTPLEDGEINFO;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java

@@ -250,4 +250,10 @@ public final class RequestPostAttachment extends L2GameClientPacket
 	{
 	{
 		return _C__D0_6A_REQUESTPOSTATTACHMENT;
 		return _C__D0_6A_REQUESTPOSTATTACHMENT;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPostItemList.java

@@ -59,4 +59,10 @@ public final class RequestPostItemList extends L2GameClientPacket
 	{
 	{
 		return _C__D0_65_REQUESTPOSTITEMLIST;
 		return _C__D0_65_REQUESTPOSTITEMLIST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 } 
 } 

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPost.java

@@ -78,4 +78,10 @@ public final class RequestReceivedPost extends L2GameClientPacket
 	{
 	{
 		return _C__D0_69_REQUESTRECEIVEDPOST;
 		return _C__D0_69_REQUESTRECEIVEDPOST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPostList.java

@@ -56,4 +56,10 @@ public final class RequestReceivedPostList extends L2GameClientPacket
 	{
 	{
 		return _C__D0_67_REQUESTRECEIVEDPOSTLIST;
 		return _C__D0_67_REQUESTRECEIVEDPOSTLIST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java

@@ -97,4 +97,10 @@ public final class RequestSaveInventoryOrder extends L2GameClientPacket
             order = ord;
             order = ord;
         }
         }
     }
     }
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java

@@ -376,4 +376,10 @@ public final class RequestSendPost extends L2GameClientPacket
 	{
 	{
 		return _C__D0_66_REQUESTSENDPOST;
 		return _C__D0_66_REQUESTSENDPOST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java

@@ -75,4 +75,10 @@ public final class RequestSentPost extends L2GameClientPacket
 	{
 	{
 		return _C__D0_6E_REQUESTSENTPOST;
 		return _C__D0_6E_REQUESTSENTPOST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 } 
 } 

+ 8 - 2
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPostList.java

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
  */
 public final class RequestSentPostList extends L2GameClientPacket
 public final class RequestSentPostList extends L2GameClientPacket
 {
 {
-	private static final String _C__D0_6C_REQUESTREQUESTRSENTPOSTLIST = "[C] D0:6C RequestRequestSentPostList";
+	private static final String _C__D0_6C_REQUESTSENTPOSTLIST = "[C] D0:6C RequestSentPostList";
 
 
 	@Override
 	@Override
 	protected void readImpl()
 	protected void readImpl()
@@ -54,6 +54,12 @@ public final class RequestSentPostList extends L2GameClientPacket
 	@Override
 	@Override
 	public String getType()
 	public String getType()
 	{
 	{
-		return _C__D0_6C_REQUESTREQUESTRSENTPOSTLIST;
+		return _C__D0_6C_REQUESTSENTPOSTLIST;
+	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
 	}
 	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java

@@ -59,4 +59,10 @@ public final class RequestShortCutDel extends L2GameClientPacket
 	{
 	{
 		return _C__35_REQUESTSHORTCUTDEL;
 		return _C__35_REQUESTSHORTCUTDEL;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java

@@ -94,4 +94,10 @@ public final class RequestShortCutReg extends L2GameClientPacket
 	{
 	{
 		return _C__33_REQUESTSHORTCUTREG;
 		return _C__33_REQUESTSHORTCUTREG;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShowBoard.java

@@ -75,4 +75,10 @@ public final class RequestShowBoard extends L2GameClientPacket
 	{
 	{
 		return _C__57_REQUESTSHOWBOARD;
 		return _C__57_REQUESTSHOWBOARD;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java

@@ -52,4 +52,10 @@ public final class RequestShowMiniMap extends L2GameClientPacket
 	{
 	{
 		return _C__cd_REQUESTSHOWMINIMAP;
 		return _C__cd_REQUESTSHOWMINIMAP;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }

+ 6 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSkillList.java

@@ -49,4 +49,10 @@ public final class RequestSkillList extends L2GameClientPacket
 	{
 	{
 		return _C__3F_REQUESTSKILLLIST;
 		return _C__3F_REQUESTSKILLLIST;
 	}
 	}
+
+	@Override
+	protected boolean triggersOnActionRequest()
+	{
+		return false;
+	}
 }
 }