Advertisement
Fabbian

Untitled

Apr 3rd, 2015
208
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.21 KB | None | 0 0
  1. ### Eclipse Workspace Patch 1.0
  2. #P L2jFrozen_GameServer
  3. Index: head-src/com/l2jfrozen/gameserver/model/entity/event/DM.java
  4. ===================================================================
  5. --- head-src/com/l2jfrozen/gameserver/model/entity/event/DM.java (revision 1118)
  6. +++ head-src/com/l2jfrozen/gameserver/model/entity/event/DM.java (working copy)
  7. @@ -1770,7 +1770,11 @@
  8. synchronized (_players)
  9. {
  10.  
  11. - if (!_started && !_joining)
  12. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  13. + {
  14. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  15. + }
  16. + else if (!_started && !_joining)
  17. replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
  18. else if (!checkMaxPlayers(_players.size()))
  19. {
  20. Index: head-src/com/l2jfrozen/gameserver/model/entity/event/CTF.java
  21. ===================================================================
  22. --- head-src/com/l2jfrozen/gameserver/model/entity/event/CTF.java (revision 1118)
  23. +++ head-src/com/l2jfrozen/gameserver/model/entity/event/CTF.java (working copy)
  24. @@ -1993,7 +1993,11 @@
  25. replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
  26. replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
  27.  
  28. - if (!_started && !_joining)
  29. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  30. + {
  31. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  32. + }
  33. + else if (!_started && !_joining)
  34. replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
  35. else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && !checkMaxPlayers(_playersShuffle.size()))
  36. {
  37. @@ -2825,8 +2829,12 @@
  38. replyMSG.append("<font color=\"LEVEL\">This is your Flag</font><br1>");
  39. else
  40. replyMSG.append("<font color=\"LEVEL\">Enemy Flag!</font><br1>");
  41. - if (_started)
  42. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  43. {
  44. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  45. + }
  46. + else if (_started)
  47. + {
  48. processInFlagRange(eventPlayer);
  49. }
  50. else
  51. Index: head-src/com/l2jfrozen/Config.java
  52. ===================================================================
  53. --- head-src/com/l2jfrozen/Config.java (revision 1118)
  54. +++ head-src/com/l2jfrozen/Config.java (working copy)
  55. @@ -626,6 +626,9 @@
  56.  
  57. public static long CLICK_TASK;
  58.  
  59. + public static String DISABLE_ID_CLASSES_STRING;
  60. + public static FastList<Integer> DISABLE_ID_CLASSES = new FastList<>();
  61. +
  62. // ============================================================
  63. public static void loadOtherConfig()
  64. {
  65. @@ -895,6 +898,15 @@
  66.  
  67. ALLOW_QUAKE_SYSTEM = Boolean.parseBoolean(otherSettings.getProperty("AllowQuakeSystem", "False"));
  68. ENABLE_ANTI_PVP_FARM_MSG = Boolean.parseBoolean(otherSettings.getProperty("EnableAntiPvpFarmMsg", "False"));
  69. +
  70. + DISABLE_ID_CLASSES_STRING = otherSettings.getProperty("DisableIdForClasses", "");
  71. + DISABLE_ID_CLASSES = new FastList<>();
  72. + for (String class_id : DISABLE_ID_CLASSES_STRING.split(","))
  73. + {
  74. + if (!class_id.equals(""))
  75. + DISABLE_ID_CLASSES.add(Integer.parseInt(class_id));
  76. + }
  77. +
  78. }
  79. catch (final Exception e)
  80. {
  81. @@ -4261,6 +4273,7 @@
  82.  
  83. // ============================================================
  84. private static final String HEXID_FILE = FService.HEXID_FILE;
  85. +
  86. public static boolean ENABLE_OLYMPIAD_DISCONNECTION_DEBUG = false;
  87. public static int SERVER_ID;
  88. public static byte[] HEX_ID;
  89. Index: head-src/com/l2jfrozen/gameserver/model/entity/event/VIP.java
  90. ===================================================================
  91. --- head-src/com/l2jfrozen/gameserver/model/entity/event/VIP.java (revision 1118)
  92. +++ head-src/com/l2jfrozen/gameserver/model/entity/event/VIP.java (working copy)
  93. @@ -469,7 +469,11 @@
  94. replyMSG.append("Current event...<br1>");
  95. replyMSG.append("Team:&nbsp;<font color=\"FFFFFF\">" + _teamName + "</font><br><br>");
  96.  
  97. - if (!_started)
  98. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  99. + {
  100. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  101. + }
  102. + else if (!_started)
  103. replyMSG.append("<center>Please wait until the admin/gm starts the joining period.</center>");
  104. else if (eventPlayer._isTheVIP)
  105. {
  106. @@ -817,7 +821,11 @@
  107. replyMSG.append("Current event...<br1>");
  108. replyMSG.append(" ... Team:&nbsp;<font color=\"FFFFFF\">" + _teamName + "</font><br><br>");
  109.  
  110. - if (!_joining && !_started) // PreEvent
  111. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  112. + {
  113. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  114. + }
  115. + else if (!_joining && !_started) // PreEvent
  116. replyMSG.append("<center>Please wait until the admin/gm starts the joining period.</center>");
  117. else if (_joining && !_started)
  118. {
  119. Index: head-src/com/l2jfrozen/gameserver/model/entity/event/TvT.java
  120. ===================================================================
  121. --- head-src/com/l2jfrozen/gameserver/model/entity/event/TvT.java (revision 1118)
  122. +++ head-src/com/l2jfrozen/gameserver/model/entity/event/TvT.java (working copy)
  123. @@ -1890,7 +1890,11 @@
  124. replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
  125. replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
  126.  
  127. - if (!_started && !_joining)
  128. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  129. + {
  130. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  131. + }
  132. + else if (!_started && !_joining)
  133. replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
  134. else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && !checkMaxPlayers(_playersShuffle.size()))
  135. {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement