API tools faq
paste
Advertisement
Guest User

Core part

a guest
Mar 15th, 2013
691
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 23.66 KB | None | 0 0
raw download clone embed print report
  1. ### Eclipse Workspace Patch 1.0
  2. #P L2J_Server
  3. Index: java/com/l2jserver/gameserver/network/serverpackets/NicknameChanged.java
  4. ===================================================================
  5. --- java/com/l2jserver/gameserver/network/serverpackets/NicknameChanged.java    (revision 5370)
  6. +++ java/com/l2jserver/gameserver/network/serverpackets/NicknameChanged.java    (working copy)
  7. @@ -14,6 +14,7 @@
  8.   */
  9.  package com.l2jserver.gameserver.network.serverpackets;
  10.  
  11. +import com.l2jserver.Config;
  12.  import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  13.  
  14.  /**
  15. @@ -29,7 +30,15 @@
  16.     public NicknameChanged(L2PcInstance cha)
  17.     {
  18.         _objectId = cha.getObjectId();
  19. -       _title = cha.getTitle();
  20. +       if (cha.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  21. +       {
  22. +           cha.sendMessage("Sorry, while in the Olympiad, you can't change Titles.");
  23. +           _title = Config.ALT_OLY_ANTI_FEED_TITLE;
  24. +       }
  25. +       else
  26. +       {
  27. +           _title = cha.getTitle();
  28. +       }
  29.     }
  30.    
  31.     /**
  32. Index: java/com/l2jserver/gameserver/model/L2Skill.java
  33. ===================================================================
  34. --- java/com/l2jserver/gameserver/model/L2Skill.java    (revision 5370)
  35. +++ java/com/l2jserver/gameserver/model/L2Skill.java    (working copy)
  36. @@ -2610,7 +2610,10 @@
  37.             else if (et.icon && effector instanceof L2PcInstance)
  38.             {
  39.                 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
  40. -               sm.addCharName(effected);
  41. +               if (((L2PcInstance) effected).isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  42. +                   sm.addPcFakeName();
  43. +               else
  44. +                   sm.addCharName(effected);
  45.                 sm.addSkillName(this);
  46.                 ((L2PcInstance)effector).sendPacket(sm);
  47.             }
  48. Index: java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadUserInfo.java
  49. ===================================================================
  50. --- java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadUserInfo.java (revision 5370)
  51. +++ java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadUserInfo.java (working copy)
  52. @@ -14,6 +14,7 @@
  53.   */
  54.  package com.l2jserver.gameserver.network.serverpackets;
  55.  
  56. +import com.l2jserver.Config;
  57.  import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  58.  import com.l2jserver.gameserver.model.olympiad.Participant;
  59.  
  60. @@ -84,14 +85,20 @@
  61.         {
  62.             writeC(_player.getOlympiadSide());
  63.             writeD(_player.getObjectId());
  64. -           writeS(_player.getName());
  65. +           if (Config.ALT_OLY_ANTI_FEED)
  66. +               writeS(Config.ALT_OLY_ANTI_FEED_NAME);//name in Olympiad when anti feed is on
  67. +           else
  68. +               writeS(_player.getName());
  69.             writeD(_player.getClassId().getId());
  70.         }
  71.         else
  72.         {
  73.             writeC(_par.side);
  74.             writeD(_par.objectId);
  75. -           writeS(_par.name);
  76. +           if (Config.ALT_OLY_ANTI_FEED)
  77. +               writeS(Config.ALT_OLY_ANTI_FEED_NAME);//name in Olympiad when anti feed is on
  78. +           else
  79. +               writeS(_par.name);
  80.             writeD(_par.baseClass);
  81.         }
  82.  
  83. Index: java/com/l2jserver/gameserver/model/actor/status/PcStatus.java
  84. ===================================================================
  85. --- java/com/l2jserver/gameserver/model/actor/status/PcStatus.java  (revision 5370)
  86. +++ java/com/l2jserver/gameserver/model/actor/status/PcStatus.java  (working copy)
  87. @@ -21,6 +21,7 @@
  88.  import com.l2jserver.gameserver.model.actor.L2Playable;
  89.  import com.l2jserver.gameserver.model.actor.L2Summon;
  90.  import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  91. +import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
  92.  import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
  93.  import com.l2jserver.gameserver.model.actor.stat.PcStat;
  94.  import com.l2jserver.gameserver.model.entity.Duel;
  95. @@ -154,17 +155,41 @@
  96.                 // Send a System Message to the L2PcInstance
  97.                 smsg = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
  98.                 smsg.addString(getActiveChar().getName());
  99. -               smsg.addCharName(attacker);
  100. -               smsg.addNumber(fullValue);
  101. -               getActiveChar().sendPacket(smsg);
  102. +               if (attacker instanceof L2SummonInstance || attacker instanceof L2PetInstance)
  103. +               {
  104. +                   smsg.addCharName(attacker);
  105. +                   smsg.addNumber(fullValue);
  106. +                   getActiveChar().sendPacket(smsg);
  107. +               }
  108. +               else
  109. +               {
  110. +                   if (getActiveChar().isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  111. +                       smsg.addPcFakeName();
  112. +                   else
  113. +                       smsg.addCharName(attacker);
  114. +                   smsg.addNumber(fullValue);
  115. +                   getActiveChar().sendPacket(smsg);
  116. +               }
  117.                
  118.                 if (tDmg > 0)
  119.                 {
  120.                     smsg = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
  121.                     smsg.addString(getActiveChar().getPet().getName());
  122. -                   smsg.addCharName(attacker);
  123. -                   smsg.addNumber(tDmg);
  124. -                   getActiveChar().sendPacket(smsg);
  125. +                   if (attacker instanceof L2SummonInstance || attacker instanceof L2PetInstance)
  126. +                   {
  127. +                       smsg.addCharName(attacker);
  128. +                       smsg.addNumber(fullValue);
  129. +                       getActiveChar().sendPacket(smsg);
  130. +                   }
  131. +                   else
  132. +                   {
  133. +                       if (getActiveChar().isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  134. +                           smsg.addPcFakeName();
  135. +                       else
  136. +                           smsg.addCharName(attacker);
  137. +                       smsg.addNumber(tDmg);
  138. +                       getActiveChar().sendPacket(smsg);
  139. +                   }
  140.                    
  141.                     if (attackerPlayer != null)
  142.                     {
  143. Index: java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java
  144. ===================================================================
  145. --- java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java    (revision 5370)
  146. +++ java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java    (working copy)
  147. @@ -361,7 +361,10 @@
  148.                 if (_pTwoCrash && !_pOneCrash)
  149.                 {
  150.                     sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
  151. -                   sm.addString(_playerOne.name);
  152. +                   if (Config.ALT_OLY_ANTI_FEED)
  153. +                       sm.addString(Config.ALT_OLY_ANTI_FEED_NAME);
  154. +                   else
  155. +                       sm.addString(_playerOne.name);
  156.                     stadium.broadcastPacket(sm);
  157.  
  158.                     _playerOne.updateStat(COMP_WON, 1);
  159. @@ -382,7 +385,10 @@
  160.                 else if (_pOneCrash && !_pTwoCrash)
  161.                 {
  162.                     sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
  163. -                   sm.addString(_playerTwo.name);
  164. +                   if (Config.ALT_OLY_ANTI_FEED)
  165. +                       sm.addString(Config.ALT_OLY_ANTI_FEED_NAME);
  166. +                   else
  167. +                       sm.addString(_playerTwo.name);
  168.                     stadium.broadcastPacket(sm);
  169.  
  170.                     _playerTwo.updateStat(COMP_WON, 1);
  171. @@ -473,7 +479,10 @@
  172.                     || (_damageP1 > _damageP2 && playerTwoHp != 0 && playerOneHp != 0))
  173.             {
  174.                 sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
  175. -               sm.addString(_playerOne.name);
  176. +               if (Config.ALT_OLY_ANTI_FEED)
  177. +                   sm.addString(Config.ALT_OLY_ANTI_FEED_NAME);
  178. +               else
  179. +                   sm.addString(_playerOne.name);
  180.                 stadium.broadcastPacket(sm);
  181.  
  182.                 _playerOne.updateStat(COMP_WON, 1);
  183. @@ -494,7 +503,10 @@
  184.                     || (_damageP2 > _damageP1 && playerOneHp != 0 && playerTwoHp != 0))
  185.             {
  186.                 sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
  187. -               sm.addString(_playerTwo.name);
  188. +               if (Config.ALT_OLY_ANTI_FEED)
  189. +                   sm.addString(Config.ALT_OLY_ANTI_FEED_NAME);
  190. +               else
  191. +                   sm.addString(_playerTwo.name);
  192.                 stadium.broadcastPacket(sm);
  193.  
  194.                 _playerTwo.updateStat(COMP_WON, 1);
  195. Index: java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  196. ===================================================================
  197. --- java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java    (revision 5370)
  198. +++ java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java    (working copy)
  199. @@ -1081,6 +1081,21 @@
  200.     {
  201.         int result = 0;
  202.        
  203. +       if (((L2PcInstance) target).isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  204. +       {
  205. +           if (this.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  206. +           {
  207. +               result |= RelationChanged.RELATION_MUTUAL_WAR;
  208. +               return result;
  209. +           }
  210. +       }
  211. +       //_observerMode
  212. +       if ( (inObserverMode() && Config.ALT_OLY_ANTI_FEED) || (_observerMode && Config.ALT_OLY_ANTI_FEED) )
  213. +       {
  214. +           result |= RelationChanged.RELATION_MUTUAL_WAR;
  215. +           return result;
  216. +       }
  217. +      
  218.         if (getClan() != null)
  219.         {
  220.             result |= RelationChanged.RELATION_CLAN_MEMBER;
  221. @@ -13109,7 +13124,10 @@
  222.             {
  223.                 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_EVADED_C2_ATTACK);
  224.                 sm.addPcName((L2PcInstance) target);
  225. -               sm.addCharName(this);
  226. +               if (this.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  227. +                   sm.addPcFakeName();
  228. +               else
  229. +                   sm.addCharName(this);
  230.                 target.sendPacket(sm);
  231.             }
  232.             sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_ATTACK_WENT_ASTRAY).addPcName(this));
  233. @@ -13154,9 +13172,21 @@
  234.         else
  235.         {
  236.             sm = SystemMessage.getSystemMessage(SystemMessageId.C1_GAVE_C2_DAMAGE_OF_S3);
  237. -           sm.addPcName(this);
  238. -           sm.addCharName(target);
  239. -           sm.addNumber(damage);
  240. +           if (target instanceof L2SummonInstance || target instanceof L2PetInstance)
  241. +           {
  242. +               sm.addPcName(this);
  243. +               sm.addCharName(target);
  244. +               sm.addNumber(damage);
  245. +           }
  246. +           else
  247. +           {
  248. +               sm.addPcName(this);
  249. +               if (this.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  250. +                   sm.addPcFakeName();
  251. +               else
  252. +                   sm.addCharName(target);
  253. +               sm.addNumber(damage);
  254. +           }
  255.         }
  256.        
  257.         sendPacket(sm);
  258. Index: java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java
  259. ===================================================================
  260. --- java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java   (revision 5370)
  261. +++ java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java   (working copy)
  262. @@ -182,16 +182,28 @@
  263.                 {
  264.                     writeC(_invisible? 1 : 0); // invisible ?? 0=false  1=true   2=summoned (only works if model has a summon animation)
  265.                 }
  266. -              
  267. -               writeS(_activeChar.getAppearance().getVisibleName());
  268. -              
  269. +               if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  270. +               {
  271. +                   writeS(Config.ALT_OLY_ANTI_FEED_NAME);//name in Olympiad when anti feed is on
  272. +               }
  273. +               else
  274. +               {
  275. +                   writeS(_activeChar.getAppearance().getVisibleName());
  276. +               }
  277.                 if (gmSeeInvis)
  278.                 {
  279.                     writeS("Invisible");
  280.                 }
  281.                 else
  282.                 {
  283. +                   if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  284. +                   {
  285. +                       writeS(Config.ALT_OLY_ANTI_FEED_TITLE);//title in Olympiad when anti feed is on
  286. +                   }
  287. +                   else
  288. +                   {
  289.                     writeS(_activeChar.getAppearance().getVisibleTitle());
  290. +                   }
  291.                 }
  292.                
  293.                 writeD(0);
  294. @@ -207,8 +219,16 @@
  295.                     writeD(_activeChar.getAbnormalEffect());  // C2
  296.                 }
  297.                
  298. -               writeD(_activeChar.getClanId()); //clan id
  299. -               writeD(_activeChar.getClanCrestId()); //crest id
  300. +               if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  301. +               {
  302. +                   writeD(0);//clan in Olympiad(anti feed)
  303. +                   writeD(0);
  304. +               }
  305. +               else
  306. +               {
  307. +                   writeD(_activeChar.getClanId()); //clan id
  308. +                   writeD(_activeChar.getClanCrestId()); //crest id
  309. +               }
  310.                 writeD(0);  // C2
  311.                 writeD(0);  // C2
  312.                 writeC(0);  // C2
  313. @@ -236,7 +256,14 @@
  314.             writeD(_z);
  315.             writeD(_vehicleId);
  316.             writeD(_objId);
  317. -           writeS(_activeChar.getAppearance().getVisibleName());
  318. +           if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  319. +           {
  320. +               writeS(Config.ALT_OLY_ANTI_FEED_NAME);//name in Olympiad when anti feed is on
  321. +           }
  322. +           else
  323. +           {
  324. +               writeS(_activeChar.getAppearance().getVisibleName());
  325. +           }
  326.             writeD(_activeChar.getRace().ordinal());
  327.             writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
  328.            
  329. @@ -358,15 +385,32 @@
  330.             }
  331.             else
  332.             {
  333. +               if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  334. +               {
  335. +                   writeS(Config.ALT_OLY_ANTI_FEED_TITLE);//title in Olympiad when anti feed is on
  336. +               }
  337. +               else
  338. +               {
  339.                 writeS(_activeChar.getAppearance().getVisibleTitle());
  340. +               }
  341.             }
  342.            
  343.             if (!_activeChar.isCursedWeaponEquipped())
  344.             {
  345. -               writeD(_activeChar.getClanId());
  346. -               writeD(_activeChar.getClanCrestId());
  347. -               writeD(_activeChar.getAllyId());
  348. -               writeD(_activeChar.getAllyCrestId());
  349. +               if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  350. +               {
  351. +                   writeD(0);//clan ally in Olympiad (anti feed)
  352. +                   writeD(0);
  353. +                   writeD(0);
  354. +                   writeD(0);
  355. +               }
  356. +               else
  357. +               {
  358. +                   writeD(_activeChar.getClanId());
  359. +                   writeD(_activeChar.getClanCrestId());
  360. +                   writeD(_activeChar.getAllyId());
  361. +                   writeD(_activeChar.getAllyCrestId());
  362. +               }
  363.             }
  364.             else
  365.             {
  366. @@ -429,7 +473,15 @@
  367.            
  368.             writeD(_activeChar.getClanCrestLargeId());
  369.             writeC(_activeChar.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I
  370. -           writeC(_activeChar.isHero() || (_activeChar.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura
  371. +           if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  372. +           {
  373. +               if (Config.ALT_OLY_ANTI_FEED_HERO_GLOW)
  374. +                   writeC(1);
  375. +               else if (!Config.ALT_OLY_ANTI_FEED_HERO_GLOW)
  376. +                   writeC(0);
  377. +           }
  378. +           else
  379. +               writeC(_activeChar.isHero() || (_activeChar.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura
  380.            
  381.             writeC(_activeChar.isFishing() ? 1 : 0); //0x01: Fishing Mode (Cant be undone by setting back to 0)
  382.             writeD(_activeChar.getFishx());
  383. @@ -443,7 +495,14 @@
  384.             writeD(_activeChar.getPledgeClass());
  385.             writeD(_activeChar.getPledgeType());
  386.            
  387. -           writeD(_activeChar.getAppearance().getTitleColor());
  388. +           if (_activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  389. +           {
  390. +               writeD(0x00CCFF);//title color in Olympiad (Anti Feed)
  391. +           }
  392. +           else
  393. +           {
  394. +               writeD(_activeChar.getAppearance().getTitleColor());
  395. +           }
  396.            
  397.             if (_activeChar.isCursedWeaponEquipped())
  398.                 writeD(CursedWeaponsManager.getInstance().getLevel(_activeChar.getCursedWeaponEquippedId()));
  399. Index: java/com/l2jserver/gameserver/network/clientpackets/Say2.java
  400. ===================================================================
  401. --- java/com/l2jserver/gameserver/network/clientpackets/Say2.java   (revision 5370)
  402. +++ java/com/l2jserver/gameserver/network/clientpackets/Say2.java   (working copy)
  403. @@ -197,6 +197,19 @@
  404.         if (Config.USE_SAY_FILTER)
  405.             checkText();
  406.        
  407. +       // Check for & disable chats in Olympiad (ANTI FEED)
  408. +       if (activeChar.isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  409. +       {
  410. +           if ( (_type == ALL && !Config.ALT_OLY_ANTI_FEED_CHAT_ALL) || (_type == SHOUT && !Config.ALT_OLY_ANTI_FEED_CHAT_SHOUT) ||
  411. +                   (_type == TRADE && !Config.ALT_OLY_ANTI_FEED_CHAT_TRADE) || (_type == CLAN && !Config.ALT_OLY_ANTI_FEED_CHAT_CLAN) ||
  412. +                   (_type == ALLIANCE && !Config.ALT_OLY_ANTI_FEED_CHAT_ALLY) || (_type == HERO_VOICE && !Config.ALT_OLY_ANTI_FEED_CHAT_HERO) ||
  413. +                   (_type == TELL && !Config.ALT_OLY_ANTI_FEED_CHAT_TELL) ) //&& !activeChar.isGM()  TODO
  414. +           {
  415. +                   activeChar.sendMessage("Sorry, you can't use this chat while in the Olympiad.");
  416. +                   return;
  417. +           }
  418. +       }
  419. +      
  420.         IChatHandler handler = ChatHandler.getInstance().getChatHandler(_type);
  421.         if (handler != null)
  422.             handler.handleChat(_type, activeChar, _target, _text);
  423. Index: dist/game/config/olympiad.properties
  424. ===================================================================
  425. --- dist/game/config/olympiad.properties    (revision 5370)
  426. +++ dist/game/config/olympiad.properties    (working copy)
  427. @@ -136,4 +136,50 @@
  428.  
  429.  # Time to wait before teleported to arena.
  430.  # Default: 120
  431. -AltOlyWaitTime = 120
  432. \ No newline at end of file
  433. +AltOlyWaitTime = 120
  434. +
  435. +# Olympiad Anti Feed System(OAFS) - Enabled(True) / Disabled(False)
  436. +# Default: False
  437. +AltOlyAntiFeed = False
  438. +
  439. +# OAFS - Name of Olympiad Participants
  440. +AltOlyAntiFeedName = Player
  441. +
  442. +# OAFS - Title of Olympiad Participants
  443. +AltOlyAntiFeedTitle = Olympiad
  444. +
  445. +# OAFS - Hero Glow for Participants (INCLUDES CURRENT HEROES)
  446. +# Default: False
  447. +AltOlyAntiFeedHeroGlow = False
  448. +
  449. +# OAFS - GMs Can See Real Participants Names in Arena Lists?
  450. +# Default: False
  451. +AltOlyAntiFeedGmSee = False
  452. +
  453. +# OAFS - Participants Can Use All/Local Chat?
  454. +# Default: False
  455. +AltOlyAntiFeedChatAll = False
  456. +
  457. +# OAFS - Participants Can Use Shout Chat?
  458. +# Default: False
  459. +AltOlyAntiFeedChatShout = False
  460. +
  461. +# OAFS - Participants Can Use Trade Chat?
  462. +# Default: False
  463. +AltOlyAntiFeedChatTrade = False
  464. +
  465. +# OAFS - Participants Can Use Clan Chat?
  466. +# Default: False
  467. +AltOlyAntiFeedChatClan = False
  468. +
  469. +# OAFS - Participants Can Use Ally Chat?
  470. +# Default: False
  471. +AltOlyAntiFeedChatAlly = False
  472. +
  473. +# OAFS - Participants Can Use Hero Chat?
  474. +# Default: False
  475. +AltOlyAntiFeedChatHero = False
  476. +
  477. +# OAFS - Participants Can Use Private/Tell Chat?
  478. +# Default: False
  479. +AltOlyAntiFeedChatTell = False
  480. \ No newline at end of file
  481. Index: java/com/l2jserver/gameserver/network/clientpackets/Action.java
  482. ===================================================================
  483. --- java/com/l2jserver/gameserver/network/clientpackets/Action.java (revision 5370)
  484. +++ java/com/l2jserver/gameserver/network/clientpackets/Action.java (working copy)
  485. @@ -69,7 +69,7 @@
  486.         if (activeChar == null)
  487.             return;
  488.        
  489. -       if (activeChar.inObserverMode())
  490. +       if (activeChar.inObserverMode() && !activeChar.isGM())
  491.         {
  492.             getClient().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE));
  493.             getClient().sendPacket(ActionFailed.STATIC_PACKET);
  494. Index: java/com/l2jserver/gameserver/model/actor/status/PetStatus.java
  495. ===================================================================
  496. --- java/com/l2jserver/gameserver/model/actor/status/PetStatus.java (revision 5370)
  497. +++ java/com/l2jserver/gameserver/model/actor/status/PetStatus.java (working copy)
  498. @@ -14,6 +14,7 @@
  499.   */
  500.  package com.l2jserver.gameserver.model.actor.status;
  501.  
  502. +import com.l2jserver.Config;
  503.  import com.l2jserver.gameserver.ai.CtrlEvent;
  504.  import com.l2jserver.gameserver.model.actor.L2Character;
  505.  import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
  506. @@ -48,7 +49,10 @@
  507.             if (!isDOT && getActiveChar().getOwner() != null)
  508.             {
  509.                 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_RECEIVED_S2_DAMAGE_BY_C1);
  510. -               sm.addCharName(attacker);
  511. +               if (getActiveChar().getOwner().isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  512. +                   sm.addPcFakeName();
  513. +               else
  514. +                   sm.addCharName(attacker);
  515.                 sm.addNumber((int)value);
  516.                 getActiveChar().getOwner().sendPacket(sm);
  517.             }
  518. Index: java/com/l2jserver/Config.java
  519. ===================================================================
  520. --- java/com/l2jserver/Config.java  (revision 5370)
  521. +++ java/com/l2jserver/Config.java  (working copy)
  522. @@ -551,6 +551,18 @@
  523.     public static TIntArrayList LIST_OLY_RESTRICTED_ITEMS;
  524.     public static int ALT_OLY_ENCHANT_LIMIT;
  525.     public static int ALT_OLY_WAIT_TIME;
  526. +   public static boolean ALT_OLY_ANTI_FEED;
  527. +   public static String ALT_OLY_ANTI_FEED_NAME;
  528. +   public static String ALT_OLY_ANTI_FEED_TITLE;  
  529. +   public static boolean ALT_OLY_ANTI_FEED_HERO_GLOW;
  530. +   public static boolean ALT_OLY_ANTI_FEED_GM_SEE;
  531. +   public static boolean ALT_OLY_ANTI_FEED_CHAT_ALL;
  532. +   public static boolean ALT_OLY_ANTI_FEED_CHAT_SHOUT;
  533. +   public static boolean ALT_OLY_ANTI_FEED_CHAT_TRADE;
  534. +   public static boolean ALT_OLY_ANTI_FEED_CHAT_CLAN;
  535. +   public static boolean ALT_OLY_ANTI_FEED_CHAT_ALLY;
  536. +   public static boolean ALT_OLY_ANTI_FEED_CHAT_HERO;
  537. +   public static boolean ALT_OLY_ANTI_FEED_CHAT_TELL;
  538.     public static int ALT_MANOR_REFRESH_TIME;
  539.     public static int ALT_MANOR_REFRESH_MIN;
  540.     public static int ALT_MANOR_APPROVE_TIME;
  541. @@ -2594,6 +2606,18 @@
  542.                     }
  543.                     ALT_OLY_ENCHANT_LIMIT = Integer.parseInt(olympiad.getProperty("AltOlyEnchantLimit","-1"));
  544.                     ALT_OLY_WAIT_TIME = Integer.parseInt(olympiad.getProperty("AltOlyWaitTime","120"));
  545. +                   ALT_OLY_ANTI_FEED = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeed","false"));
  546. +                   ALT_OLY_ANTI_FEED_NAME = olympiad.getProperty("AltOlyAntiFeedName", "Player");
  547. +                   ALT_OLY_ANTI_FEED_TITLE = olympiad.getProperty("AltOlyAntiFeedTitle", "Olympiad");
  548. +                   ALT_OLY_ANTI_FEED_HERO_GLOW = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedHeroGlow","false"));
  549. +                   ALT_OLY_ANTI_FEED_GM_SEE = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedGmSee","false"));
  550. +                   ALT_OLY_ANTI_FEED_CHAT_ALL = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedChatAll","false"));
  551. +                   ALT_OLY_ANTI_FEED_CHAT_SHOUT = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedChatShout","false"));
  552. +                   ALT_OLY_ANTI_FEED_CHAT_TRADE = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedChatTrade","false"));
  553. +                   ALT_OLY_ANTI_FEED_CHAT_CLAN = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedChatClan","false"));
  554. +                   ALT_OLY_ANTI_FEED_CHAT_ALLY = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedChatAlly","false"));
  555. +                   ALT_OLY_ANTI_FEED_CHAT_HERO = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedChatHero","false"));
  556. +                   ALT_OLY_ANTI_FEED_CHAT_TELL = Boolean.parseBoolean(olympiad.getProperty("AltOlyAntiFeedChatTell","false"));
  557.                 }
  558.                 catch (Exception e)
  559.                 {
  560. Index: java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java
  561. ===================================================================
  562. --- java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java  (revision 5370)
  563. +++ java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java  (working copy)
  564. @@ -86,7 +86,10 @@
  565.     {
  566.         par.updateStat(POINTS, points);
  567.         final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_GAINED_S2_OLYMPIAD_POINTS);
  568. -       sm.addString(par.name);
  569. +       if (Config.ALT_OLY_ANTI_FEED)
  570. +           sm.addString(Config.ALT_OLY_ANTI_FEED_NAME);//name in Olympiad when anti feed is on
  571. +       else
  572. +           sm.addString(par.name);
  573.         sm.addNumber(points);
  574.         broadcastPacket(sm);
  575.     }
  576. @@ -95,7 +98,10 @@
  577.     {
  578.         par.updateStat(POINTS, -points);
  579.         final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LOST_S2_OLYMPIAD_POINTS);
  580. -       sm.addString(par.name);
  581. +       if (Config.ALT_OLY_ANTI_FEED)
  582. +           sm.addString(Config.ALT_OLY_ANTI_FEED_NAME);//name in Olympiad when anti feed is on
  583. +       else
  584. +           sm.addString(par.name);
  585.         sm.addNumber(points);
  586.         broadcastPacket(sm);
  587.     }
  588. Index: java/com/l2jserver/gameserver/model/actor/L2Summon.java
  589. ===================================================================
  590. --- java/com/l2jserver/gameserver/model/actor/L2Summon.java (revision 5370)
  591. +++ java/com/l2jserver/gameserver/model/actor/L2Summon.java (working copy)
  592. @@ -16,6 +16,7 @@
  593.  
  594.  import java.util.Collection;
  595.  
  596. +import com.l2jserver.Config;
  597.  import com.l2jserver.gameserver.ai.CtrlIntention;
  598.  import com.l2jserver.gameserver.ai.L2CharacterAI;
  599.  import com.l2jserver.gameserver.ai.L2SummonAI;
  600. @@ -762,7 +763,10 @@
  601.             {
  602.                 sm = SystemMessage.getSystemMessage(SystemMessageId.C1_GAVE_C2_DAMAGE_OF_S3);
  603.                 sm.addNpcName(this);
  604. -               sm.addCharName(target);
  605. +               if (this.getOwner().isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  606. +                   sm.addPcFakeName();
  607. +               else
  608. +                   sm.addCharName(target);
  609.                 sm.addNumber(damage);
  610.             }
  611.            
  612. @@ -778,7 +782,10 @@
  613.         {
  614.             SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
  615.             sm.addNpcName(this);
  616. -           sm.addCharName(attacker);
  617. +           if (this.getOwner().isInOlympiadMode() && Config.ALT_OLY_ANTI_FEED)
  618. +               sm.addPcFakeName();
  619. +           else
  620. +               sm.addCharName(attacker);
  621.             sm.addNumber((int)damage);
  622.             getOwner().sendPacket(sm);
  623.         }
  624. Index: java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java
  625. ===================================================================
  626. --- java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java  (revision 5370)
  627. +++ java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java  (working copy)
  628. @@ -227,6 +227,12 @@
  629.         return this;
  630.     }
  631.    
  632. +   public final SystemMessage addPcFakeName()
  633. +   {
  634. +       append(new SMParam(TYPE_PLAYER_NAME, Config.ALT_OLY_ANTI_FEED_NAME));
  635. +       return this;
  636. +   }
  637. +
  638.     public final SystemMessage addNpcName(final L2Npc npc)
  639.     {
  640.         return addNpcName(npc.getTemplate());
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!