Advertisement
Fabbian

Untitled

Apr 3rd, 2015
199
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.16 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. Index: head-src/com/l2jfrozen/Config.java
  38. ===================================================================
  39. --- head-src/com/l2jfrozen/Config.java (revision 1118)
  40. +++ head-src/com/l2jfrozen/Config.java (working copy)
  41. @@ -626,6 +626,9 @@
  42.  
  43. public static long CLICK_TASK;
  44.  
  45. + public static String DISABLE_ID_CLASSES_STRING;
  46. + public static FastList<Integer> DISABLE_ID_CLASSES = new FastList<>();
  47. +
  48. // ============================================================
  49. public static void loadOtherConfig()
  50. {
  51. @@ -895,6 +898,15 @@
  52.  
  53. ALLOW_QUAKE_SYSTEM = Boolean.parseBoolean(otherSettings.getProperty("AllowQuakeSystem", "False"));
  54. ENABLE_ANTI_PVP_FARM_MSG = Boolean.parseBoolean(otherSettings.getProperty("EnableAntiPvpFarmMsg", "False"));
  55. +
  56. + DISABLE_ID_CLASSES_STRING = otherSettings.getProperty("DisableIdForClasses", "");
  57. + DISABLE_ID_CLASSES = new FastList<>();
  58. + for (String class_id : DISABLE_ID_CLASSES_STRING.split(","))
  59. + {
  60. + if (!class_id.equals(""))
  61. + DISABLE_ID_CLASSES.add(Integer.parseInt(class_id));
  62. + }
  63. +
  64. }
  65. catch (final Exception e)
  66. {
  67. @@ -4261,6 +4273,7 @@
  68.  
  69. // ============================================================
  70. private static final String HEXID_FILE = FService.HEXID_FILE;
  71. +
  72. public static boolean ENABLE_OLYMPIAD_DISCONNECTION_DEBUG = false;
  73. public static int SERVER_ID;
  74. public static byte[] HEX_ID;
  75. Index: head-src/com/l2jfrozen/gameserver/model/entity/event/VIP.java
  76. ===================================================================
  77. --- head-src/com/l2jfrozen/gameserver/model/entity/event/VIP.java (revision 1118)
  78. +++ head-src/com/l2jfrozen/gameserver/model/entity/event/VIP.java (working copy)
  79. @@ -817,7 +817,11 @@
  80. replyMSG.append("Current event...<br1>");
  81. replyMSG.append(" ... Team:&nbsp;<font color=\"FFFFFF\">" + _teamName + "</font><br><br>");
  82.  
  83. - if (!_joining && !_started) // PreEvent
  84. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  85. + {
  86. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  87. + }
  88. + else if (!_joining && !_started) // PreEvent
  89. replyMSG.append("<center>Please wait until the admin/gm starts the joining period.</center>");
  90. else if (_joining && !_started)
  91. {
  92. Index: head-src/com/l2jfrozen/gameserver/model/entity/event/TvT.java
  93. ===================================================================
  94. --- head-src/com/l2jfrozen/gameserver/model/entity/event/TvT.java (revision 1118)
  95. +++ head-src/com/l2jfrozen/gameserver/model/entity/event/TvT.java (working copy)
  96. @@ -1890,7 +1890,11 @@
  97. replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
  98. replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
  99.  
  100. - if (!_started && !_joining)
  101. + if(eventPlayer.isAio() || Config.DISABLE_ID_CLASSES.contains(eventPlayer.getClassId().getId()))
  102. + {
  103. + replyMSG.append("<br><center>Hello! You can't join in Event !!</center></body></html>");
  104. + }
  105. + else if (!_started && !_joining)
  106. replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
  107. else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && !checkMaxPlayers(_playersShuffle.size()))
  108. {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement