Advertisement
Guest User

Untitled

a guest
Aug 15th, 2017
121
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 33.37 KB | None | 0 0
  1. ### Eclipse Workspace Patch 1.0
  2. #P L2J_DataPack_BETA
  3. Index: data/scripts/handlers/MasterHandler.java
  4. ===================================================================
  5. --- data/scripts/handlers/MasterHandler.java    (revision 7973)
  6. +++ data/scripts/handlers/MasterHandler.java    (working copy)
  7. @@ -271,290 +271,299 @@
  8.  {
  9.     private static Logger _log = Logger.getLogger(MasterHandler.class.getName());
  10.    
  11. +   private static ActionHandler ACTION = ActionHandler.getInstance();
  12. +   private static AdminCommandHandler ADMIN = AdminCommandHandler.getInstance();
  13. +   private static BypassHandler BYPASS = BypassHandler.getInstance();
  14. +   private static ChatHandler CHAT = ChatHandler.getInstance();
  15. +   private static ItemHandler ITEM = ItemHandler.getInstance();
  16. +   private static SkillHandler SKILL = SkillHandler.getInstance();
  17. +   private static UserCommandHandler USER = UserCommandHandler.getInstance();
  18. +   private static VoicedCommandHandler VOICE = VoicedCommandHandler.getInstance();
  19. +  
  20.     private static void loadActionHandlers()
  21.     {
  22. -       ActionHandler.getInstance().registerActionHandler(new L2ArtefactInstanceAction());
  23. -       ActionHandler.getInstance().registerActionHandler(new L2DecoyAction());
  24. -       ActionHandler.getInstance().registerActionHandler(new L2DoorInstanceAction());
  25. -       ActionHandler.getInstance().registerActionHandler(new L2ItemInstanceAction());
  26. -       ActionHandler.getInstance().registerActionHandler(new L2NpcAction());
  27. -       ActionHandler.getInstance().registerActionHandler(new L2PcInstanceAction());
  28. -       ActionHandler.getInstance().registerActionHandler(new L2PetInstanceAction());
  29. -       ActionHandler.getInstance().registerActionHandler(new L2StaticObjectInstanceAction());
  30. -       ActionHandler.getInstance().registerActionHandler(new L2SummonAction());
  31. -       ActionHandler.getInstance().registerActionHandler(new L2TrapAction());
  32. -       _log.config("Loaded " + ActionHandler.getInstance().size() + "  ActionHandlers");
  33. +       ACTION.registerActionHandler(new L2ArtefactInstanceAction());
  34. +       ACTION.registerActionHandler(new L2DecoyAction());
  35. +       ACTION.registerActionHandler(new L2DoorInstanceAction());
  36. +       ACTION.registerActionHandler(new L2ItemInstanceAction());
  37. +       ACTION.registerActionHandler(new L2NpcAction());
  38. +       ACTION.registerActionHandler(new L2PcInstanceAction());
  39. +       ACTION.registerActionHandler(new L2PetInstanceAction());
  40. +       ACTION.registerActionHandler(new L2StaticObjectInstanceAction());
  41. +       ACTION.registerActionHandler(new L2SummonAction());
  42. +       ACTION.registerActionHandler(new L2TrapAction());
  43. +       _log.config("Loaded " + ACTION.size() + "  ActionHandlers");
  44.     }
  45.    
  46.     private static void loadActionShiftHandlers()
  47.     {
  48. -       ActionHandler.getInstance().registerActionShiftHandler(new L2DoorInstanceActionShift());
  49. -       ActionHandler.getInstance().registerActionShiftHandler(new L2ItemInstanceActionShift());
  50. -       ActionHandler.getInstance().registerActionShiftHandler(new L2NpcActionShift());
  51. -       ActionHandler.getInstance().registerActionShiftHandler(new L2PcInstanceActionShift());
  52. -       ActionHandler.getInstance().registerActionShiftHandler(new L2StaticObjectInstanceActionShift());
  53. -       ActionHandler.getInstance().registerActionShiftHandler(new L2SummonActionShift());
  54. -       _log.config("Loaded " + ActionHandler.getInstance().sizeShift() + " ActionShiftHandlers");
  55. +       ACTION.registerActionShiftHandler(new L2DoorInstanceActionShift());
  56. +       ACTION.registerActionShiftHandler(new L2ItemInstanceActionShift());
  57. +       ACTION.registerActionShiftHandler(new L2NpcActionShift());
  58. +       ACTION.registerActionShiftHandler(new L2PcInstanceActionShift());
  59. +       ACTION.registerActionShiftHandler(new L2StaticObjectInstanceActionShift());
  60. +       ACTION.registerActionShiftHandler(new L2SummonActionShift());
  61. +       _log.config("Loaded " + ACTION.sizeShift() + " ActionShiftHandlers");
  62.     }
  63.    
  64.     private static void loadAdminHandlers()
  65.     {
  66. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminAdmin());
  67. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminAnnouncements());
  68. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminBan());
  69. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminBBS());
  70. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminBuffs());
  71. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminCache());
  72. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminCamera());
  73. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminChangeAccessLevel());
  74. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminClan());
  75. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminCreateItem());
  76. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminCursedWeapons());
  77. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminDebug());
  78. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminDelete());
  79. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminDisconnect());
  80. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminDoorControl());
  81. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminEditChar());
  82. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminEditNpc());
  83. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminEffects());
  84. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminElement());
  85. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminEnchant());
  86. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminEventEngine());
  87. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminEvents());
  88. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminExpSp());
  89. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminFightCalculator());
  90. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminFortSiege());
  91. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminGeodata());
  92. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminGeoEditor());
  93. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminGm());
  94. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminGmChat());
  95. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminGraciaSeeds());
  96. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminHeal());
  97. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminHelpPage());
  98. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminInstance());
  99. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminInstanceZone());
  100. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminInvul());
  101. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminKick());
  102. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminKill());
  103. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminLevel());
  104. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminLogin());
  105. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminMammon());
  106. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminManor());
  107. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminMenu());
  108. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminMessages());
  109. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminMobGroup());
  110. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminMonsterRace());
  111. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminPathNode());
  112. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminPetition());
  113. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminPForge());
  114. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminPledge());
  115. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminPolymorph());
  116. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminQuest());
  117. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminRepairChar());
  118. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminRes());
  119. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminRide());
  120. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminShop());
  121. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminShowQuests());
  122. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminShutdown());
  123. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminSiege());
  124. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminSkill());
  125. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminSpawn());
  126. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminSummon());
  127. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTarget());
  128. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTeleport());
  129. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTerritoryWar());
  130. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTest());
  131. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTvTEvent());
  132. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminUnblockIp());
  133. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminVitality());
  134. -       AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminZone());
  135. -       _log.config("Loaded " + AdminCommandHandler.getInstance().size() + "  AdminCommandHandlers");
  136. +       ADMIN.registerAdminCommandHandler(new AdminAdmin());
  137. +       ADMIN.registerAdminCommandHandler(new AdminAnnouncements());
  138. +       ADMIN.registerAdminCommandHandler(new AdminBan());
  139. +       ADMIN.registerAdminCommandHandler(new AdminBBS());
  140. +       ADMIN.registerAdminCommandHandler(new AdminBuffs());
  141. +       ADMIN.registerAdminCommandHandler(new AdminCache());
  142. +       ADMIN.registerAdminCommandHandler(new AdminCamera());
  143. +       ADMIN.registerAdminCommandHandler(new AdminChangeAccessLevel());
  144. +       ADMIN.registerAdminCommandHandler(new AdminClan());
  145. +       ADMIN.registerAdminCommandHandler(new AdminCreateItem());
  146. +       ADMIN.registerAdminCommandHandler(new AdminCursedWeapons());
  147. +       ADMIN.registerAdminCommandHandler(new AdminDebug());
  148. +       ADMIN.registerAdminCommandHandler(new AdminDelete());
  149. +       ADMIN.registerAdminCommandHandler(new AdminDisconnect());
  150. +       ADMIN.registerAdminCommandHandler(new AdminDoorControl());
  151. +       ADMIN.registerAdminCommandHandler(new AdminEditChar());
  152. +       ADMIN.registerAdminCommandHandler(new AdminEditNpc());
  153. +       ADMIN.registerAdminCommandHandler(new AdminEffects());
  154. +       ADMIN.registerAdminCommandHandler(new AdminElement());
  155. +       ADMIN.registerAdminCommandHandler(new AdminEnchant());
  156. +       ADMIN.registerAdminCommandHandler(new AdminEventEngine());
  157. +       ADMIN.registerAdminCommandHandler(new AdminEvents());
  158. +       ADMIN.registerAdminCommandHandler(new AdminExpSp());
  159. +       ADMIN.registerAdminCommandHandler(new AdminFightCalculator());
  160. +       ADMIN.registerAdminCommandHandler(new AdminFortSiege());
  161. +       ADMIN.registerAdminCommandHandler(new AdminGeodata());
  162. +       ADMIN.registerAdminCommandHandler(new AdminGeoEditor());
  163. +       ADMIN.registerAdminCommandHandler(new AdminGm());
  164. +       ADMIN.registerAdminCommandHandler(new AdminGmChat());
  165. +       ADMIN.registerAdminCommandHandler(new AdminGraciaSeeds());
  166. +       ADMIN.registerAdminCommandHandler(new AdminHeal());
  167. +       ADMIN.registerAdminCommandHandler(new AdminHelpPage());
  168. +       ADMIN.registerAdminCommandHandler(new AdminInstance());
  169. +       ADMIN.registerAdminCommandHandler(new AdminInstanceZone());
  170. +       ADMIN.registerAdminCommandHandler(new AdminInvul());
  171. +       ADMIN.registerAdminCommandHandler(new AdminKick());
  172. +       ADMIN.registerAdminCommandHandler(new AdminKill());
  173. +       ADMIN.registerAdminCommandHandler(new AdminLevel());
  174. +       ADMIN.registerAdminCommandHandler(new AdminLogin());
  175. +       ADMIN.registerAdminCommandHandler(new AdminMammon());
  176. +       ADMIN.registerAdminCommandHandler(new AdminManor());
  177. +       ADMIN.registerAdminCommandHandler(new AdminMenu());
  178. +       ADMIN.registerAdminCommandHandler(new AdminMessages());
  179. +       ADMIN.registerAdminCommandHandler(new AdminMobGroup());
  180. +       ADMIN.registerAdminCommandHandler(new AdminMonsterRace());
  181. +       ADMIN.registerAdminCommandHandler(new AdminPathNode());
  182. +       ADMIN.registerAdminCommandHandler(new AdminPetition());
  183. +       ADMIN.registerAdminCommandHandler(new AdminPForge());
  184. +       ADMIN.registerAdminCommandHandler(new AdminPledge());
  185. +       ADMIN.registerAdminCommandHandler(new AdminPolymorph());
  186. +       ADMIN.registerAdminCommandHandler(new AdminQuest());
  187. +       ADMIN.registerAdminCommandHandler(new AdminRepairChar());
  188. +       ADMIN.registerAdminCommandHandler(new AdminRes());
  189. +       ADMIN.registerAdminCommandHandler(new AdminRide());
  190. +       ADMIN.registerAdminCommandHandler(new AdminShop());
  191. +       ADMIN.registerAdminCommandHandler(new AdminShowQuests());
  192. +       ADMIN.registerAdminCommandHandler(new AdminShutdown());
  193. +       ADMIN.registerAdminCommandHandler(new AdminSiege());
  194. +       ADMIN.registerAdminCommandHandler(new AdminSkill());
  195. +       ADMIN.registerAdminCommandHandler(new AdminSpawn());
  196. +       ADMIN.registerAdminCommandHandler(new AdminSummon());
  197. +       ADMIN.registerAdminCommandHandler(new AdminTarget());
  198. +       ADMIN.registerAdminCommandHandler(new AdminTeleport());
  199. +       ADMIN.registerAdminCommandHandler(new AdminTerritoryWar());
  200. +       ADMIN.registerAdminCommandHandler(new AdminTest());
  201. +       ADMIN.registerAdminCommandHandler(new AdminTvTEvent());
  202. +       ADMIN.registerAdminCommandHandler(new AdminUnblockIp());
  203. +       ADMIN.registerAdminCommandHandler(new AdminVitality());
  204. +       ADMIN.registerAdminCommandHandler(new AdminZone());
  205. +       _log.config("Loaded " + ADMIN.size() + "  AdminCommandHandlers");
  206.     }
  207.    
  208.     private static void loadBypassHandlers()
  209.     {
  210. -       BypassHandler.getInstance().registerBypassHandler(new Augment());
  211. -       BypassHandler.getInstance().registerBypassHandler(new Buy());
  212. -       BypassHandler.getInstance().registerBypassHandler(new BuyShadowItem());
  213. -       BypassHandler.getInstance().registerBypassHandler(new ChatLink());
  214. -       BypassHandler.getInstance().registerBypassHandler(new ClanWarehouse());
  215. -       BypassHandler.getInstance().registerBypassHandler(new CPRecovery());
  216. -       BypassHandler.getInstance().registerBypassHandler(new DrawHenna());
  217. -       BypassHandler.getInstance().registerBypassHandler(new Festival());
  218. -       BypassHandler.getInstance().registerBypassHandler(new FishSkillList());
  219. -       BypassHandler.getInstance().registerBypassHandler(new FortSiege());
  220. -       BypassHandler.getInstance().registerBypassHandler(new ItemAuctionLink());
  221. -       BypassHandler.getInstance().registerBypassHandler(new Link());
  222. -       BypassHandler.getInstance().registerBypassHandler(new Loto());
  223. -       BypassHandler.getInstance().registerBypassHandler(new ManorManager());
  224. -       BypassHandler.getInstance().registerBypassHandler(new Multisell());
  225. -       BypassHandler.getInstance().registerBypassHandler(new Observation());
  226. -       BypassHandler.getInstance().registerBypassHandler(new OlympiadObservation());
  227. -       BypassHandler.getInstance().registerBypassHandler(new OlympiadManagerLink());
  228. -       BypassHandler.getInstance().registerBypassHandler(new QuestLink());
  229. -       BypassHandler.getInstance().registerBypassHandler(new PlayerHelp());
  230. -       BypassHandler.getInstance().registerBypassHandler(new PrivateWarehouse());
  231. -       BypassHandler.getInstance().registerBypassHandler(new QuestList());
  232. -       BypassHandler.getInstance().registerBypassHandler(new ReceivePremium());
  233. -       BypassHandler.getInstance().registerBypassHandler(new ReleaseAttribute());
  234. -       BypassHandler.getInstance().registerBypassHandler(new RemoveDeathPenalty());
  235. -       BypassHandler.getInstance().registerBypassHandler(new RemoveHennaList());
  236. -       BypassHandler.getInstance().registerBypassHandler(new RentPet());
  237. -       BypassHandler.getInstance().registerBypassHandler(new RideWyvern());
  238. -       BypassHandler.getInstance().registerBypassHandler(new Rift());
  239. -       BypassHandler.getInstance().registerBypassHandler(new SkillList());
  240. -       BypassHandler.getInstance().registerBypassHandler(new SupportBlessing());
  241. -       BypassHandler.getInstance().registerBypassHandler(new SupportMagic());
  242. -       BypassHandler.getInstance().registerBypassHandler(new TerritoryStatus());
  243. -       BypassHandler.getInstance().registerBypassHandler(new TerritoryWar());
  244. -       BypassHandler.getInstance().registerBypassHandler(new Transform());
  245. -       BypassHandler.getInstance().registerBypassHandler(new VoiceCommand());
  246. -       BypassHandler.getInstance().registerBypassHandler(new Wear());
  247. -       _log.config("Loaded " + BypassHandler.getInstance().size() + "  BypassHandlers");
  248. +       BYPASS.registerBypassHandler(new Augment());
  249. +       BYPASS.registerBypassHandler(new Buy());
  250. +       BYPASS.registerBypassHandler(new BuyShadowItem());
  251. +       BYPASS.registerBypassHandler(new ChatLink());
  252. +       BYPASS.registerBypassHandler(new ClanWarehouse());
  253. +       BYPASS.registerBypassHandler(new CPRecovery());
  254. +       BYPASS.registerBypassHandler(new DrawHenna());
  255. +       BYPASS.registerBypassHandler(new Festival());
  256. +       BYPASS.registerBypassHandler(new FishSkillList());
  257. +       BYPASS.registerBypassHandler(new FortSiege());
  258. +       BYPASS.registerBypassHandler(new ItemAuctionLink());
  259. +       BYPASS.registerBypassHandler(new Link());
  260. +       BYPASS.registerBypassHandler(new Loto());
  261. +       BYPASS.registerBypassHandler(new ManorManager());
  262. +       BYPASS.registerBypassHandler(new Multisell());
  263. +       BYPASS.registerBypassHandler(new Observation());
  264. +       BYPASS.registerBypassHandler(new OlympiadObservation());
  265. +       BYPASS.registerBypassHandler(new OlympiadManagerLink());
  266. +       BYPASS.registerBypassHandler(new QuestLink());
  267. +       BYPASS.registerBypassHandler(new PlayerHelp());
  268. +       BYPASS.registerBypassHandler(new PrivateWarehouse());
  269. +       BYPASS.registerBypassHandler(new QuestList());
  270. +       BYPASS.registerBypassHandler(new ReceivePremium());
  271. +       BYPASS.registerBypassHandler(new ReleaseAttribute());
  272. +       BYPASS.registerBypassHandler(new RemoveDeathPenalty());
  273. +       BYPASS.registerBypassHandler(new RemoveHennaList());
  274. +       BYPASS.registerBypassHandler(new RentPet());
  275. +       BYPASS.registerBypassHandler(new RideWyvern());
  276. +       BYPASS.registerBypassHandler(new Rift());
  277. +       BYPASS.registerBypassHandler(new SkillList());
  278. +       BYPASS.registerBypassHandler(new SupportBlessing());
  279. +       BYPASS.registerBypassHandler(new SupportMagic());
  280. +       BYPASS.registerBypassHandler(new TerritoryStatus());
  281. +       BYPASS.registerBypassHandler(new TerritoryWar());
  282. +       BYPASS.registerBypassHandler(new Transform());
  283. +       BYPASS.registerBypassHandler(new VoiceCommand());
  284. +       BYPASS.registerBypassHandler(new Wear());
  285. +       _log.config("Loaded " + BYPASS.size() + "  BypassHandlers");
  286.     }
  287.    
  288.     private static void loadChatHandlers()
  289.     {
  290. -       ChatHandler.getInstance().registerChatHandler(new ChatAll());
  291. -       ChatHandler.getInstance().registerChatHandler(new ChatAlliance());
  292. -       ChatHandler.getInstance().registerChatHandler(new ChatBattlefield());
  293. -       ChatHandler.getInstance().registerChatHandler(new ChatClan());
  294. -       ChatHandler.getInstance().registerChatHandler(new ChatHeroVoice());
  295. -       ChatHandler.getInstance().registerChatHandler(new ChatParty());
  296. -       ChatHandler.getInstance().registerChatHandler(new ChatPartyMatchRoom());
  297. -       ChatHandler.getInstance().registerChatHandler(new ChatPartyRoomAll());
  298. -       ChatHandler.getInstance().registerChatHandler(new ChatPartyRoomCommander());
  299. -       ChatHandler.getInstance().registerChatHandler(new ChatPetition());
  300. -       ChatHandler.getInstance().registerChatHandler(new ChatShout());
  301. -       ChatHandler.getInstance().registerChatHandler(new ChatTell());
  302. -       ChatHandler.getInstance().registerChatHandler(new ChatTrade());
  303. -       _log.config("Loaded " + ChatHandler.getInstance().size() + "  ChatHandlers");
  304. +       CHAT.registerChatHandler(new ChatAll());
  305. +       CHAT.registerChatHandler(new ChatAlliance());
  306. +       CHAT.registerChatHandler(new ChatBattlefield());
  307. +       CHAT.registerChatHandler(new ChatClan());
  308. +       CHAT.registerChatHandler(new ChatHeroVoice());
  309. +       CHAT.registerChatHandler(new ChatParty());
  310. +       CHAT.registerChatHandler(new ChatPartyMatchRoom());
  311. +       CHAT.registerChatHandler(new ChatPartyRoomAll());
  312. +       CHAT.registerChatHandler(new ChatPartyRoomCommander());
  313. +       CHAT.registerChatHandler(new ChatPetition());
  314. +       CHAT.registerChatHandler(new ChatShout());
  315. +       CHAT.registerChatHandler(new ChatTell());
  316. +       CHAT.registerChatHandler(new ChatTrade());
  317. +       _log.config("Loaded " + CHAT.size() + "  ChatHandlers");
  318.     }
  319.    
  320.     private static void loadItemHandlers()
  321.     {
  322. -       ItemHandler.getInstance().registerItemHandler(new ScrollOfResurrection());
  323. -       ItemHandler.getInstance().registerItemHandler(new SoulShots());
  324. -       ItemHandler.getInstance().registerItemHandler(new SpiritShot());
  325. -       ItemHandler.getInstance().registerItemHandler(new BlessedSpiritShot());
  326. -       ItemHandler.getInstance().registerItemHandler(new BeastSoulShot());
  327. -       ItemHandler.getInstance().registerItemHandler(new BeastSpiritShot());
  328. -       ItemHandler.getInstance().registerItemHandler(new PaganKeys());
  329. -       ItemHandler.getInstance().registerItemHandler(new Maps());
  330. -       ItemHandler.getInstance().registerItemHandler(new NicknameColor());
  331. -       ItemHandler.getInstance().registerItemHandler(new Recipes());
  332. -       ItemHandler.getInstance().registerItemHandler(new RollingDice());
  333. -       ItemHandler.getInstance().registerItemHandler(new EnchantAttribute());
  334. -       ItemHandler.getInstance().registerItemHandler(new EnchantScrolls());
  335. -       ItemHandler.getInstance().registerItemHandler(new ExtractableItems());
  336. -       ItemHandler.getInstance().registerItemHandler(new Book());
  337. -       ItemHandler.getInstance().registerItemHandler(new SevenSignsRecord());
  338. -       ItemHandler.getInstance().registerItemHandler(new ItemSkills());
  339. -       ItemHandler.getInstance().registerItemHandler(new ItemSkillsTemplate());
  340. -       ItemHandler.getInstance().registerItemHandler(new Seed());
  341. -       ItemHandler.getInstance().registerItemHandler(new Harvester());
  342. -       ItemHandler.getInstance().registerItemHandler(new MercTicket());
  343. -       ItemHandler.getInstance().registerItemHandler(new FishShots());
  344. -       ItemHandler.getInstance().registerItemHandler(new PetFood());
  345. -       ItemHandler.getInstance().registerItemHandler(new SpecialXMas());
  346. -       ItemHandler.getInstance().registerItemHandler(new SummonItems());
  347. -       ItemHandler.getInstance().registerItemHandler(new BeastSpice());
  348. -       ItemHandler.getInstance().registerItemHandler(new TeleportBookmark());
  349. -       ItemHandler.getInstance().registerItemHandler(new Elixir());
  350. -       ItemHandler.getInstance().registerItemHandler(new Disguise());
  351. -       ItemHandler.getInstance().registerItemHandler(new ManaPotion());
  352. -       ItemHandler.getInstance().registerItemHandler(new EnergyStarStone());
  353. -       ItemHandler.getInstance().registerItemHandler(new EventItem());
  354. -       _log.config("Loaded " + ItemHandler.getInstance().size() + " ItemHandlers");
  355. +       ITEM.registerItemHandler(new ScrollOfResurrection());
  356. +       ITEM.registerItemHandler(new SoulShots());
  357. +       ITEM.registerItemHandler(new SpiritShot());
  358. +       ITEM.registerItemHandler(new BlessedSpiritShot());
  359. +       ITEM.registerItemHandler(new BeastSoulShot());
  360. +       ITEM.registerItemHandler(new BeastSpiritShot());
  361. +       ITEM.registerItemHandler(new PaganKeys());
  362. +       ITEM.registerItemHandler(new Maps());
  363. +       ITEM.registerItemHandler(new NicknameColor());
  364. +       ITEM.registerItemHandler(new Recipes());
  365. +       ITEM.registerItemHandler(new RollingDice());
  366. +       ITEM.registerItemHandler(new EnchantAttribute());
  367. +       ITEM.registerItemHandler(new EnchantScrolls());
  368. +       ITEM.registerItemHandler(new ExtractableItems());
  369. +       ITEM.registerItemHandler(new Book());
  370. +       ITEM.registerItemHandler(new SevenSignsRecord());
  371. +       ITEM.registerItemHandler(new ItemSkills());
  372. +       ITEM.registerItemHandler(new ItemSkillsTemplate());
  373. +       ITEM.registerItemHandler(new Seed());
  374. +       ITEM.registerItemHandler(new Harvester());
  375. +       ITEM.registerItemHandler(new MercTicket());
  376. +       ITEM.registerItemHandler(new FishShots());
  377. +       ITEM.registerItemHandler(new PetFood());
  378. +       ITEM.registerItemHandler(new SpecialXMas());
  379. +       ITEM.registerItemHandler(new SummonItems());
  380. +       ITEM.registerItemHandler(new BeastSpice());
  381. +       ITEM.registerItemHandler(new TeleportBookmark());
  382. +       ITEM.registerItemHandler(new Elixir());
  383. +       ITEM.registerItemHandler(new Disguise());
  384. +       ITEM.registerItemHandler(new ManaPotion());
  385. +       ITEM.registerItemHandler(new EnergyStarStone());
  386. +       ITEM.registerItemHandler(new EventItem());
  387. +       _log.config("Loaded " + ITEM.size() + " ItemHandlers");
  388.     }
  389.    
  390.     private static void loadSkillHandlers()
  391.     {
  392. -       SkillHandler.getInstance().registerSkillHandler(new Blow());
  393. -       SkillHandler.getInstance().registerSkillHandler(new Pdam());
  394. -       SkillHandler.getInstance().registerSkillHandler(new Mdam());
  395. -       SkillHandler.getInstance().registerSkillHandler(new CpDam());
  396. -       SkillHandler.getInstance().registerSkillHandler(new CpDamPercent());
  397. -       SkillHandler.getInstance().registerSkillHandler(new Manadam());
  398. -       SkillHandler.getInstance().registerSkillHandler(new Heal());
  399. -       SkillHandler.getInstance().registerSkillHandler(new HealPercent());
  400. -       SkillHandler.getInstance().registerSkillHandler(new CombatPointHeal());
  401. -       SkillHandler.getInstance().registerSkillHandler(new ManaHeal());
  402. -       SkillHandler.getInstance().registerSkillHandler(new BalanceLife());
  403. -       SkillHandler.getInstance().registerSkillHandler(new Charge());
  404. -       SkillHandler.getInstance().registerSkillHandler(new Continuous());
  405. -       SkillHandler.getInstance().registerSkillHandler(new Detection());
  406. -       SkillHandler.getInstance().registerSkillHandler(new Resurrect());
  407. -       SkillHandler.getInstance().registerSkillHandler(new ShiftTarget());
  408. -       SkillHandler.getInstance().registerSkillHandler(new Spoil());
  409. -       SkillHandler.getInstance().registerSkillHandler(new Sweep());
  410. -       SkillHandler.getInstance().registerSkillHandler(new StrSiegeAssault());
  411. -       SkillHandler.getInstance().registerSkillHandler(new SummonFriend());
  412. -       SkillHandler.getInstance().registerSkillHandler(new Disablers());
  413. -       SkillHandler.getInstance().registerSkillHandler(new Cancel());
  414. -       SkillHandler.getInstance().registerSkillHandler(new ChainHeal());
  415. -       SkillHandler.getInstance().registerSkillHandler(new StealBuffs());
  416. -       SkillHandler.getInstance().registerSkillHandler(new BallistaBomb());
  417. -       SkillHandler.getInstance().registerSkillHandler(new TakeCastle());
  418. -       SkillHandler.getInstance().registerSkillHandler(new TakeFort());
  419. -       SkillHandler.getInstance().registerSkillHandler(new Unlock());
  420. -       SkillHandler.getInstance().registerSkillHandler(new Craft());
  421. -       SkillHandler.getInstance().registerSkillHandler(new Fishing());
  422. -       SkillHandler.getInstance().registerSkillHandler(new FishingSkill());
  423. -       SkillHandler.getInstance().registerSkillHandler(new BeastSkills());
  424. -       SkillHandler.getInstance().registerSkillHandler(new DeluxeKey());
  425. -       SkillHandler.getInstance().registerSkillHandler(new Sow());
  426. -       SkillHandler.getInstance().registerSkillHandler(new Soul());
  427. -       SkillHandler.getInstance().registerSkillHandler(new Harvest());
  428. -       SkillHandler.getInstance().registerSkillHandler(new GetPlayer());
  429. -       SkillHandler.getInstance().registerSkillHandler(new TransformDispel());
  430. -       SkillHandler.getInstance().registerSkillHandler(new Trap());
  431. -       SkillHandler.getInstance().registerSkillHandler(new GiveSp());
  432. -       SkillHandler.getInstance().registerSkillHandler(new GiveReco());
  433. -       SkillHandler.getInstance().registerSkillHandler(new GiveVitality());
  434. -       SkillHandler.getInstance().registerSkillHandler(new InstantJump());
  435. -       SkillHandler.getInstance().registerSkillHandler(new Dummy());
  436. -       SkillHandler.getInstance().registerSkillHandler(new Extractable());
  437. -       SkillHandler.getInstance().registerSkillHandler(new RefuelAirShip());
  438. -       SkillHandler.getInstance().registerSkillHandler(new NornilsPower());
  439. -       _log.config("Loaded " + SkillHandler.getInstance().size() + " SkillHandlers");
  440. +       SKILL.registerSkillHandler(new Blow());
  441. +       SKILL.registerSkillHandler(new Pdam());
  442. +       SKILL.registerSkillHandler(new Mdam());
  443. +       SKILL.registerSkillHandler(new CpDam());
  444. +       SKILL.registerSkillHandler(new CpDamPercent());
  445. +       SKILL.registerSkillHandler(new Manadam());
  446. +       SKILL.registerSkillHandler(new Heal());
  447. +       SKILL.registerSkillHandler(new HealPercent());
  448. +       SKILL.registerSkillHandler(new CombatPointHeal());
  449. +       SKILL.registerSkillHandler(new ManaHeal());
  450. +       SKILL.registerSkillHandler(new BalanceLife());
  451. +       SKILL.registerSkillHandler(new Charge());
  452. +       SKILL.registerSkillHandler(new Continuous());
  453. +       SKILL.registerSkillHandler(new Detection());
  454. +       SKILL.registerSkillHandler(new Resurrect());
  455. +       SKILL.registerSkillHandler(new ShiftTarget());
  456. +       SKILL.registerSkillHandler(new Spoil());
  457. +       SKILL.registerSkillHandler(new Sweep());
  458. +       SKILL.registerSkillHandler(new StrSiegeAssault());
  459. +       SKILL.registerSkillHandler(new SummonFriend());
  460. +       SKILL.registerSkillHandler(new Disablers());
  461. +       SKILL.registerSkillHandler(new Cancel());
  462. +       SKILL.registerSkillHandler(new ChainHeal());
  463. +       SKILL.registerSkillHandler(new StealBuffs());
  464. +       SKILL.registerSkillHandler(new BallistaBomb());
  465. +       SKILL.registerSkillHandler(new TakeCastle());
  466. +       SKILL.registerSkillHandler(new TakeFort());
  467. +       SKILL.registerSkillHandler(new Unlock());
  468. +       SKILL.registerSkillHandler(new Craft());
  469. +       SKILL.registerSkillHandler(new Fishing());
  470. +       SKILL.registerSkillHandler(new FishingSkill());
  471. +       SKILL.registerSkillHandler(new BeastSkills());
  472. +       SKILL.registerSkillHandler(new DeluxeKey());
  473. +       SKILL.registerSkillHandler(new Sow());
  474. +       SKILL.registerSkillHandler(new Soul());
  475. +       SKILL.registerSkillHandler(new Harvest());
  476. +       SKILL.registerSkillHandler(new GetPlayer());
  477. +       SKILL.registerSkillHandler(new TransformDispel());
  478. +       SKILL.registerSkillHandler(new Trap());
  479. +       SKILL.registerSkillHandler(new GiveSp());
  480. +       SKILL.registerSkillHandler(new GiveReco());
  481. +       SKILL.registerSkillHandler(new GiveVitality());
  482. +       SKILL.registerSkillHandler(new InstantJump());
  483. +       SKILL.registerSkillHandler(new Dummy());
  484. +       SKILL.registerSkillHandler(new Extractable());
  485. +       SKILL.registerSkillHandler(new RefuelAirShip());
  486. +       SKILL.registerSkillHandler(new NornilsPower());
  487. +       _log.config("Loaded " + SKILL.size() + " SkillHandlers");
  488.     }
  489.    
  490.     private static void loadUserHandlers()
  491.     {
  492. -       UserCommandHandler.getInstance().registerUserCommandHandler(new ClanPenalty());
  493. -       UserCommandHandler.getInstance().registerUserCommandHandler(new ClanWarsList());
  494. -       UserCommandHandler.getInstance().registerUserCommandHandler(new DisMount());
  495. -       UserCommandHandler.getInstance().registerUserCommandHandler(new Escape());
  496. -       UserCommandHandler.getInstance().registerUserCommandHandler(new InstanceZone());
  497. -       UserCommandHandler.getInstance().registerUserCommandHandler(new Loc());
  498. -       UserCommandHandler.getInstance().registerUserCommandHandler(new Mount());
  499. -       UserCommandHandler.getInstance().registerUserCommandHandler(new PartyInfo());
  500. -       UserCommandHandler.getInstance().registerUserCommandHandler(new Time());
  501. -       UserCommandHandler.getInstance().registerUserCommandHandler(new OlympiadStat());
  502. -       UserCommandHandler.getInstance().registerUserCommandHandler(new ChannelLeave());
  503. -       UserCommandHandler.getInstance().registerUserCommandHandler(new ChannelDelete());
  504. -       UserCommandHandler.getInstance().registerUserCommandHandler(new ChannelListUpdate());
  505. -       UserCommandHandler.getInstance().registerUserCommandHandler(new Birthday());
  506. -       _log.config("Loaded " + UserCommandHandler.getInstance().size() + " UserHandlers");
  507. +       USER.registerUserCommandHandler(new ClanPenalty());
  508. +       USER.registerUserCommandHandler(new ClanWarsList());
  509. +       USER.registerUserCommandHandler(new DisMount());
  510. +       USER.registerUserCommandHandler(new Escape());
  511. +       USER.registerUserCommandHandler(new InstanceZone());
  512. +       USER.registerUserCommandHandler(new Loc());
  513. +       USER.registerUserCommandHandler(new Mount());
  514. +       USER.registerUserCommandHandler(new PartyInfo());
  515. +       USER.registerUserCommandHandler(new Time());
  516. +       USER.registerUserCommandHandler(new OlympiadStat());
  517. +       USER.registerUserCommandHandler(new ChannelLeave());
  518. +       USER.registerUserCommandHandler(new ChannelDelete());
  519. +       USER.registerUserCommandHandler(new ChannelListUpdate());
  520. +       USER.registerUserCommandHandler(new Birthday());
  521. +       _log.config("Loaded " + USER.size() + " UserHandlers");
  522.     }
  523.    
  524.     private static void loadVoicedHandlers()
  525.     {
  526. -       VoicedCommandHandler.getInstance().registerVoicedCommandHandler(new stats());
  527. +       VOICE.registerVoicedCommandHandler(new stats());
  528.         if (Config.L2JMOD_ALLOW_WEDDING)
  529. -           VoicedCommandHandler.getInstance().registerVoicedCommandHandler(new Wedding());
  530. +           VOICE.registerVoicedCommandHandler(new Wedding());
  531.         if (Config.BANKING_SYSTEM_ENABLED)
  532. -           VoicedCommandHandler.getInstance().registerVoicedCommandHandler(new Banking());
  533. +           VOICE.registerVoicedCommandHandler(new Banking());
  534.         if (Config.TVT_ALLOW_VOICED_COMMAND)
  535. -           VoicedCommandHandler.getInstance().registerVoicedCommandHandler(new TvTVoicedInfo());
  536. +           VOICE.registerVoicedCommandHandler(new TvTVoicedInfo());
  537.         if (Config.L2JMOD_CHAT_ADMIN)
  538. -           VoicedCommandHandler.getInstance().registerVoicedCommandHandler(new ChatAdmin());
  539. +           VOICE.registerVoicedCommandHandler(new ChatAdmin());
  540.         if (Config.L2JMOD_MULTILANG_ENABLE && Config.L2JMOD_MULTILANG_VOICED_ALLOW)
  541. -           VoicedCommandHandler.getInstance().registerVoicedCommandHandler(new Lang());
  542. +           VOICE.registerVoicedCommandHandler(new Lang());
  543.         if (Config.L2JMOD_DEBUG_VOICE_COMMAND)
  544. -           VoicedCommandHandler.getInstance().registerVoicedCommandHandler(new Debug());
  545. -       _log.config("Loaded " + VoicedCommandHandler.getInstance().size() + " VoicedHandlers");
  546. +           VOICE.registerVoicedCommandHandler(new Debug());
  547. +       _log.config("Loaded " + VOICE.size() + " VoicedHandlers");
  548.     }
  549.    
  550.     /**
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement