diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/ctf.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/ctf.sql
deleted file mode 100644
index 1af2299a2f..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/ctf.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- --------------------------------
--- Table structure for table `ctf`
--- Created by SqueezeD & Serpent for l2jfree
--- --------------------------------
-DROP TABLE IF EXISTS `ctf`;
-CREATE TABLE `ctf` (
-  `eventName` varchar(255) NOT NULL default '',
-  `eventDesc` varchar(255) NOT NULL default '',
-  `joiningLocation` varchar(255) NOT NULL default '',
-  `minLevel` int(4) NOT NULL default '0',
-  `maxLevel` int(4) NOT NULL default '0',
-  `npcId` int(8) NOT NULL default '0',
-  `npcX` int(11) NOT NULL default '0',
-  `npcY` int(11) NOT NULL default '0',
-  `npcZ` int(11) NOT NULL default '0',
-  `npcHeading` int(11) NOT NULL default '0',
-  `rewardId` int(11) NOT NULL default '0',
-  `rewardAmount` int(11) NOT NULL default '0',
-  `teamsCount` int(4) NOT NULL default '0',
-  `joinTime` int(11) NOT NULL default '0',
-  `eventTime` int(11) NOT NULL default '0',
-  `minPlayers` int(4) NOT NULL default '0',
-  `maxPlayers` int(4) NOT NULL default '0',
-  `delayForNextEvent` BIGINT NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `ctf` (`eventName`, `eventDesc`, `joiningLocation`, `minLevel`, `maxLevel`, `npcId`, `npcX`, `npcY`, `npcZ`, `npcHeading`, `rewardId`, `rewardAmount`, `teamsCount`, `joinTime`, `eventTime`, `minPlayers`, `maxPlayers`, `delayForNextEvent`) VALUES
-('Capture the flag', 'CTF', 'Giran', 1, 80, 70011, 82580, 148552, -3468, 16972, 8752, 1, 2, 5, 5, 2, 50, 300000);
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/ctf_teams.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/ctf_teams.sql
deleted file mode 100644
index 8bdd8c4022..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/ctf_teams.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- --------------------------------
--- Table structure for ctf_teams
--- Created by SqueezeD & Serpent for l2jfree
--- --------------------------------
-DROP TABLE IF EXISTS `ctf_teams`;
-CREATE TABLE `ctf_teams` (
-  `teamId` int(4) NOT NULL default '0',
-  `teamName` varchar(255) NOT NULL default '',
-  `teamX` int(11) NOT NULL default '0',
-  `teamY` int(11) NOT NULL default '0',
-  `teamZ` int(11) NOT NULL default '0',
-  `teamColor` int(11) NOT NULL default '0',
-  `flagX` int(11) NOT NULL default '0',
-  `flagY` int(11) NOT NULL default '0',
-  `flagZ` int(11) NOT NULL default '0',
-  PRIMARY KEY (`teamId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `ctf_teams` (`teamId`, `teamName`, `teamX`, `teamY`, `teamZ`, `teamColor`, `flagX`, `flagY`, `flagZ`) VALUES
-(0, 'Blue', 87357, -145722, -1288, 16711680, 87358, -145979, -1291),
-(1, 'Red', 87351, -139984, -1536, 255, 87359, -139584, -1536);
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql
index d047c623f3..54a354432b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql
@@ -53,9 +53,4 @@ INSERT ignore INTO custom_npc values
 ('50000', '31228', 'Dom the Cat', '1', 'Merchant', '1', 'Monster.cat_the_cat', '9.00', '16.00', '70', 'male', 'Merchant', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '490', '10', '1335', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT'),
 ('50007', '31324', 'Andromeda', '1', 'Wedding Manager', '1', 'NPC.a_casino_FDarkElf', '8.00', '23.00', '70', 'female', 'WeddingManager', '40', '3862', '1493', '500', '500', '40', '43', '30', '21', '20', '10', '0', '0', '9999', '9999', '999', '999', '278', '0', '333', '316', '0', '0', '55', '132', null, '0', '1', '0', 'LAST_HIT'),
 ('50008', '31228', 'Rex the Cat', '1', 'Buffer', '1', 'Monster.cat_the_cat', '9.00', '16.00', '70', 'male', 'SchemeBuffer', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '490', '10', '1335', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT'),
-('55555', '22124', 'Totor', '1', 'Rebirth Manager', '1', 'NPC.a_fighterguild_master_FHuman', '11.00', '27.00', '83', 'male', 'Merchant', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70010', '31606', 'Catrina', '1', 'TvT Event Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70011', '31606', 'Catretta', '1', 'CTF Event Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70012', '31606', 'Catrosa', '1', 'VIP Join Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70013', '31606', 'Catrigna', '1', 'VIP End Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70014', '31606', 'Catrieta', '1', 'DM Event Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT');
+('55555', '22124', 'Totor', '1', 'Rebirth Manager', '1', 'NPC.a_fighterguild_master_FHuman', '11.00', '27.00', '83', 'male', 'Merchant', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT');
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/dm.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/dm.sql
deleted file mode 100644
index f0ebdd4275..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/dm.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- --------------------------------
--- Table structure for table `dm`
--- Created by SqueezeD from l2jfree
--- --------------------------------
-DROP TABLE IF EXISTS `dm`;
-CREATE TABLE `dm` (
-  `eventName` varchar(255) NOT NULL default '',
-  `eventDesc` varchar(255) NOT NULL default '',
-  `joiningLocation` varchar(255) NOT NULL default '',
-  `minLevel` int(4) NOT NULL default '0',
-  `maxLevel` int(4) NOT NULL default '0',
-  `npcId` int(8) NOT NULL default '0',
-  `npcX` int(11) NOT NULL default '0',
-  `npcY` int(11) NOT NULL default '0',
-  `npcZ` int(11) NOT NULL default '0',
-  		`npcHeading` int(11) NOT NULL DEFAULT '0',
-  `rewardId` int(11) NOT NULL default '0',
-  `rewardAmount` int(11) NOT NULL default '0',
-  		`joinTime` int(11) NOT NULL DEFAULT '0',
-  		`eventTime` int(11) NOT NULL DEFAULT '0',
-  		`minPlayers` int(11) NOT NULL DEFAULT '0',
-  		`maxPlayers` int(11) NOT NULL DEFAULT '0',
-  `color` int(11) NOT NULL default '0',
-  `playerX` int(11) NOT NULL default '0',
-  `playerY` int(11) NOT NULL default '0',
-  `playerZ` int(11) NOT NULL default '0',
-  		`delayForNextEvent` BIGINT NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `dm` values 
-('DM', 'A PvP Event', 'Giran', 1, 81, 70014, 82580, 148552, -3468, 1, 8752, 1, 2, 5, 2, 50, 2552550, 116615, 76200, -2729, 300000);
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pkkills.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pkkills.sql
deleted file mode 100644
index b8a707ed6b..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pkkills.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-#----------------------------
-# Table structure for pkkills
-#----------------------------
-CREATE TABLE IF NOT EXISTS `pkkills` (
-  `killerId` varchar(45) NOT NULL,
-  `killedId` varchar(45) NOT NULL,
-  `kills` decimal(11,0) NOT NULL,
-  PRIMARY KEY  (`killerId` ,`killedId` )
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/tvt.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/tvt.sql
deleted file mode 100644
index 517049c009..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/tvt.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- -----------------------
--- Table structure for tvt
--- -----------------------
-DROP TABLE IF EXISTS `tvt`;
-CREATE TABLE `tvt` (
-  `eventName` varchar(255) NOT NULL DEFAULT '',
-  `eventDesc` varchar(255) NOT NULL DEFAULT '',
-  `joiningLocation` varchar(255) NOT NULL DEFAULT '',
-  `minLevel` int(4) NOT NULL DEFAULT '0',
-  `maxLevel` int(4) NOT NULL DEFAULT '0',
-  `npcId` int(8) NOT NULL DEFAULT '0',
-  `npcX` int(11) NOT NULL DEFAULT '0',
-  `npcY` int(11) NOT NULL DEFAULT '0',
-  `npcZ` int(11) NOT NULL DEFAULT '0',
-  `npcHeading` int(11) NOT NULL DEFAULT '0',
-  `rewardId` int(11) NOT NULL DEFAULT '0',
-  `rewardAmount` int(11) NOT NULL DEFAULT '0',
-  `teamsCount` int(4) NOT NULL DEFAULT '0',
-  `joinTime` int(11) NOT NULL DEFAULT '0',
-  `eventTime` int(11) NOT NULL DEFAULT '0',
-  `minPlayers` int(4) NOT NULL DEFAULT '0',
-  `maxPlayers` int(4) NOT NULL DEFAULT '0',
-  `delayForNextEvent` BIGINT NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- ---------------------
--- Records for table tvt
--- ---------------------
-INSERT INTO `tvt` values 
-('TVT', 'A PvP Event', 'Giran', 1, 81, 70010, 82688, 148677, -3469, 0, 8752, 1, 2, 5, 5, 2, 50, 300000);
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/tvt_teams.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/tvt_teams.sql
deleted file mode 100644
index 6b75685944..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/tvt_teams.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- -----------------------------
--- Table structure for tvt_teams
--- -----------------------------
-DROP TABLE IF EXISTS `tvt_teams`;
-CREATE TABLE `tvt_teams` (
-  `teamId` int(4) NOT NULL DEFAULT '0',
-  `teamName` varchar(255) NOT NULL DEFAULT '',
-  `teamX` int(11) NOT NULL DEFAULT '0',
-  `teamY` int(11) NOT NULL DEFAULT '0',
-  `teamZ` int(11) NOT NULL DEFAULT '0',
-  `teamColor` int(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`teamId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- ---------------------------
--- Records for table tvt_teams
--- ---------------------------
-INSERT INTO `tvt_teams` VALUES 
-('0', 'Blue', '148179', '45841', '-3413', '16711680'),
-('1', 'Red', '150787', '45822', '-3413', '255'),
-('2', 'Green', '149496', '47826', '-3413', '26367');
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/vip.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/vip.sql
deleted file mode 100644
index 21e61a4276..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/vip.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE `VIPinfo` (
-  `teamID` int(11) NOT NULL,
-  `endx` int(11) NOT NULL,
-  `endy` int(11) NOT NULL,
-  `endz` int(11) NOT NULL,
-  `startx` int(11) NOT NULL,
-  `starty` int(11) NOT NULL,
-  `startz` int(11) NOT NULL,
-  PRIMARY KEY  (`teamID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-
--- 
--- Dumping data for table `VIPinfo`
--- 
-
-INSERT INTO `VIPinfo` VALUES (1, -84583, 242788, -3735, -101319, 213272, -3100);
-INSERT INTO `VIPinfo` VALUES (2, 45714, 49703, -3065, 55782, 81597, -3610);
-INSERT INTO `VIPinfo` VALUES (3, 11249, 16890, -4667, -22732, 12586, -2996);
-INSERT INTO `VIPinfo` VALUES (4, -44737, -113582, -204, 27053, -88454, -3286);
-INSERT INTO `VIPinfo` VALUES (5, 116047, -179059, -1026, 121145, -215673, -3571);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/AdminCommands.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/AdminCommands.xml
index ab28ff9240..f1dac1bc0f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/AdminCommands.xml
@@ -67,43 +67,6 @@
 	<admin command="admin_create_coin" accessLevel="80" />
 	<admin command="admin_mass_create" accessLevel="100" />
 
-	<!-- Section: CTF -->
-	<admin command="admin_ctf" accessLevel="80" />
-	<admin command="admin_ctf_name" accessLevel="80" />
-	<admin command="admin_ctf_desc" accessLevel="80" />
-	<admin command="admin_ctf_join_loc" accessLevel="80" />
-	<admin command="admin_ctf_edit" accessLevel="80" />
-	<admin command="admin_ctf_control" accessLevel="80" />
-	<admin command="admin_ctf_minlvl" accessLevel="80" />
-	<admin command="admin_ctf_maxlvl" accessLevel="80" />
-	<admin command="admin_ctf_tele_npc" accessLevel="80" />
-	<admin command="admin_ctf_tele_team" accessLevel="80" />
-	<admin command="admin_ctf_tele_flag" accessLevel="80" />
-	<admin command="admin_ctf_npc" accessLevel="80" />
-	<admin command="admin_ctf_npc_pos" accessLevel="80" />
-	<admin command="admin_ctf_reward" accessLevel="80" />
-	<admin command="admin_ctf_reward_amount" accessLevel="80" />
-	<admin command="admin_ctf_team_add" accessLevel="80" />
-	<admin command="admin_ctf_team_remove" accessLevel="80" />
-	<admin command="admin_ctf_team_pos" accessLevel="80" />
-	<admin command="admin_ctf_team_color" accessLevel="80" />
-	<admin command="admin_ctf_team_flag" accessLevel="80" />
-	<admin command="admin_ctf_join" accessLevel="80" />
-	<admin command="admin_ctf_teleport" accessLevel="80" />
-	<admin command="admin_ctf_start" accessLevel="80" />
-	<admin command="admin_ctf_abort" accessLevel="80" />
-	<admin command="admin_ctf_finish" accessLevel="80" />
-	<admin command="admin_ctf_sit" accessLevel="80" />
-	<admin command="admin_ctf_dump" accessLevel="80" />
-	<admin command="admin_ctf_save" accessLevel="80" />
-	<admin command="admin_ctf_load" accessLevel="80" />
-	<admin command="admin_ctf_jointime" accessLevel="80" />
-	<admin command="admin_ctf_eventtime" accessLevel="80" />
-	<admin command="admin_ctf_autoevent" accessLevel="80" />
-	<admin command="admin_ctf_minplayers" accessLevel="80" />
-	<admin command="admin_ctf_maxplayers" accessLevel="80" />
-	<admin command="admin_ctf_interval" accessLevel="80" />
-
 	<!-- Section: Delete -->
 	<admin command="admin_delete" accessLevel="80" />
 
@@ -116,29 +79,6 @@
 	<!-- Section: Disconnect -->
 	<admin command="admin_character_disconnect" accessLevel="90" />
 
-	<!-- Section: DMEngine -->
-	<admin command="admin_dmevent" accessLevel="80" />
-	<admin command="admin_dmevent_name" accessLevel="80" />
-	<admin command="admin_dmevent_desc" accessLevel="80" />
-	<admin command="admin_dmevent_join_loc" accessLevel="80" />
-	<admin command="admin_dmevent_minlvl" accessLevel="80" />
-	<admin command="admin_dmevent_maxlvl" accessLevel="80" />
-	<admin command="admin_dmevent_npc" accessLevel="80" />
-	<admin command="admin_dmevent_npc_pos" accessLevel="80" />
-	<admin command="admin_dmevent_reward" accessLevel="80" />
-	<admin command="admin_dmevent_reward_amount" accessLevel="80" />
-	<admin command="admin_dmevent_spawnpos" accessLevel="80" />
-	<admin command="admin_dmevent_color" accessLevel="80" />
-	<admin command="admin_dmevent_join" accessLevel="80" />
-	<admin command="admin_dmevent_teleport" accessLevel="80" />
-	<admin command="admin_dmevent_start" accessLevel="80" />
-	<admin command="admin_dmevent_abort" accessLevel="80" />
-	<admin command="admin_dmevent_finish" accessLevel="80" />
-	<admin command="admin_dmevent_sit" accessLevel="80" />
-	<admin command="admin_dmevent_dump" accessLevel="80" />
-	<admin command="admin_dmevent_save" accessLevel="80" />
-	<admin command="admin_dmevent_load" accessLevel="80" />
-
 	<!-- Section: Donator -->
 	<admin command="admin_setdonator" accessLevel="100" />
 
@@ -253,29 +193,6 @@
 	<admin command="admin_setba" accessLevel="90" />
 	<admin command="admin_enchant" accessLevel="90" />
 
-	<!-- Section: EventEngine -->
-	<admin command="admin_event" accessLevel="80" />
-	<admin command="admin_event_new" accessLevel="80" />
-	<admin command="admin_event_choose" accessLevel="80" />
-	<admin command="admin_event_store" accessLevel="80" />
-	<admin command="admin_event_set" accessLevel="80" />
-	<admin command="admin_event_change_teams_number" accessLevel="80" />
-	<admin command="admin_event_announce" accessLevel="80" />
-	<admin command="admin_event_panel" accessLevel="80" />
-	<admin command="admin_event_control_begin" accessLevel="80" />
-	<admin command="admin_event_control_teleport" accessLevel="80" />
-	<admin command="admin_add" accessLevel="80" />
-	<admin command="admin_event_see" accessLevel="80" />
-	<admin command="admin_event_del" accessLevel="80" />
-	<admin command="admin_delete_buffer" accessLevel="80" />
-	<admin command="admin_event_control_sit" accessLevel="80" />
-	<admin command="admin_event_name" accessLevel="80" />
-	<admin command="admin_event_control_kill" accessLevel="80" />
-	<admin command="admin_event_control_res" accessLevel="80" />
-	<admin command="admin_event_control_prize" accessLevel="80" />
-	<admin command="admin_event_control_chatban" accessLevel="80" />
-	<admin command="admin_event_control_finish" accessLevel="80" />
-
 	<!-- Section: ExpSp -->
 	<admin command="admin_add_exp_sp_to_character" accessLevel="90" />
 	<admin command="admin_add_exp_sp" accessLevel="90" />
@@ -535,59 +452,6 @@
 	<admin command="admin_st" accessLevel="80" />
 	<admin command="admin_mp" accessLevel="80" />
 
-	<!-- Section: TownWar -->
-	<admin command="admin_townwar_start" accessLevel="80" />
-	<admin command="admin_townwar_end" accessLevel="80" />
-
-	<!-- Section: TvTEngine -->
-	<admin command="admin_tvt" accessLevel="80" />
-	<admin command="admin_tvt_name" accessLevel="80" />
-	<admin command="admin_tvt_desc" accessLevel="80" />
-	<admin command="admin_tvt_join_loc" accessLevel="80" />
-	<admin command="admin_tvt_minlvl" accessLevel="80" />
-	<admin command="admin_tvt_maxlvl" accessLevel="80" />
-	<admin command="admin_tvt_npc" accessLevel="80" />
-	<admin command="admin_tvt_npc_pos" accessLevel="80" />
-	<admin command="admin_tvt_reward" accessLevel="80" />
-	<admin command="admin_tvt_reward_amount" accessLevel="80" />
-	<admin command="admin_tvt_team_add" accessLevel="80" />
-	<admin command="admin_tvt_team_remove" accessLevel="80" />
-	<admin command="admin_tvt_team_pos" accessLevel="80" />
-	<admin command="admin_tvt_team_color" accessLevel="80" />
-	<admin command="admin_tvt_join" accessLevel="80" />
-	<admin command="admin_tvt_teleport" accessLevel="80" />
-	<admin command="admin_tvt_start" accessLevel="80" />
-	<admin command="admin_tvt_abort" accessLevel="80" />
-	<admin command="admin_tvt_finish" accessLevel="80" />
-	<admin command="admin_tvt_sit" accessLevel="80" />
-	<admin command="admin_tvt_dump" accessLevel="80" />
-	<admin command="admin_tvt_save" accessLevel="80" />
-	<admin command="admin_tvt_load" accessLevel="80" />
-	<admin command="admin_tvt_jointime" accessLevel="80" />
-	<admin command="admin_tvt_eventtime" accessLevel="80" />
-	<admin command="admin_tvt_autoevent" accessLevel="80" />
-	<admin command="admin_tvt_minplayers" accessLevel="80" />
-	<admin command="admin_tvt_maxplayers" accessLevel="80" />
-	<admin command="admin_tvtkick" accessLevel="80" />
-
-	<!-- Section: VIPEngine -->
-	<admin command="admin_vip" accessLevel="80" />
-	<admin command="admin_vip_setteam" accessLevel="80" />
-	<admin command="admin_vip_randomteam" accessLevel="80" />
-	<admin command="admin_vip_settime" accessLevel="80" />
-	<admin command="admin_vip_endnpc" accessLevel="80" />
-	<admin command="admin_vip_setdelay" accessLevel="80" />
-	<admin command="admin_vip_joininit" accessLevel="80" />
-	<admin command="admin_vip_joinnpc" accessLevel="80" />
-	<admin command="admin_vip_joinlocxyz" accessLevel="80" />
-	<admin command="admin_vip_setarea" accessLevel="80" />
-	<admin command="admin_vip_vipreward" accessLevel="80" />
-	<admin command="admin_vip_viprewardamount" accessLevel="80" />
-	<admin command="admin_vip_thevipreward" accessLevel="80" />
-	<admin command="admin_vip_theviprewardamount" accessLevel="80" />
-	<admin command="admin_vip_notvipreward" accessLevel="80" />
-	<admin command="admin_vip_notviprewardamount" accessLevel="80" />
-
 	<!-- Section: Walker -->
 	<admin command="admin_walker_setmessage" accessLevel="80" />
 	<admin command="admin_walker_menu" accessLevel="80" />
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/Other.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/Other.ini
index aceb3e945d..33b8480ce3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/Other.ini
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/Other.ini
@@ -223,47 +223,6 @@ DonatorDropRate = 1.5
 DonatorSpoilRate = 1.5
 
 
-# ---------------------------------------------------------------------------
-# Commands
-# ---------------------------------------------------------------------------
-
-# Allow players to use command .farm1
-AllowFarm1Command = False
-# Put your Farm1 Location ( x,y,z )
-farm1_X = 81304
-farm1_Y = 14589
-farm1_Z = -3469
-# Message after successful TP
-Farm1CustomMeesage = You have been teleported to Farm Zone 1!
-
-# Allow players to use command .farm2
-AllowFarm2Command = False
-# Put your Farm2 Location ( x,y,z )
-farm2_X = 81304
-farm2_Y = 14589
-farm2_Z = -3469
-# Message after successful TP
-Farm2CustomMeesage = You have been teleported to Farm Zone 2!
-
-# Allow players to use command .pvp1
-AllowPvP1Command = False
-# Put your Farm1 Location ( x,y,z )
-pvp1_X = 81304
-pvp1_Y = 14589
-pvp1_Z = -3469
-# Message after successful TP
-PvP1CustomMeesage = You have been teleported to PvP Zone 1!
-
-# Allow players to use command .pvp2
-AllowPvP2Command = False
-# Put your Farm2 Location ( x,y,z )
-pvp2_X = 81304
-pvp2_Y = 14589
-pvp2_Z = -3469
-# Message after successful TP
-PvP2CustomMeesage = You have been teleported to PvP Zone 2!
-
-
 # ---------------------------------------------------------------------------
 # Protector
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/CtF.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/CtF.ini
deleted file mode 100644
index cee23468bb..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/CtF.ini
+++ /dev/null
@@ -1,51 +0,0 @@
-#============================================================#
-#                       CTF Event Engine                     #
-#============================================================#
-# CTF(Capture the flag) Event: Two teams with one flag.
-
-# Setting for Capture The Flag
-# CTFEvenTeams = NO|BALANCE|SHUFFLE
-# NO means: not even teams.
-# BALANCE means: Players can only join team with lowest player count.
-# SHUFFLE means: Players can only participate to tzhe event and not
-# direct to a team. Teams will be schuffeled in teleporting teams.
-CTFEvenTeams = SHUFFLE
-
-# Players there not participated in ctf can target ctf participants?
-CTFAllowInterference = False
-
-# Ctf participants can use potions?
-CTFAllowPotions = False
-
-# Ctf participants can summon by item?
-CTFAllowSummon = False
-
-# Remove all effects of ctf participants on event start?
-CTFOnStartRemoveAllEffects = True
-
-# Unsummon pet of ctf participants on event start?
-CTFOnStartUnsummonPet = True
-
-# On revive participants regain full hp/mp/cp ?
-CTFReviveRecovery = False
-
-# Announce all team statistics
-CTFAnnounceTeamStats = False
-
-# Announce Reward
-CTFAnnounceReward = False
-
-# Enable voice command to register on tvt/ctf events
-CTFCommand = True
-
-# Place an aura on participants team ?
-CTFAura = False
-
-# Enable event stats logger
-CTFStatsLogger = True
-
-# Spawn Team Offset to distribute players
-CTFSpawnOffset = 300
-
-# Remove Buffs on player die
-CTFRemoveBuffsOnPlayerDie = False
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/DM.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/DM.ini
deleted file mode 100644
index 161919c3af..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/DM.ini
+++ /dev/null
@@ -1,52 +0,0 @@
-#============================================================#
-#                       DM Event Engine                      #
-#============================================================#
-# DM(DeathMatch) Event: All vs All.
-
-# Players there not participated in DM can target DM participants?
-DMAllowInterference = False
-
-# DM participants can use potions?
-DMAllowPotions = False
-
-# DM participants can summon by item?
-DMAllowSummon = False
-
-# Remove all effects of DM participants on event start?
-DMOnStartRemoveAllEffects = True
-
-# Unsummon pet of DM participants on event start? 
-DMOnStartUnsummonPet = True
-
-# Delay on revive when dead, NOTE: 20000 equals to 20 seconds, minimum 1000 (1 second)
-DMReviveDelay = 20000
-
-# On revive participants regain full hp/mp/cp ?
-DMReviveRecovery = False
-
-# Enable voice command to register on dm events (.dmjoin / .dmleave / .dminfo)
-DMCommand = True
-
-# Announce Reward
-DMAnnounceReward = False
-
-# Enable Kill Reward?
-DMEnableKillReward = False
-
-# Kill Reward ID
-DMKillRewardID = 6392
-
-# Kill Reward Amount
-DMKillRewardAmount = 1
-
-# Offset from center DM Spawn
-DMSpawnOffset = 100
-
-# Enable event stats logger
-DMStatsLogger = True
-
-# Enable healer classes into DM
-DMAllowedHealerClasses = True
-
-# Remove Buffs on player die
-DMRemoveBuffsOnPlayerDie = False
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/EventManager.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/EventManager.ini
deleted file mode 100644
index 582ce2a9a7..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/EventManager.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-#============================================================#
-#                       Event Manager                        #
-#============================================================#
-# Enable auto events and start time.
-
-# TvT auto start
-# Example TVTStartTime = 20:00;21:00;22:00;
-TVTEventEnabled = False
-TVTStartTime = 20:00;
-
-# CTF auto start
-# Example CTFStartTime = 20:00;21:00;22:00;
-CTFEventEnabled = False
-CTFStartTime = 20:30;
-
-# DM auto start
-# Example DMStartTime = 20:00;21:00;22:00;
-DMEventEnabled = False
-DMStartTime = 21:00;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/TW.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/TW.ini
deleted file mode 100644
index 8054bf8b22..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/TW.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-#============================================================#
-#                         Town War                           #
-#============================================================#
-# TW (Town War): Town can became PvP Zone.
-# ATTENTION:
-# GM char can't be hit during Town war.
-
-# //townwar_start - Starts town war in Giran
-# //townwar_end - Ends townwar in Giran
-# Town id
-# 2: // Talking Island
-# 3: // Elven village
-# 1: // Dark elf village
-# 4: // Orc village
-# 6: // Dwarven village
-# 7: // Gludio
-# 5: // Gludin
-# 8: // Dion
-# 9: // Giran
-# 10: // Oren
-# 12: // Aden
-# 11: // Hunters village
-# 9: // Giran Harbour
-# 15: // Heine
-# 14: // Rune
-# 13: // Goddard
-# 17: // Schuttgart
-# 16: // Floran
-# 20: //Kamael Village
-TWTownId = 9
-
-# Set all towns?
-TWAllTowns = False
-
-# Reward for each kill
-TownWarItemId = 57
-TownWarItemAmount = 5000
-
-# Give PKers karma during townwar?
-AllowKarma = False
-
-# Disable GK while in event?
-DisableGK = True
-
-# If yes it will send a ressurect ask on death.
-# If no when you die youll be there dead until the event ends.
-# Set to false if you want KOTH town.
-SendRessOnDeath = True
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/TvT.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/TvT.ini
deleted file mode 100644
index 9ce6109993..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/TvT.ini
+++ /dev/null
@@ -1,71 +0,0 @@
-#====================================#
-#            Team vs Team            #
-#====================================#
-# TvT(Team vs Team) Event: Blue vs Red.
-
-# Setting for Team vs. Team pvp
-# TvTEvenTeams = NO|BALANCE|SHUFFLE
-# NO means: not even teams.
-# BALANCE means: Players can only join team with lowest player count.
-# SHUFFLE means: Players can only participate to tzhe event and not direct to a team. Teams will be schuffeled in teleporting teams.
-TvTEvenTeams = SHUFFLE
-
-# players there not participated in tvt can target tvt participants?
-TvTAllowInterference = False
-
-# tvt participants can use potions?
-TvTAllowPotions = True
-
-# tvt participants can summon by item?
-TvTAllowSummon = True
-
-# remove all effects of tvt participants on event start?
-TvTOnStartRemoveAllEffects = True
-
-# unsummon pet of tvt participants on event start?
-TvTOnStartUnsummonPet = True
-
-# on revive participants regain full hp/mp/cp ?
-TvTReviveRecovery = True
-
-# announce all team statistics
-TvTAnnounceTeamStats = True
-
-# announce reward
-TvTAnnounceReward = True
-
-# give price with 0 kills
-TvTPriceNoKills = True
-
-# Enable voice command to register on tvt event
-TvTCommand = True
-
-# Delay on revive when dead, NOTE: 20000 equals to 20 seconds, minimum 1000 (1 second)
-TvTReviveDelay = 10000
-
-# Open Western Fortress doors on tvt finish
-TvTOpenFortDoors = False
-
-# Close Western Fortress doors on tvt start
-TvTCloseFortDoors = False
-
-# Open Aden Colosseum doors on tvt finish
-TvTOpenAdenColosseumDoors = True
-
-# Close Aden Colosseum doors on tvt start
-TvTCloseAdenColosseumDoors = True
-
-# TvT Top Killer reward id
-TvTTopKillerRewardId = 5575
-
-# TvT Top Killer reward quantity
-TvTTopKillerRewardQty = 5000000
-
-# Place an aura on participants team ?
-TvTAura = False
-
-# Enable event stats logger
-TvTStatsLogger = True
-
-# Remove Buffs on player die
-TvTRemoveBuffsOnPlayerDie = False
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/General.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/General.ini
index 4720b488b4..f88b7f1169 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/General.ini
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/General.ini
@@ -350,18 +350,6 @@ TimeOfWarmUp = 2
 NumberOfNecessaryPartyMembers = 4
 
 
-# ---------------------------------------------------------------------------
-#  Quake / Killing Spree System
-# ---------------------------------------------------------------------------
-# Enable The Killing Spree System
-# When a Player Hits an Amount of pvp's an announcement appears
-AllowQuakeSystem = False
-
-# Enable Messages to GMs on 4-5 consecutive pvp of a player
-# Why? to see if a char are farming!
-EnableAntiPvpFarmMsg = True
-
-
 # ---------------------------------------------------------------------------
 #  Aio System                           
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/PvP.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/PvP.ini
index dbb2445932..24f1af5e9e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/PvP.ini
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/PvP.ini
@@ -126,16 +126,6 @@ TitleForAmount4 = 00FF00
 PkAmount5 = 5000
 TitleForAmount5 = 00FF00
 
-# -----------------------------
-#  PK Info Settings
-# -----------------------------
-# If it is enabled then it shows pk info to the players everytime
-# A pk or pvp is done. Messages are:
-# "You have killed PlayerX y times".
-# OR
-# "You have been killed y times by PlayerX.
-EnablePkInfo = False
-
 # ----------------------------
 #  Custom Reward
 # ----------------------------
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/admin/mods_menu.htm b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/admin/mods_menu.htm
index 4a15ab7ab2..5932ac7bbc 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/admin/mods_menu.htm
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/admin/mods_menu.htm
@@ -46,19 +46,5 @@
 <td><button value="ItmQty" action="bypass -h admin_set_mod ChampionRewardQty=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
 <td><button value="AtkSpd" action="bypass -h admin_set_mod ChampionSpdHp=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
 </tr></table><br>
-<br><font color="aadd77">Team Vs. Team</font>
-<a action="bypass -h admin_help help/l2jmod/tvt.htm"><font color="LEVEL">Help</font></a>
-<table width=240><tr>
-<td><button value="Enable" action="bypass -h admin_set_mod TvTEventEnabled=true" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="Interval" action="bypass -h admin_set_mod TvTEventInterval=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="PartTime" action="bypass -h admin_set_mod TvTEventParticipationTime=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="RunnTime" action="bypass -h admin_set_mod TvTEventRunningTime=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-</tr><tr>
-<td><button value="Disable" action="bypass -h admin_set_mod TvTEventEnabled=false" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="EventNpc" action="bypass -h admin_set_mod TvTEventParticipationNpcId=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr></table>
-<br>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/custom/21042.htm b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/custom/21042.htm
deleted file mode 100644
index 0182ec9c5c..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/custom/21042.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><body>Treasure Chest:<br>
-<table width=100% border=1><tr><td>top left<br>
-<a action="bypass -h npc_%objectId%_Deposit top-left">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw top-left">Withdraw</a></td>
-<td align="right">top right<br>
-<a action="bypass -h npc_%objectId%_Deposit top-right">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw top-right">Withdraw</a></td></tr>
-<tr><td>mid left<br>
-<a action="bypass -h npc_%objectId%_Deposit mid-left">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw mid-left">Withdraw</a></td>
-<td align="right">mid right<br>
-<a action="bypass -h npc_%objectId%_Deposit mid-right">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw mid-right">Withdraw</a></td></tr>
-<tr><td>bottom left<br>
-<a action="bypass -h npc_%objectId%_Deposit bottom-left">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw bottom-left">Withdraw</a></td>
-<td align="right">bottom right<br>
-<a action="bypass -h npc_%objectId%_Deposit bottom-right">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw bottom-right">Withdraw</a></td></tr>
-</table></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/custom/bot.htm b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/custom/bot.htm
deleted file mode 100644
index 360a83a9aa..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/custom/bot.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>
-Welcome in our server :)! I'm the Ancient World Master and I don't like if you leave the game for a long time or if you use bot... So, you have <font color="LEVEL">%Time%</font> seconds to demonstrate you are really here,
-selecting the correct world I'm saying: <font color="LEVEL">%Word%</font>. Now Select the correct answer .<br>
-<a action="link 100001">%Word1%</a><br>
-<a action="link 100002">%Word2%</a><br>
-<a action="link 100003">%Word3%</a><br>
-<a action="link 100004">%Word4%</a><br>
-<a action="link 100005">%Word5%</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventParticipation.htm b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventParticipation.htm
deleted file mode 100644
index b9d164006b..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventParticipation.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><title>TvT Event Manager</title><body>
-Registration for TvT Event:<br><br><center>
-%team1name%&nbsp;&nbsp;&nbsp;&nbsp;(%team1playercount% players in)<br1>
-%team2name%&nbsp;&nbsp;&nbsp;&nbsp;(%team2playercount% players in)<br>
-<button value="Participate" action="bypass -h npc_%objectId%_tvt_event_participation" width=50 height=15 back="sek.cbui94" fore="sek.cbui92">
-<button value="Close" action="bypass -h npc_%objectId%_Close" width=50 height=15 back="sek.cbui94" fore="sek.cbui92">
-</center></body></html>
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventRemoveParticipation.htm b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventRemoveParticipation.htm
deleted file mode 100644
index a594a06941..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventRemoveParticipation.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><title>TvT Event</title><body>
-Cancel Registration yourself for TvT Event:<br1>
-You are already registered for this event. Do you wish to cancel your participation in this Event?<br><br><center>
-<button value="Yes" action="bypass -h npc_%objectId%_tvt_event_remove_participation" width=40 height=15 back="sek.cbui94" fore="sek.cbui92">
-<button value="No" action="bypass -h npc_%objectId%_Close" width=40 height=15 back="sek.cbui94" fore="sek.cbui92">
-</center></body></html>
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventStatus.htm b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventStatus.htm
deleted file mode 100644
index 35813e4a51..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/mods/TvTEventStatus.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><title>TvT Event</title><body>
-TvT Status:<br><br><center>
-%team1name% with %team1playercount% players and %team1points% points.<br1>
-%team2name% with %team2playercount% players and %team2points% points.<br>
-</center></body></html>
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
index 1adc53b6f4..adee463892 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
@@ -84,11 +84,7 @@ public class Config
 	private static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/Other.ini";
 	public static final String TELNET_CONFIG_FILE = "./config/protected/Telnet.ini";
 	// events
-	private static final String EVENT_CTF_CONFIG_FILE = "./config/events/CtF.ini";
-	private static final String EVENT_DM_CONFIG_FILE = "./config/events/DM.ini";
 	private static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/PcBang.ini";
-	private static final String EVENT_TVT_CONFIG_FILE = "./config/events/TvT.ini";
-	private static final String EVENT_TW_CONFIG_FILE = "./config/events/TW.ini";
 	// custom
 	private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini";
 	private static final String CANCEL_SKILL_RESTORE_BUFFS_CONFIG_FILE = "./config/custom/CancelSkillRestoreBuffs.ini";
@@ -243,8 +239,6 @@ public class Config
 	public static int FS_TIME_ENTRY;
 	public static int FS_TIME_WARMUP;
 	public static int FS_PARTY_MEMBER_COUNT;
-	public static boolean ALLOW_QUAKE_SYSTEM;
-	public static boolean ENABLE_ANTI_PVP_FARM_MSG;
 	public static float RATE_XP;
 	public static float RATE_SP;
 	public static float RATE_PARTY_XP;
@@ -499,36 +493,6 @@ public class Config
 	public static boolean GIVE_CUPID_BOW;
 	public static boolean ANNOUNCE_WEDDING;
 	
-	public static String TVT_EVEN_TEAMS;
-	public static boolean TVT_ALLOW_INTERFERENCE;
-	public static boolean TVT_ALLOW_POTIONS;
-	public static boolean TVT_ALLOW_SUMMON;
-	public static boolean TVT_ON_START_REMOVE_ALL_EFFECTS;
-	public static boolean TVT_ON_START_UNSUMMON_PET;
-	public static boolean TVT_REVIVE_RECOVERY;
-	public static boolean TVT_ANNOUNCE_TEAM_STATS;
-	public static boolean TVT_ANNOUNCE_REWARD;
-	public static boolean TVT_PRICE_NO_KILLS;
-	public static boolean TVT_COMMAND;
-	public static long TVT_REVIVE_DELAY;
-	public static boolean TVT_OPEN_FORT_DOORS;
-	public static boolean TVT_CLOSE_FORT_DOORS;
-	public static boolean TVT_OPEN_ADEN_COLOSSEUM_DOORS;
-	public static boolean TVT_CLOSE_ADEN_COLOSSEUM_DOORS;
-	public static int TVT_TOP_KILLER_REWARD;
-	public static int TVT_TOP_KILLER_QTY;
-	public static boolean TVT_AURA;
-	public static boolean TVT_STATS_LOGGER;
-	public static boolean TVT_REMOVE_BUFFS_ON_DIE;
-	
-	public static int TW_TOWN_ID;
-	public static boolean TW_ALL_TOWNS;
-	public static int TW_ITEM_ID;
-	public static int TW_ITEM_AMOUNT;
-	public static boolean TW_ALLOW_KARMA;
-	public static boolean TW_DISABLE_GK;
-	public static boolean TW_RESS_ON_DIE;
-	
 	public static boolean REBIRTH_ENABLE;
 	public static String[] REBIRTH_ITEM_PRICE;
 	public static String[] REBIRTH_MAGE_SKILL;
@@ -589,38 +553,6 @@ public class Config
 	public static int OFFLINE_MAX_DAYS;
 	public static boolean OFFLINE_DISCONNECT_FINISHED;
 	
-	public static boolean DM_ALLOW_INTERFERENCE;
-	public static boolean DM_ALLOW_POTIONS;
-	public static boolean DM_ALLOW_SUMMON;
-	public static boolean DM_ON_START_REMOVE_ALL_EFFECTS;
-	public static boolean DM_ON_START_UNSUMMON_PET;
-	public static long DM_REVIVE_DELAY;
-	public static boolean DM_COMMAND;
-	public static boolean DM_ENABLE_KILL_REWARD;
-	public static int DM_KILL_REWARD_ID;
-	public static int DM_KILL_REWARD_AMOUNT;
-	public static boolean DM_ANNOUNCE_REWARD;
-	public static boolean DM_REVIVE_RECOVERY;
-	public static int DM_SPAWN_OFFSET;
-	public static boolean DM_STATS_LOGGER;
-	public static boolean DM_ALLOW_HEALER_CLASSES;
-	public static boolean DM_REMOVE_BUFFS_ON_DIE;
-	
-	public static String CTF_EVEN_TEAMS;
-	public static boolean CTF_ALLOW_INTERFERENCE;
-	public static boolean CTF_ALLOW_POTIONS;
-	public static boolean CTF_ALLOW_SUMMON;
-	public static boolean CTF_ON_START_REMOVE_ALL_EFFECTS;
-	public static boolean CTF_ON_START_UNSUMMON_PET;
-	public static boolean CTF_ANNOUNCE_TEAM_STATS;
-	public static boolean CTF_ANNOUNCE_REWARD;
-	public static boolean CTF_REVIVE_RECOVERY;
-	public static boolean CTF_COMMAND;
-	public static boolean CTF_AURA;
-	public static boolean CTF_STATS_LOGGER;
-	public static int CTF_SPAWN_OFFSET;
-	public static boolean CTF_REMOVE_BUFFS_ON_DIE;
-	
 	public static boolean ONLINE_PLAYERS_ON_LOGIN;
 	public static boolean SUBSTUCK_SKILLS;
 	public static boolean ALT_SERVER_NAME_ENABLED;
@@ -691,26 +623,6 @@ public class Config
 	public static int HERO_CUSTOM_ITEM_ID;
 	public static int NOOBLE_CUSTOM_ITEM_ID;
 	public static long HERO_CUSTOM_DAY;
-	public static boolean ALLOW_FARM1_COMMAND;
-	public static boolean ALLOW_FARM2_COMMAND;
-	public static boolean ALLOW_PVP1_COMMAND;
-	public static boolean ALLOW_PVP2_COMMAND;
-	public static int FARM1_X;
-	public static int FARM1_Y;
-	public static int FARM1_Z;
-	public static int PVP1_X;
-	public static int PVP1_Y;
-	public static int PVP1_Z;
-	public static int FARM2_X;
-	public static int FARM2_Y;
-	public static int FARM2_Z;
-	public static int PVP2_X;
-	public static int PVP2_Y;
-	public static int PVP2_Z;
-	public static String FARM1_CUSTOM_MESSAGE;
-	public static String FARM2_CUSTOM_MESSAGE;
-	public static String PVP1_CUSTOM_MESSAGE;
-	public static String PVP2_CUSTOM_MESSAGE;
 	public static boolean GM_TRADE_RESTRICTED_ITEMS;
 	public static boolean GM_RESTART_FIGHTING;
 	public static boolean PM_MESSAGE_ON_START;
@@ -762,7 +674,6 @@ public class Config
 	public static int PK_REWARD_ID;
 	public static int PK_REWARD_AMOUNT;
 	public static int REWARD_PROTECT;
-	public static boolean ENABLE_PK_INFO;
 	public static boolean FLAGED_PLAYER_USE_BUFFER;
 	public static boolean FLAGED_PLAYER_CAN_USE_GK;
 	public static boolean PVPEXPSP_SYSTEM;
@@ -1501,8 +1412,6 @@ public class Config
 		{
 			FS_PARTY_MEMBER_COUNT = 4;
 		}
-		ALLOW_QUAKE_SYSTEM = generalConfig.getBoolean("AllowQuakeSystem", false);
-		ENABLE_ANTI_PVP_FARM_MSG = generalConfig.getBoolean("EnableAntiPvpFarmMsg", false);
 		ANNOUNCE_CASTLE_LORDS = generalConfig.getBoolean("AnnounceCastleLords", false);
 		ANNOUNCE_MAMMON_SPAWN = generalConfig.getBoolean("AnnounceMammonSpawn", true);
 		ALLOW_GUARDS = generalConfig.getBoolean("AllowGuards", false);
@@ -1761,48 +1670,6 @@ public class Config
 		ANNOUNCE_WEDDING = weddingConfig.getBoolean("AnnounceWedding", true);
 	}
 	
-	public static void loadTVTConfig()
-	{
-		final PropertiesParser tvtConfig = new PropertiesParser(EVENT_TVT_CONFIG_FILE);
-		TVT_EVEN_TEAMS = tvtConfig.getString("TvTEvenTeams", "BALANCE");
-		TVT_ALLOW_INTERFERENCE = tvtConfig.getBoolean("TvTAllowInterference", false);
-		TVT_ALLOW_POTIONS = tvtConfig.getBoolean("TvTAllowPotions", false);
-		TVT_ALLOW_SUMMON = tvtConfig.getBoolean("TvTAllowSummon", false);
-		TVT_ON_START_REMOVE_ALL_EFFECTS = tvtConfig.getBoolean("TvTOnStartRemoveAllEffects", true);
-		TVT_ON_START_UNSUMMON_PET = tvtConfig.getBoolean("TvTOnStartUnsummonPet", true);
-		TVT_REVIVE_RECOVERY = tvtConfig.getBoolean("TvTReviveRecovery", false);
-		TVT_ANNOUNCE_TEAM_STATS = tvtConfig.getBoolean("TvTAnnounceTeamStats", false);
-		TVT_ANNOUNCE_REWARD = tvtConfig.getBoolean("TvTAnnounceReward", false);
-		TVT_PRICE_NO_KILLS = tvtConfig.getBoolean("TvTPriceNoKills", false);
-		TVT_COMMAND = tvtConfig.getBoolean("TvTCommand", true);
-		TVT_REVIVE_DELAY = tvtConfig.getLong("TvTReviveDelay", 20000);
-		if (TVT_REVIVE_DELAY < 1000)
-		{
-			TVT_REVIVE_DELAY = 1000; // can't be set less then 1 second
-		}
-		TVT_OPEN_FORT_DOORS = tvtConfig.getBoolean("TvTOpenFortDoors", false);
-		TVT_CLOSE_FORT_DOORS = tvtConfig.getBoolean("TvTCloseFortDoors", false);
-		TVT_OPEN_ADEN_COLOSSEUM_DOORS = tvtConfig.getBoolean("TvTOpenAdenColosseumDoors", false);
-		TVT_CLOSE_ADEN_COLOSSEUM_DOORS = tvtConfig.getBoolean("TvTCloseAdenColosseumDoors", false);
-		TVT_TOP_KILLER_REWARD = tvtConfig.getInt("TvTTopKillerRewardId", 5575);
-		TVT_TOP_KILLER_QTY = tvtConfig.getInt("TvTTopKillerRewardQty", 2000000);
-		TVT_AURA = tvtConfig.getBoolean("TvTAura", false);
-		TVT_STATS_LOGGER = tvtConfig.getBoolean("TvTStatsLogger", true);
-		TVT_REMOVE_BUFFS_ON_DIE = tvtConfig.getBoolean("TvTRemoveBuffsOnPlayerDie", false);
-	}
-	
-	public static void loadTWConfig()
-	{
-		final PropertiesParser twConfig = new PropertiesParser(EVENT_TW_CONFIG_FILE);
-		TW_TOWN_ID = twConfig.getInt("TWTownId", 9);
-		TW_ALL_TOWNS = twConfig.getBoolean("TWAllTowns", false);
-		TW_ITEM_ID = twConfig.getInt("TownWarItemId", 57);
-		TW_ITEM_AMOUNT = twConfig.getInt("TownWarItemAmount", 5000);
-		TW_ALLOW_KARMA = twConfig.getBoolean("AllowKarma", false);
-		TW_DISABLE_GK = twConfig.getBoolean("DisableGK", true);
-		TW_RESS_ON_DIE = twConfig.getBoolean("SendRessOnDeath", false);
-	}
-	
 	public static void loadRebirthConfig()
 	{
 		final PropertiesParser rebirthConfig = new PropertiesParser(EVENT_REBIRTH_CONFIG_FILE);
@@ -1882,50 +1749,6 @@ public class Config
 		OFFLINE_DISCONNECT_FINISHED = offlineConfig.getBoolean("OfflineDisconnectFinished", true);
 	}
 	
-	public static void loadDMConfig()
-	{
-		final PropertiesParser dmConfig = new PropertiesParser(EVENT_DM_CONFIG_FILE);
-		DM_ALLOW_INTERFERENCE = dmConfig.getBoolean("DMAllowInterference", false);
-		DM_ALLOW_POTIONS = dmConfig.getBoolean("DMAllowPotions", false);
-		DM_ALLOW_SUMMON = dmConfig.getBoolean("DMAllowSummon", false);
-		DM_ON_START_REMOVE_ALL_EFFECTS = dmConfig.getBoolean("DMOnStartRemoveAllEffects", true);
-		DM_ON_START_UNSUMMON_PET = dmConfig.getBoolean("DMOnStartUnsummonPet", true);
-		DM_REVIVE_DELAY = dmConfig.getLong("DMReviveDelay", 20000);
-		if (DM_REVIVE_DELAY < 1000)
-		{
-			DM_REVIVE_DELAY = 1000; // can't be set less then 1 second
-		}
-		DM_REVIVE_RECOVERY = dmConfig.getBoolean("DMReviveRecovery", false);
-		DM_COMMAND = dmConfig.getBoolean("DMCommand", false);
-		DM_ENABLE_KILL_REWARD = dmConfig.getBoolean("DMEnableKillReward", false);
-		DM_KILL_REWARD_ID = dmConfig.getInt("DMKillRewardID", 6392);
-		DM_KILL_REWARD_AMOUNT = dmConfig.getInt("DMKillRewardAmount", 1);
-		DM_ANNOUNCE_REWARD = dmConfig.getBoolean("DMAnnounceReward", false);
-		DM_SPAWN_OFFSET = dmConfig.getInt("DMSpawnOffset", 100);
-		DM_STATS_LOGGER = dmConfig.getBoolean("DMStatsLogger", true);
-		DM_ALLOW_HEALER_CLASSES = dmConfig.getBoolean("DMAllowedHealerClasses", true);
-		DM_REMOVE_BUFFS_ON_DIE = dmConfig.getBoolean("DMRemoveBuffsOnPlayerDie", false);
-	}
-	
-	public static void loadCTFConfig()
-	{
-		final PropertiesParser ctfConfig = new PropertiesParser(EVENT_CTF_CONFIG_FILE);
-		CTF_EVEN_TEAMS = ctfConfig.getString("CTFEvenTeams", "BALANCE");
-		CTF_ALLOW_INTERFERENCE = ctfConfig.getBoolean("CTFAllowInterference", false);
-		CTF_ALLOW_POTIONS = ctfConfig.getBoolean("CTFAllowPotions", false);
-		CTF_ALLOW_SUMMON = ctfConfig.getBoolean("CTFAllowSummon", false);
-		CTF_ON_START_REMOVE_ALL_EFFECTS = ctfConfig.getBoolean("CTFOnStartRemoveAllEffects", true);
-		CTF_ON_START_UNSUMMON_PET = ctfConfig.getBoolean("CTFOnStartUnsummonPet", true);
-		CTF_ANNOUNCE_TEAM_STATS = ctfConfig.getBoolean("CTFAnnounceTeamStats", false);
-		CTF_ANNOUNCE_REWARD = ctfConfig.getBoolean("CTFAnnounceReward", false);
-		CTF_REVIVE_RECOVERY = ctfConfig.getBoolean("CTFReviveRecovery", false);
-		CTF_COMMAND = ctfConfig.getBoolean("CTFCommand", true);
-		CTF_AURA = ctfConfig.getBoolean("CTFAura", true);
-		CTF_STATS_LOGGER = ctfConfig.getBoolean("CTFStatsLogger", true);
-		CTF_SPAWN_OFFSET = ctfConfig.getInt("CTFSpawnOffset", 100);
-		CTF_REMOVE_BUFFS_ON_DIE = ctfConfig.getBoolean("CTFRemoveBuffsOnPlayerDie", false);
-	}
-	
 	public static void loadCustomServerConfig()
 	{
 		final PropertiesParser customServerConfig = new PropertiesParser(OTHER_CONFIG_FILE);
@@ -1997,26 +1820,6 @@ public class Config
 		CLAN_LEADER_COLOR_CLAN_LEVEL = customServerConfig.getInt("ClanLeaderColorAtClanLevel", 1);
 		SAVE_RAIDBOSS_STATUS_INTO_DB = customServerConfig.getBoolean("SaveRBStatusIntoDB", false);
 		DISABLE_WEIGHT_PENALTY = customServerConfig.getBoolean("DisableWeightPenalty", false);
-		ALLOW_FARM1_COMMAND = customServerConfig.getBoolean("AllowFarm1Command", false);
-		ALLOW_FARM2_COMMAND = customServerConfig.getBoolean("AllowFarm2Command", false);
-		ALLOW_PVP1_COMMAND = customServerConfig.getBoolean("AllowPvP1Command", false);
-		ALLOW_PVP2_COMMAND = customServerConfig.getBoolean("AllowPvP2Command", false);
-		FARM1_X = customServerConfig.getInt("farm1_X", 81304);
-		FARM1_Y = customServerConfig.getInt("farm1_Y", 14589);
-		FARM1_Z = customServerConfig.getInt("farm1_Z", -3469);
-		PVP1_X = customServerConfig.getInt("pvp1_X", 81304);
-		PVP1_Y = customServerConfig.getInt("pvp1_Y", 14589);
-		PVP1_Z = customServerConfig.getInt("pvp1_Z", -3469);
-		FARM2_X = customServerConfig.getInt("farm2_X", 81304);
-		FARM2_Y = customServerConfig.getInt("farm2_Y", 14589);
-		FARM2_Z = customServerConfig.getInt("farm2_Z", -3469);
-		PVP2_X = customServerConfig.getInt("pvp2_X", 81304);
-		PVP2_Y = customServerConfig.getInt("pvp2_Y", 14589);
-		PVP2_Z = customServerConfig.getInt("pvp2_Z", -3469);
-		FARM1_CUSTOM_MESSAGE = customServerConfig.getString("Farm1CustomMeesage", "You have been teleported to Farm Zone 1!");
-		FARM2_CUSTOM_MESSAGE = customServerConfig.getString("Farm2CustomMeesage", "You have been teleported to Farm Zone 2!");
-		PVP1_CUSTOM_MESSAGE = customServerConfig.getString("PvP1CustomMeesage", "You have been teleported to PvP Zone 1!");
-		PVP2_CUSTOM_MESSAGE = customServerConfig.getString("PvP2CustomMeesage", "You have been teleported to PvP Zone 2!");
 		GM_TRADE_RESTRICTED_ITEMS = customServerConfig.getBoolean("GMTradeRestrictedItems", false);
 		GM_RESTART_FIGHTING = customServerConfig.getBoolean("GMRestartFighting", false);
 		PM_MESSAGE_ON_START = customServerConfig.getBoolean("PMWelcomeShow", false);
@@ -2094,7 +1897,6 @@ public class Config
 		ADD_SP = pvpConfig.getInt("AddSpAtPvp", 0);
 		ALLOW_SOE_IN_PVP = pvpConfig.getBoolean("AllowSoEInPvP", true);
 		ALLOW_POTS_IN_PVP = pvpConfig.getBoolean("AllowPotsInPvP", true);
-		ENABLE_PK_INFO = pvpConfig.getBoolean("EnablePkInfo", false);
 		ANNOUNCE_ALL_KILL = pvpConfig.getBoolean("AnnounceAllKill", false);
 		ANNOUNCE_PVP_KILL = pvpConfig.getBoolean("AnnouncePvPKill", false);
 		ANNOUNCE_PK_KILL = pvpConfig.getBoolean("AnnouncePkKill", false);
@@ -3144,12 +2946,6 @@ public class Config
 			loadPvpConfig();
 			loadCraftConfig();
 			
-			// Event config
-			loadCTFConfig();
-			loadDMConfig();
-			loadTVTConfig();
-			loadTWConfig();
-			
 			// Protect
 			loadFloodConfig();
 			loadProtectedOtherConfig();
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java
index 8b225ae4cf..f176a9fe20 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java
@@ -102,7 +102,6 @@ import org.l2jmobius.gameserver.instancemanager.RecipeManager;
 import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.TradeManager;
-import org.l2jmobius.gameserver.instancemanager.events.EventManager;
 import org.l2jmobius.gameserver.instancemanager.events.PcPoint;
 import org.l2jmobius.gameserver.instancemanager.games.Lottery;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
@@ -404,29 +403,6 @@ public class GameServer
 			ThreadPool.scheduleAtFixedRate(PcPoint.getInstance(), Config.PCB_INTERVAL * 1000, Config.PCB_INTERVAL * 1000);
 		}
 		
-		printSection("EventManager");
-		EventManager.getInstance().startEventRegistration();
-		
-		if (EventManager.TVT_EVENT_ENABLED || EventManager.CTF_EVENT_ENABLED || EventManager.DM_EVENT_ENABLED)
-		{
-			if (EventManager.TVT_EVENT_ENABLED)
-			{
-				LOGGER.info("TVT Event is Enabled.");
-			}
-			if (EventManager.CTF_EVENT_ENABLED)
-			{
-				LOGGER.info("CTF Event is Enabled.");
-			}
-			if (EventManager.DM_EVENT_ENABLED)
-			{
-				LOGGER.info("DM Event is Enabled.");
-			}
-		}
-		else
-		{
-			LOGGER.info("All events are Disabled.");
-		}
-		
 		if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.RESTORE_OFFLINERS)
 		{
 			OfflineTraderTable.restoreOfflineTraders();
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 23279c4e39..7be03b5a44 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -25,12 +25,10 @@ import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminAio;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminAnnouncements;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminBan;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminBuffs;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminCTFEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminCache;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminChangeAccessLevel;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminChristmas;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminCreateItem;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDMEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDelete;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDestroyItems;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDonator;
@@ -39,7 +37,6 @@ import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEditChar;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEditNpc;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEffects;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEnchant;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEventEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminExpSp;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminFence;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminFightCalculator;
@@ -82,9 +79,6 @@ import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminSuperHaste;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTarget;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTeleport;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTest;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTownWar;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTvTEngine;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminVIPEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminZone;
 
 /**
@@ -108,17 +102,14 @@ public class AdminCommandHandler
 		registerAdminCommandHandler(new AdminChangeAccessLevel());
 		registerAdminCommandHandler(new AdminChristmas());
 		registerAdminCommandHandler(new AdminCreateItem());
-		registerAdminCommandHandler(new AdminCTFEngine());
 		registerAdminCommandHandler(new AdminDelete());
 		registerAdminCommandHandler(new AdminDestroyItems());
-		registerAdminCommandHandler(new AdminDMEngine());
 		registerAdminCommandHandler(new AdminDonator());
 		registerAdminCommandHandler(new AdminDoorControl());
 		registerAdminCommandHandler(new AdminEditChar());
 		registerAdminCommandHandler(new AdminEditNpc());
 		registerAdminCommandHandler(new AdminEffects());
 		registerAdminCommandHandler(new AdminEnchant());
-		registerAdminCommandHandler(new AdminEventEngine());
 		registerAdminCommandHandler(new AdminExpSp());
 		registerAdminCommandHandler(new AdminFence());
 		registerAdminCommandHandler(new AdminFightCalculator());
@@ -161,9 +152,6 @@ public class AdminCommandHandler
 		registerAdminCommandHandler(new AdminTarget());
 		registerAdminCommandHandler(new AdminTeleport());
 		registerAdminCommandHandler(new AdminTest());
-		registerAdminCommandHandler(new AdminTownWar());
-		registerAdminCommandHandler(new AdminTvTEngine());
-		registerAdminCommandHandler(new AdminVIPEngine());
 		registerAdminCommandHandler(new AdminZone());
 		
 		LOGGER.info("AdminCommandHandler: Loaded " + _datatable.size() + " handlers.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java
index 67787186e7..4bfc6cebe7 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java
@@ -23,14 +23,10 @@ import java.util.logging.Logger;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.AutoPotion;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.BankingCmd;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.CTFCmd;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.DMCmd;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.ExperienceGain;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.FarmPvpCmd;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.OfflineShop;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Online;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.StatsCmd;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.TvTCmd;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Wedding;
 
 public class VoicedCommandHandler
@@ -47,21 +43,6 @@ public class VoicedCommandHandler
 			registerVoicedCommandHandler(new BankingCmd());
 		}
 		
-		if (Config.CTF_COMMAND)
-		{
-			registerVoicedCommandHandler(new CTFCmd());
-		}
-		
-		if (Config.TVT_COMMAND)
-		{
-			registerVoicedCommandHandler(new TvTCmd());
-		}
-		
-		if (Config.DM_COMMAND)
-		{
-			registerVoicedCommandHandler(new DMCmd());
-		}
-		
 		if (Config.ALLOW_WEDDING)
 		{
 			registerVoicedCommandHandler(new Wedding());
@@ -72,11 +53,6 @@ public class VoicedCommandHandler
 			registerVoicedCommandHandler(new StatsCmd());
 		}
 		
-		if (Config.ALLOW_FARM1_COMMAND || Config.ALLOW_FARM2_COMMAND || Config.ALLOW_PVP1_COMMAND || Config.ALLOW_PVP2_COMMAND)
-		{
-			registerVoicedCommandHandler(new FarmPvpCmd());
-		}
-		
 		if (Config.ALLOW_ONLINE_VIEW)
 		{
 			registerVoicedCommandHandler(new Online());
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java
deleted file mode 100644
index b80c382c6e..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import java.util.StringTokenizer;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminCTFEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_ctf",
-		"admin_ctf_name",
-		"admin_ctf_desc",
-		"admin_ctf_join_loc",
-		"admin_ctf_edit",
-		"admin_ctf_control",
-		"admin_ctf_minLevel",
-		"admin_ctf_maxLevel",
-		"admin_ctf_tele_npc",
-		"admin_ctf_tele_team",
-		"admin_ctf_tele_flag",
-		"admin_ctf_npc",
-		"admin_ctf_npc_pos",
-		"admin_ctf_reward",
-		"admin_ctf_reward_amount",
-		"admin_ctf_team_add",
-		"admin_ctf_team_remove",
-		"admin_ctf_team_pos",
-		"admin_ctf_team_color",
-		"admin_ctf_team_flag",
-		"admin_ctf_join",
-		"admin_ctf_teleport",
-		"admin_ctf_start",
-		"admin_ctf_startevent",
-		"admin_ctf_abort",
-		"admin_ctf_finish",
-		"admin_ctf_sit",
-		"admin_ctf_dump",
-		"admin_ctf_save",
-		"admin_ctf_load",
-		"admin_ctf_jointime",
-		"admin_ctf_eventtime",
-		"admin_ctf_autoevent",
-		"admin_ctf_minplayers",
-		"admin_ctf_maxplayers",
-		"admin_ctf_interval"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		final StringTokenizer st = new StringTokenizer(command);
-		final String comm = st.nextToken();
-		if (comm == null)
-		{
-			return false;
-		}
-		
-		switch (comm)
-		{
-			case "admin_ctf":
-			{
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_name":
-			{
-				if (st.hasMoreTokens())
-				{
-					if (CTF.setEventName(st.nextToken()))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_name <event_name>");
-				return false;
-			}
-			case "admin_ctf_desc":
-			{
-				if (st.hasMoreTokens())
-				{
-					if (CTF.setEventDesc(st.nextToken()))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_desc <event_descr>");
-				return false;
-			}
-			case "admin_ctf_join_loc":
-			{
-				if (st.hasMoreTokens())
-				{
-					if (CTF.setJoiningLocationName(st.nextToken()))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_join_loc <event_loc_name>");
-				return false;
-			}
-			case "admin_ctf_edit":
-			{
-				showEditPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_control":
-			{
-				showControlPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_minLevel":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String lvl_s = st.nextToken();
-					int lvl = 0;
-					try
-					{
-						lvl = Integer.parseInt(lvl_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minLevel <min_lvl_value>");
-						return false;
-					}
-					if (!CTF.checkMinLevel(lvl))
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Min lvl must be lower then Max");
-						return false;
-					}
-					if (CTF.setMinLevel(lvl))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minLevel <min_lvl_value>");
-				return false;
-			}
-			case "admin_ctf_maxLevel":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String lvl_s = st.nextToken();
-					int lvl = 0;
-					try
-					{
-						lvl = Integer.parseInt(lvl_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxLevel <max_lvl_value>");
-						return false;
-					}
-					if (!CTF.checkMaxLevel(lvl))
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Max lvl must be higher then Min");
-						return false;
-					}
-					if (CTF.setMaxLevel(lvl))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxLevel <min_lvl_value>");
-				return false;
-			}
-			case "admin_ctf_tele_npc":
-			{
-				activeChar.teleToLocation(CTF.getNpcLocation(), false);
-				showMainPage(activeChar);
-				return false;
-			}
-			case "admin_ctf_tele_team":
-			{
-				if (st.hasMoreTokens())
-				{
-					for (String team : CTF._teams)
-					{
-						if (team.equals(st.nextToken()))
-						{
-							final int index = CTF._teams.indexOf(team);
-							activeChar.teleToLocation(CTF._teamsX.get(index), CTF._teamsY.get(index), CTF._teamsZ.get(index));
-							return true;
-						}
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_team <team_name>");
-					showMainPage(activeChar);
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_team <team_name>");
-				return false;
-			}
-			case "admin_ctf_tele_flag":
-			{
-				if (st.hasMoreTokens())
-				{
-					for (String team : CTF._teams)
-					{
-						if (team.equals(st.nextToken()))
-						{
-							final int index = CTF._teams.indexOf(team);
-							activeChar.teleToLocation(CTF._flagsX.get(index), CTF._flagsY.get(index), CTF._flagsZ.get(index));
-							return true;
-						}
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_flag <team_name>");
-					showMainPage(activeChar);
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_flag <team_name>");
-				return false;
-			}
-			case "admin_ctf_npc":
-			{
-				if (st.hasMoreTokens())
-				{
-					int id = 0;
-					try
-					{
-						id = Integer.parseInt(st.nextToken());
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_npc <npc_id>");
-						return false;
-					}
-					if (CTF.setNpcId(id))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_npc <npc_id>");
-				return false;
-			}
-			case "admin_ctf_npc_pos":
-			{
-				CTF.setNpcPos(activeChar);
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_reward":
-			{
-				if (st.hasMoreTokens())
-				{
-					int id = 0;
-					try
-					{
-						id = Integer.parseInt(st.nextToken());
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward <reward_id>");
-						return false;
-					}
-					if (CTF.setRewardId(id))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward <reward_id>");
-				return false;
-			}
-			case "admin_ctf_reward_amount":
-			{
-				if (st.hasMoreTokens())
-				{
-					int amount = 0;
-					try
-					{
-						amount = Integer.parseInt(st.nextToken());
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward_amount <reward_amount>");
-						return false;
-					}
-					if (CTF.setRewardAmount(amount))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward_amount <reward_amount>");
-				return false;
-			}
-			case "admin_ctf_team_add":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.addTeam(st.nextToken());
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_add <team_name>");
-				return false;
-			}
-			case "admin_ctf_team_remove":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.removeTeam(st.nextToken());
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_remove <team_name>");
-				return false;
-			}
-			case "admin_ctf_team_pos":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.setTeamPos(st.nextToken(), activeChar);
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_pos <team_name>");
-				return false;
-			}
-			case "admin_ctf_team_color":
-			{
-				if (st.countTokens() == 2)
-				{
-					final String color_s = st.nextToken();
-					int color = 0;
-					try
-					{
-						color = Integer.decode("0x" + color_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_color <colorHex> <teamName>");
-						return false;
-					}
-					final String team = st.nextToken();
-					CTF.setTeamColor(team, color);
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_color <colorHex> <teamName>");
-				return false;
-			}
-			case "admin_ctf_team_flag":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.setTeamFlag(st.nextToken(), activeChar);
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_flag <teamName>");
-				return false;
-			}
-			case "admin_ctf_join":
-			{
-				if (CTF.startJoin())
-				{
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startJoin, check LOGGER for info..");
-				return false;
-			}
-			case "admin_ctf_teleport":
-			{
-				CTF.startTeleport();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_start":
-			{
-				if (CTF.startEvent())
-				{
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startEvent, check LOGGER for info..");
-				return false;
-			}
-			case "admin_ctf_startevent":
-			{
-				CTF.eventOnceStart();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_abort":
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Aborting event");
-				CTF.abortEvent();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_finish":
-			{
-				CTF.finishEvent();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_sit":
-			{
-				CTF.sit();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_dump":
-			{
-				CTF.dumpData();
-				return true;
-			}
-			case "admin_ctf_save":
-			{
-				CTF.saveData();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_load":
-			{
-				CTF.loadData();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_jointime":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String time_s = st.nextToken();
-					int time = 0;
-					try
-					{
-						time = Integer.parseInt(time_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_jointime <minutes>");
-						return false;
-					}
-					if (CTF.setJoinTime(time))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_jointime <minutes>");
-				return false;
-			}
-			case "admin_ctf_eventtime":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String time_s = st.nextToken();
-					int time = 0;
-					try
-					{
-						time = Integer.parseInt(time_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_eventtime <minutes>");
-						return false;
-					}
-					if (CTF.setEventTime(time))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_eventtime <minutes>");
-				return false;
-			}
-			case "admin_ctf_autoevent":
-			{
-				if ((CTF.getJoinTime() > 0) && (CTF.getEventTime() > 0))
-				{
-					CTF.autoEvent();
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, times not defined");
-				return false;
-			}
-			case "admin_ctf_interval":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String time_s = st.nextToken();
-					int time = 0;
-					try
-					{
-						time = Integer.parseInt(time_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_interval <minutes>");
-						return false;
-					}
-					if (CTF.setIntervalBetweenMatches(time))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_interval <minutes>");
-				return false;
-			}
-			case "admin_ctf_minplayers":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String min_s = st.nextToken();
-					int min = 0;
-					try
-					{
-						min = Integer.parseInt(min_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minplayers <number>");
-						return false;
-					}
-					if (CTF.setMinPlayers(min))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minplayers <number>");
-				return false;
-			}
-			case "admin_ctf_maxplayers":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String max_s = st.nextToken();
-					int max = 0;
-					try
-					{
-						max = Integer.parseInt(max_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxplayers <number>");
-						return false;
-					}
-					if (CTF.setMaxPlayers(max))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxplayers <number>");
-				return false;
-			}
-			default:
-			{
-				return false;
-			}
-		}
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showEditPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[CTF Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"125\"></td><td><edit var=\"input2\" width=\"125\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Name\" action=\"bypass -h admin_ctf_name $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Description\" action=\"bypass -h admin_ctf_desc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_ctf_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_ctf_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_ctf_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max players\" action=\"bypass -h admin_ctf_maxplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min players\" action=\"bypass -h admin_ctf_minplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC\" action=\"bypass -h admin_ctf_npc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC Pos\" action=\"bypass -h admin_ctf_npc_pos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward\" action=\"bypass -h admin_ctf_reward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward Amount\" action=\"bypass -h admin_ctf_reward_amount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Time\" action=\"bypass -h admin_ctf_jointime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Event Time\" action=\"bypass -h admin_ctf_eventtime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Interval Time\" action=\"bypass -h admin_ctf_interval $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Add\" action=\"bypass -h admin_ctf_team_add $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Color\" action=\"bypass -h admin_ctf_team_color $input1 $input2\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Pos\" action=\"bypass -h admin_ctf_team_pos $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Flag\" action=\"bypass -h admin_ctf_team_flag $input1 $input2\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Remove\" action=\"bypass -h admin_ctf_team_remove $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br>");
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_ctf\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showControlPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[CTF Engine]</font></center><br><br><br>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join\" action=\"bypass -h admin_ctf_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Teleport\" action=\"bypass -h admin_ctf_teleport\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start\" action=\"bypass -h admin_ctf_start\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"StartEventOnceTime\" action=\"bypass -h admin_ctf_startevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Abort\" action=\"bypass -h admin_ctf_abort\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Finish\" action=\"bypass -h admin_ctf_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Sit Force\" action=\"bypass -h admin_ctf_sit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Dump\" action=\"bypass -h admin_ctf_dump\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Save\" action=\"bypass -h admin_ctf_save\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Load\" action=\"bypass -h admin_ctf_load\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Auto Event\" action=\"bypass -h admin_ctf_autoevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br>");
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_ctf\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[CTF Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr>");
-		if (!CTF.isInProgress())
-		{
-			replyMSG.append("<td width=\"100\"><button value=\"Edit\" action=\"bypass -h admin_ctf_edit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		}
-		replyMSG.append("<td width=\"100\"><button value=\"Control\" action=\"bypass -h admin_ctf_control\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br>");
-		
-		replyMSG.append("<br><font color=\"LEVEL\">Current event...</font><br1>");
-		replyMSG.append("Name:&nbsp;<font color=\"00FF00\">" + CTF.getEventName() + "</font><br1>");
-		replyMSG.append("Description:&nbsp;<font color=\"00FF00\">" + CTF.getEventDesc() + "</font><br1>");
-		replyMSG.append("Joining location name:&nbsp;<font color=\"00FF00\">" + CTF.getJoiningLocationName() + "</font><br1>");
-		
-		final Location npcLoc = CTF.getNpcLocation();
-		replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + CTF.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
-		replyMSG.append("<button value=\"Tele->NPC\" action=\"bypass -h admin_ctf_tele_npc\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br>");
-		replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + CTF.getRewardId() + "</font><br1>");
-		if (ItemTable.getInstance().getTemplate(CTF.getRewardId()) != null)
-		{
-			replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">" + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + "</font><br1>");
-		}
-		else
-		{
-			replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">(unknown)</font><br1>");
-		}
-		replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + CTF.getRewardAmount() + "</font><br>");
-		replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMinLevel() + "</font><br1>");
-		replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMaxLevel() + "</font><br><br>");
-		replyMSG.append("Min Players:&nbsp;<font color=\"00FF00\">" + CTF.getMinPlayers() + "</font><br1>");
-		replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + CTF.getMaxPlayers() + "</font><br>");
-		replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + CTF.getJoinTime() + "</font><br1>");
-		replyMSG.append("Event Time:&nbsp;<font color=\"00FF00\">" + CTF.getEventTime() + "</font><br>");
-		if ((CTF._teams != null) && !CTF._teams.isEmpty())
-		{
-			replyMSG.append("<font color=\"LEVEL\">Current teams:</font><br1>");
-		}
-		replyMSG.append("<center><table border=\"0\">");
-		for (String team : CTF._teams)
-		{
-			replyMSG.append("<tr><td width=\"100\">Name: <font color=\"FF0000\">" + team + "</font>");
-			if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-			{
-				replyMSG.append("&nbsp;(" + CTF.teamPlayersCount(team) + " joined)");
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				if (CTF.isTeleport() || CTF.isStarted())
-				{
-					replyMSG.append("&nbsp;(" + CTF.teamPlayersCount(team) + " in)");
-				}
-			}
-			replyMSG.append("</td></tr><tr><td>");
-			
-			String c = Integer.toHexString(CTF._teamColors.get(CTF._teams.indexOf(team)));
-			while (c.length() < 6)
-			{
-				c = "0" + c;
-			}
-			replyMSG.append("Color: <font color=\"00FF00\">0x" + c.toUpperCase() + "</font><font color=\"" + c + "\"> =) </font>");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append("<button value=\"Tele->Team\" action=\"bypass -h admin_ctf_tele_team " + team + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(CTF._teamsX.get(CTF._teams.indexOf(team)) + ", " + CTF._teamsY.get(CTF._teams.indexOf(team)) + ", " + CTF._teamsZ.get(CTF._teams.indexOf(team)));
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append("Flag Id: <font color=\"00FF00\">" + CTF._flagIds.get(CTF._teams.indexOf(team)) + "</font>");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append("<button value=\"Tele->Flag\" action=\"bypass -h admin_ctf_tele_flag " + team + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(CTF._flagsX.get(CTF._teams.indexOf(team)) + ", " + CTF._flagsY.get(CTF._teams.indexOf(team)) + ", " + CTF._flagsZ.get(CTF._teams.indexOf(team)) + "</td></tr>");
-			if (!CTF.isInProgress())
-			{
-				replyMSG.append("<tr><td width=\"60\"><button value=\"Remove\" action=\"bypass -h admin_ctf_team_remove " + team + "\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr><tr></tr>");
-			}
-		}
-		
-		replyMSG.append("</table></center>");
-		
-		if (!CTF.isInProgress())
-		{
-			if (CTF.checkStartJoinOk())
-			{
-				replyMSG.append("<br1>");
-				replyMSG.append("Event is now set up. Press JOIN to start the registration.<br1>");
-				replyMSG.append("                           <button value=\"Join\" action=\"bypass -h admin_ctf_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br1>");
-				replyMSG.append("<br>");
-			}
-			else
-			{
-				replyMSG.append("<br1>");
-				replyMSG.append("Event is NOT set up. Press <font color=\"LEVEL\">EDIT</font> to create a new event, or <font color=\"LEVEL\">CONTROL</font> to load an existing event.<br1>");
-				replyMSG.append("<br>");
-			}
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && !CTF.isStarted())
-		{
-			replyMSG.append("<br1>");
-			replyMSG.append(CTF._playersShuffle.size() + " players participating. Waiting to shuffle in teams(done on teleport)!");
-			replyMSG.append("<br><br>");
-		}
-		
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java
deleted file mode 100644
index cc8e98612b..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminDMEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_dmevent",
-		"admin_dmevent_name",
-		"admin_dmevent_desc",
-		"admin_dmevent_join_loc",
-		"admin_dmevent_minLevel",
-		"admin_dmevent_maxLevel",
-		"admin_dmevent_npc",
-		"admin_dmevent_npc_pos",
-		"admin_dmevent_reward",
-		"admin_dmevent_reward_amount",
-		"admin_dmevent_spawnpos",
-		"admin_dmevent_color",
-		"admin_dmevent_join",
-		"admin_dmevent_teleport",
-		"admin_dmevent_start",
-		"admin_dmevent_startevent",
-		"admin_dmevent_abort",
-		"admin_dmevent_finish",
-		"admin_dmevent_sit",
-		"admin_dmevent_dump",
-		"admin_dmevent_save",
-		"admin_dmevent_load"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_dmevent"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_dmevent_name "))
-		{
-			if (DM.setEventName(command.substring(19)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_desc "))
-		{
-			if (DM.setEventDesc(command.substring(19)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_minLevel "))
-		{
-			if (!DM.checkMinLevel(Integer.parseInt(command.substring(21))))
-			{
-				return false;
-			}
-			
-			if (DM.setMinlvl(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_maxLevel "))
-		{
-			if (!DM.checkMaxLevel(Integer.parseInt(command.substring(21))))
-			{
-				return false;
-			}
-			
-			if (DM.setMaxlvl(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_join_loc "))
-		{
-			if (DM.setJoiningLocationName(command.substring(23)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_npc "))
-		{
-			if (DM.setNpcId(Integer.parseInt(command.substring(18))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_dmevent_npc_pos"))
-		{
-			DM.setNpcPos(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_dmevent_reward "))
-		{
-			if (DM.setRewardId(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_reward_amount "))
-		{
-			if (DM.setRewardAmount(Integer.parseInt(command.substring(28))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_dmevent_spawnpos"))
-		{
-			DM.setPlayersPos(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_dmevent_color "))
-		{
-			if (DM.setPlayerColors(Integer.decode("0x" + command.substring(20))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_dmevent_join"))
-		{
-			if (DM.startJoin())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startJoin, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_dmevent_teleport"))
-		{
-			DM.startTeleport();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_start"))
-		{
-			if (DM.startEvent())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startEvent, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_dmevent_startevent"))
-		{
-			DM.startEvent();
-			showMainPage(activeChar);
-			
-		}
-		else if (command.equals("admin_dmevent_abort"))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Aborting event");
-			DM.abortEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_finish"))
-		{
-			DM.finishEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_sit"))
-		{
-			DM.sit();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_load"))
-		{
-			DM.loadData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_save"))
-		{
-			DM.saveData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_dump"))
-		{
-			DM.dumpData();
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[DeathMatch Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"125\"></td><td><edit var=\"input2\" width=\"125\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Name\" action=\"bypass -h admin_dmevent_name $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Description\" action=\"bypass -h admin_dmevent_desc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_dmevent_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_dmevent_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_dmevent_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC\" action=\"bypass -h admin_dmevent_npc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC Pos\" action=\"bypass -h admin_dmevent_npc_pos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward\" action=\"bypass -h admin_dmevent_reward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward Amount\" action=\"bypass -h admin_dmevent_reward_amount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"DM Color\" action=\"bypass -h admin_dmevent_color $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"DM SpawnPos\" action=\"bypass -h admin_dmevent_spawnpos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><br><br><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join\" action=\"bypass -h admin_dmevent_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Teleport\" action=\"bypass -h admin_dmevent_teleport\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start\" action=\"bypass -h admin_dmevent_start\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("</tr></table><table><br><br><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"StartEventOnceTime\" action=\"bypass -h admin_dmevent_startevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Abort\" action=\"bypass -h admin_dmevent_abort\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Finish\" action=\"bypass -h admin_dmevent_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Sit Force\" action=\"bypass -h admin_dmevent_sit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Dump\" action=\"bypass -h admin_dmevent_dump\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Save\" action=\"bypass -h admin_dmevent_save\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Load\" action=\"bypass -h admin_dmevent_load\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br>");
-		replyMSG.append("Current event...<br1>");
-		replyMSG.append("Name:&nbsp;<font color=\"00FF00\">" + DM.getEventName() + "</font><br1>");
-		replyMSG.append("Description:&nbsp;<font color=\"00FF00\">" + DM.getEventDesc() + "</font><br1>");
-		replyMSG.append("Joining location name:&nbsp;<font color=\"00FF00\">" + DM.getJoiningLocationName() + "</font><br1>");
-		
-		final Location npcLoc = DM.getNpcLocation();
-		replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + DM.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
-		replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + DM.getRewardId() + "</font><br1>");
-		replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + DM.getRewardAmount() + "</font><br><br>");
-		replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + DM.getMinLevel() + "</font><br>");
-		replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + DM.getMaxLevel() + "</font><br><br>");
-		replyMSG.append("Death Match Color:&nbsp;<font color=\"00FF00\">" + DM.getPlayerColors() + "</font><br>");
-		
-		final Location playerLoc = DM.getPlayersSpawnLocation();
-		replyMSG.append("Death Match Spawn Pos:&nbsp;<font color=\"00FF00\">" + playerLoc.getX() + "," + playerLoc.getY() + "," + playerLoc.getZ() + "</font><br><br>");
-		replyMSG.append("Current players:<br1>");
-		if (!DM.hasStarted())
-		{
-			replyMSG.append("<br1>");
-			replyMSG.append(DM._players.size() + " players participating.");
-			replyMSG.append("<br><br>");
-		}
-		else if (DM.hasStarted())
-		{
-			replyMSG.append("<br1>");
-			replyMSG.append(DM._players.size() + " players in fighting event.");
-			replyMSG.append("<br><br>");
-		}
-		
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEventEngine.java
deleted file mode 100644
index fd21775322..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEventEngine.java
+++ /dev/null
@@ -1,805 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.StringTokenizer;
-
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ItemList;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import org.l2jmobius.gameserver.network.serverpackets.Revive;
-import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
-
-/**
- * This class handles following admin commands: - admin = shows menu
- * @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/04/11 10:06:06 $
- */
-public class AdminEventEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_event",
-		"admin_event_new",
-		"admin_event_choose",
-		"admin_event_store",
-		"admin_event_set",
-		"admin_event_change_teams_number",
-		"admin_event_announce",
-		"admin_event_panel",
-		"admin_event_control_begin",
-		"admin_event_control_teleport",
-		"admin_add",
-		"admin_event_see",
-		"admin_event_del",
-		"admin_delete_buffer",
-		"admin_event_control_sit",
-		"admin_event_name",
-		"admin_event_control_kill",
-		"admin_event_control_res",
-		"admin_event_control_prize",
-		"admin_event_control_chatban",
-		"admin_event_control_finish"
-	};
-	
-	private static String tempBuffer = "";
-	private static String tempName = "";
-	private static String tempName2 = "";
-	private static boolean npcsDeleted = false;
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_event"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_event_new"))
-		{
-			showNewEventPage(activeChar);
-		}
-		else if (command.startsWith("admin_add"))
-		{
-			tempBuffer += command.substring(10);
-			showNewEventPage(activeChar);
-		}
-		else if (command.startsWith("admin_event_see"))
-		{
-			final String eventName = command.substring(16);
-			FileInputStream fis = null;
-			BufferedInputStream buff = null;
-			DataInputStream in = null;
-			InputStreamReader isr = null;
-			BufferedReader inbr = null;
-			try
-			{
-				final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-				fis = new FileInputStream("data/events/" + eventName);
-				buff = new BufferedInputStream(fis);
-				in = new DataInputStream(buff);
-				isr = new InputStreamReader(in);
-				inbr = new BufferedReader(isr);
-				
-				final StringBuilder replyMSG = new StringBuilder("<html><body>");
-				replyMSG.append("<center><font color=\"LEVEL\">" + eventName + "</font><font color=\"FF0000\"> bY " + inbr.readLine() + "</font></center><br>");
-				replyMSG.append("<br>" + inbr.readLine());
-				replyMSG.append("</body></html>");
-				adminReply.setHtml(replyMSG.toString());
-				activeChar.sendPacket(adminReply);
-			}
-			catch (Exception e)
-			{
-			}
-			finally
-			{
-				if (inbr != null)
-				{
-					try
-					{
-						inbr.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (isr != null)
-				{
-					try
-					{
-						isr.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (in != null)
-				{
-					try
-					{
-						in.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (buff != null)
-				{
-					try
-					{
-						buff.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (fis != null)
-				{
-					try
-					{
-						fis.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-		else if (command.startsWith("admin_event_del"))
-		{
-			final String eventName = command.substring(16);
-			final File file = new File("data/events/" + eventName);
-			file.delete();
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_event_name"))
-		{
-			tempName += command.substring(17);
-			showNewEventPage(activeChar);
-		}
-		else if (command.equalsIgnoreCase("admin_delete_buffer"))
-		{
-			try
-			{
-				tempBuffer += tempBuffer.substring(0, tempBuffer.length() - 10);
-				showNewEventPage(activeChar);
-			}
-			catch (Exception e)
-			{
-				tempBuffer = "";
-			}
-		}
-		else if (command.startsWith("admin_event_store"))
-		{
-			FileOutputStream file = null;
-			PrintStream p = null;
-			try
-			{
-				file = new FileOutputStream("data/events/" + tempName);
-				p = new PrintStream(file);
-				p.println(activeChar.getName());
-				p.println(tempBuffer);
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			finally
-			{
-				if (p != null)
-				{
-					p.close();
-				}
-				
-				if (file != null)
-				{
-					try
-					{
-						file.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-			}
-			
-			tempBuffer = "";
-			tempName = "";
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_event_set"))
-		{
-			GameEvent.eventName = command.substring(16);
-			showEventParameters(activeChar, 2);
-		}
-		else if (command.startsWith("admin_event_change_teams_number"))
-		{
-			showEventParameters(activeChar, Integer.parseInt(command.substring(32)));
-		}
-		else if (command.startsWith("admin_event_panel"))
-		{
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_begin"))
-		{
-			try
-			{
-				GameEvent.active = true;
-				GameEvent.players.clear();
-				GameEvent.connectionLossData.clear();
-				
-				for (int j = 0; j < GameEvent.teamsNumber; j++)
-				{
-					final LinkedList<String> link = new LinkedList<>();
-					GameEvent.players.put(j + 1, link);
-				}
-				
-				int i = 0;
-				
-				while (!GameEvent.participatingPlayers.isEmpty())
-				{
-					final String target = getMaxLeveledPlayer();
-					if (!target.equals(""))
-					{
-						GameEvent.players.get(i + 1).add(target);
-						i = (i + 1) % GameEvent.teamsNumber;
-					}
-				}
-				
-				destroyEventNpcs();
-				npcsDeleted = true;
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_teleport"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(29), "-");
-			
-			while (st.hasMoreElements())
-			{
-				teleportTeam(activeChar, Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_sit"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(24), "-");
-			
-			while (st.hasMoreElements())
-			{
-				sitTeam(Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_kill"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(25), "-");
-			
-			while (st.hasMoreElements())
-			{
-				killTeam(activeChar, Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_res"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(24), "-");
-			
-			while (st.hasMoreElements())
-			{
-				resTeam(Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_prize"))
-		{
-			final StringTokenizer st0 = new StringTokenizer(command.substring(26));
-			final StringTokenizer st = new StringTokenizer(st0.nextToken(), "-");
-			String n = st0.nextToken();
-			
-			final StringTokenizer st1 = new StringTokenizer(n, "*");
-			n = st1.nextToken();
-			String type = "";
-			if (st1.hasMoreElements())
-			{
-				type = st1.nextToken();
-			}
-			
-			final String id = st0.nextToken();
-			
-			while (st.hasMoreElements())
-			{
-				regardTeam(activeChar, Integer.parseInt(st.nextToken()), Integer.parseInt(n), Integer.parseInt(id), type);
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_finish"))
-		{
-			for (int i = 0; i < GameEvent.teamsNumber; i++)
-			{
-				telePlayersBack(i + 1);
-			}
-			
-			GameEvent.eventName = "";
-			GameEvent.teamsNumber = 0;
-			GameEvent.names.clear();
-			GameEvent.participatingPlayers.clear();
-			GameEvent.players.clear();
-			GameEvent.id = 12760;
-			GameEvent.npcs.clear();
-			GameEvent.active = false;
-			npcsDeleted = false;
-		}
-		else if (command.startsWith("admin_event_announce"))
-		{
-			StringTokenizer st = new StringTokenizer(command.substring(21));
-			GameEvent.id = Integer.parseInt(st.nextToken());
-			GameEvent.teamsNumber = Integer.parseInt(st.nextToken());
-			String temp = " ";
-			String temp2 = "";
-			
-			while (st.hasMoreElements())
-			{
-				temp += st.nextToken() + " ";
-			}
-			
-			st = new StringTokenizer(temp, "-");
-			Integer i = 1;
-			
-			while (st.hasMoreElements())
-			{
-				temp2 = st.nextToken();
-				if (!temp2.equals(" "))
-				{
-					GameEvent.names.put(i, temp2.substring(1, temp2.length() - 1));
-					i++;
-				}
-			}
-			
-			GameEvent.participatingPlayers.clear();
-			
-			muestraNpcConInfoAPlayers(activeChar, GameEvent.id);
-			
-			final PlaySound snd = new PlaySound(1, "B03_F");
-			activeChar.sendPacket(snd);
-			activeChar.broadcastPacket(snd);
-			
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE</font></center><br>");
-			replyMSG.append("<center>The event <font color=\"LEVEL\">" + GameEvent.eventName + "</font> has been announced, now you can type //event_panel to see the event panel control</center><br>");
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			activeChar.sendPacket(adminReply);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	String showStoredEvents()
-	{
-		final File dir = new File("data/events");
-		final String[] files = dir.list();
-		String result = "";
-		if (files == null)
-		{
-			result = "No 'data/events' directory!";
-			return result;
-		}
-		
-		for (String file2 : files)
-		{
-			final File file = new File("data/events/" + file2);
-			result += "<font color=\"LEVEL\">" + file.getName() + " </font><br><button value=\"select\" action=\"bypass -h admin_event_set " + file.getName() + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><button value=\"ver\" action=\"bypass -h admin_event_see " + file.getName() + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><button value=\"delete\" action=\"bypass -h admin_event_del " + file.getName() + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br><br>";
-		}
-		
-		return result;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
-		replyMSG.append("<br><center><button value=\"Create NEW event \" action=\"bypass -h admin_event_new\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<center><br>Stored Events<br></center>");
-		replyMSG.append(showStoredEvents());
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showNewEventPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
-		replyMSG.append("<br><center>Event's Title<br><font color=\"LEVEL\">");
-		if (tempName.equals(""))
-		{
-			replyMSG.append("Use //event_name text to insert a new title");
-		}
-		else
-		{
-			replyMSG.append(tempName);
-		}
-		
-		replyMSG.append("</font></center><br><br>Event's description<br>");
-		if (tempBuffer.equals(""))
-		{
-			replyMSG.append("Use //add text o //delete_buffer to modify this text field");
-		}
-		else
-		{
-			replyMSG.append(tempBuffer);
-		}
-		
-		if ((!tempName.equals("") || !tempBuffer.equals("")))
-		{
-			replyMSG.append("<br><button value=\"Crear\" action=\"bypass -h admin_event_store\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		}
-		
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showEventParameters(PlayerInstance activeChar, int teamnumbers)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
-		replyMSG.append("<center><font color=\"LEVEL\">" + GameEvent.eventName + "</font></center><br>");
-		replyMSG.append("<br><center><button value=\"Change number of teams to\" action=\"bypass -h admin_event_change_teams_number $event_teams_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"> <edit var=\"event_teams_number\" width=100 height=20><br><br>");
-		replyMSG.append("<font color=\"LEVEL\">Team's Names</font><br>");
-		for (int i = 0; i < teamnumbers; i++)
-		{
-			replyMSG.append((i + 1) + ".- <edit var=\"event_teams_name" + (i + 1) + "\" width=100 height=20><br>");
-		}
-		
-		replyMSG.append("<br><br>Announcer NPC id<edit var=\"event_npcid\" width=100 height=20><br><br><button value=\"Announce Event!!\" action=\"bypass -h admin_event_announce $event_npcid " + teamnumbers + " ");
-		for (int i = 0; i < teamnumbers; i++)
-		{
-			replyMSG.append("$event_teams_name" + (i + 1) + " - ");
-		}
-		
-		replyMSG.append("\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	void muestraNpcConInfoAPlayers(PlayerInstance activeChar, int id)
-	{
-		GameEvent.npcs.clear();
-		final LinkedList<PlayerInstance> temp = new LinkedList<>();
-		temp.clear();
-		
-		for (PlayerInstance player : World.getInstance().getAllPlayers())
-		{
-			if (!temp.contains(player))
-			{
-				GameEvent.spawn(player, id);
-				temp.add(player);
-			}
-			for (PlayerInstance playertemp : player.getKnownList().getKnownPlayers().values())
-			{
-				if ((Math.abs(playertemp.getX() - player.getX()) < 500) && (Math.abs(playertemp.getY() - player.getY()) < 500) && (Math.abs(playertemp.getZ() - player.getZ()) < 500))
-				{
-					temp.add(playertemp);
-				}
-			}
-		}
-		
-		GameEvent.announceAllPlayers(activeChar.getName() + " wants to make an event !!! (you'll find a npc with the details around)");
-	}
-	
-	void showEventControl(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br><font color=\"LEVEL\">" + GameEvent.eventName + "</font><br><br><table width=200>");
-		replyMSG.append("<tr><td>Apply this command to teams number </td><td><edit var=\"team_number\" width=100 height=15></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		
-		if (!npcsDeleted)
-		{
-			replyMSG.append("<tr><td><button value=\"Start\" action=\"bypass -h admin_event_control_begin\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Destroys all event npcs so no more people can't participate now on</font></td></tr>");
-		}
-		
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Teleport\" action=\"bypass -h admin_event_control_teleport $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Teleports the specified team to your position</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Sit\" action=\"bypass -h admin_event_control_sit $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Sits/Stands up the team</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Kill\" action=\"bypass -h admin_event_control_kill $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Finish with the life of all the players in the selected team</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Resurrect\" action=\"bypass -h admin_event_control_res $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Resurrect Team's members</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Give Item\" action=\"bypass -h admin_event_control_prize $team_number $n $id\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"> number <edit var=\"n\" width=100 height=15> item id <edit var=\"id\" width=100 height=15></td><td><font color=\"LEVEL\">Give the specified item id to every single member of the team, you can put 5*level, 5*kills or 5 in the number field for example</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"End\" action=\"bypass -h admin_event_control_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Will finish the event teleporting back all the players</font></td></tr>");
-		replyMSG.append("</table></body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	String getMaxLeveledPlayer()
-	{
-		final Iterator<String> it = GameEvent.participatingPlayers.iterator();
-		PlayerInstance pc = null;
-		int max = 0;
-		String name = "";
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				tempName2 = it.next();
-				pc = World.getInstance().getPlayer(tempName2);
-				if (max < pc.getLevel())
-				{
-					max = pc.getLevel();
-					name = pc.getName();
-				}
-			}
-			catch (Exception e)
-			{
-				try
-				{
-					GameEvent.participatingPlayers.remove(tempName2);
-				}
-				catch (Exception e2)
-				{
-				}
-			}
-		}
-		
-		GameEvent.participatingPlayers.remove(name);
-		
-		return name;
-	}
-	
-	void destroyEventNpcs()
-	{
-		NpcInstance npc;
-		while (!GameEvent.npcs.isEmpty())
-		{
-			try
-			{
-				npc = (NpcInstance) World.getInstance().findObject(Integer.parseInt(GameEvent.npcs.get(0)));
-				final Spawn spawn = npc.getSpawn();
-				if (spawn != null)
-				{
-					spawn.stopRespawn();
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-				
-				npc.deleteMe();
-				GameEvent.npcs.remove(0);
-			}
-			catch (Exception e)
-			{
-				GameEvent.npcs.remove(0);
-			}
-		}
-	}
-	
-	void teleportTeam(PlayerInstance activeChar, int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance pc = World.getInstance().getPlayer(it.next());
-				pc.setTitle(GameEvent.names.get(team));
-				pc.teleToLocation(activeChar.getX(), activeChar.getY(), activeChar.getZ(), true);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void sitTeam(int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance pc = World.getInstance().getPlayer(it.next());
-				pc.eventSitForced = !pc.eventSitForced;
-				if (pc.eventSitForced)
-				{
-					pc.sitDown();
-				}
-				else
-				{
-					pc.standUp();
-				}
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void killTeam(PlayerInstance activeChar, int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance target = World.getInstance().getPlayer(it.next());
-				target.reduceCurrentHp(target.getMaxHp() + target.getMaxCp() + 1, activeChar);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void resTeam(int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance character = World.getInstance().getPlayer(it.next());
-				character.setCurrentHpMp(character.getMaxHp(), character.getMaxMp());
-				character.setCurrentCp(character.getMaxCp());
-				
-				final Revive revive = new Revive(character);
-				final SocialAction sa = new SocialAction(character.getObjectId(), 15);
-				character.broadcastPacket(sa);
-				character.sendPacket(sa);
-				character.sendPacket(revive);
-				character.broadcastPacket(revive);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	private void createItem(PlayerInstance activeChar, PlayerInstance player, int id, int num)
-	{
-		player.getInventory().addItem("Event", id, num, player, activeChar);
-		player.sendPacket(new ItemList(player, true));
-		
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("CONGRATULATIONS, you should have a present in your inventory");
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		player.sendPacket(adminReply);
-	}
-	
-	void regardTeam(PlayerInstance activeChar, int team, int n, int id, String type)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		int temp = n;
-		
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance target = World.getInstance().getPlayer(it.next());
-				if (type.equalsIgnoreCase("level"))
-				{
-					temp = n * target.getLevel();
-				}
-				else if (type.equalsIgnoreCase("kills"))
-				{
-					temp = n * target.kills.size();
-				}
-				else
-				{
-					temp = n;
-				}
-				createItem(activeChar, target, id, temp);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void telePlayersBack(int team)
-	{
-		resTeam(team);
-		
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance target = World.getInstance().getPlayer(it.next());
-				target.setTitle(target.eventTitle);
-				target.setKarma(target.eventKarma);
-				target.setPvpKills(target.eventPvpKills);
-				target.setPkKills(target.eventPkKills);
-				target.teleToLocation(target.eventX, target.eventY, target.eventZ, true);
-				target.kills.clear();
-				target.eventSitForced = false;
-				target.atEvent = false;
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTownWar.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTownWar.java
deleted file mode 100644
index 7218491cea..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTownWar.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.xml.MapRegionData;
-import org.l2jmobius.gameserver.data.xml.ZoneData;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.type.TownZone;
-
-public class AdminTownWar implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_townwar_start",
-		"admin_townwar_end"
-	};
-	private WorldObject _activeObject;
-	
-	public WorldObject getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.startsWith("admin_townwar_start")) // townwar_start
-		{
-			startTW(activeChar);
-		}
-		if (command.startsWith("admin_townwar_end")) // townwar_end
-		{
-			endTW(activeChar);
-		}
-		return true;
-	}
-	
-	private void startTW(PlayerInstance activeChar)
-	{
-		// All Towns will become War Zones
-		if (Config.TW_ALL_TOWNS)
-		{
-			for (TownZone zone : ZoneData.getInstance().getAllZones(TownZone.class))
-			{
-				zone.setParameter("noPeace", "true");
-			}
-		}
-		
-		// A Town will become War Zone
-		if (!Config.TW_ALL_TOWNS && (Config.TW_TOWN_ID != 18) && (Config.TW_TOWN_ID != 21) && (Config.TW_TOWN_ID != 22))
-		{
-			MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).setParameter("noPeace", "true");
-		}
-		
-		int x;
-		int y;
-		int z;
-		TownZone town;
-		for (PlayerInstance onlinePlayer : World.getInstance().getAllPlayers())
-		{
-			if (onlinePlayer.isOnline())
-			{
-				x = onlinePlayer.getX();
-				y = onlinePlayer.getY();
-				z = onlinePlayer.getZ();
-				town = ZoneData.getInstance().getZone(x, y, z, TownZone.class);
-				if (town != null)
-				{
-					if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, false);
-						onlinePlayer.revalidateZone(true);
-					}
-					else if (Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, false);
-						onlinePlayer.revalidateZone(true);
-					}
-				}
-				onlinePlayer.setInTownWar(true);
-			}
-		}
-		
-		// Announce for all towns
-		if (Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("Town War Event!");
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("All towns have been set to war zone by " + activeChar.getName() + ".");
-		}
-		
-		// Announce for one town
-		if (!Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("Town War Event!");
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).getName() + " has been set to war zone by " + activeChar.getName() + ".");
-		}
-	}
-	
-	private void endTW(PlayerInstance activeChar)
-	{
-		// All Towns will become Peace Zones
-		if (Config.TW_ALL_TOWNS)
-		{
-			MapRegionData.getInstance().getTown(1).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(2).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(3).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(4).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(5).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(6).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(7).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(8).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(9).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(10).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(11).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(12).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(13).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(14).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(15).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(16).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(17).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(19).setParameter("noPeace", "false");
-		}
-		
-		// A Town will become Peace Zone
-		if (!Config.TW_ALL_TOWNS && (Config.TW_TOWN_ID != 18) && (Config.TW_TOWN_ID != 21) && (Config.TW_TOWN_ID != 22))
-		{
-			MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).setParameter("noPeace", "false");
-		}
-		
-		int x;
-		int y;
-		int z;
-		TownZone town;
-		for (PlayerInstance onlinePlayer : World.getInstance().getAllPlayers())
-		{
-			if (onlinePlayer.isOnline())
-			{
-				x = onlinePlayer.getX();
-				y = onlinePlayer.getY();
-				z = onlinePlayer.getZ();
-				town = ZoneData.getInstance().getZone(x, y, z, TownZone.class);
-				if (town != null)
-				{
-					if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, true);
-						onlinePlayer.revalidateZone(true);
-					}
-					else if (Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, true);
-						onlinePlayer.revalidateZone(true);
-					}
-				}
-				onlinePlayer.setInTownWar(false);
-			}
-		}
-		
-		// Announce for all towns
-		if (Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("All towns have been set back to normal by " + activeChar.getName() + ".");
-		}
-		
-		// Announce for one town
-		if (!Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).getName() + " has been set back to normal by " + activeChar.getName() + ".");
-		}
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java
deleted file mode 100644
index b971028f74..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import java.util.StringTokenizer;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminTvTEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_tvt",
-		"admin_tvt_name",
-		"admin_tvt_desc",
-		"admin_tvt_join_loc",
-		"admin_tvt_minLevel",
-		"admin_tvt_maxLevel",
-		"admin_tvt_npc",
-		"admin_tvt_npc_pos",
-		"admin_tvt_reward",
-		"admin_tvt_reward_amount",
-		"admin_tvt_team_add",
-		"admin_tvt_team_remove",
-		"admin_tvt_team_pos",
-		"admin_tvt_team_color",
-		"admin_tvt_join",
-		"admin_tvt_teleport",
-		"admin_tvt_start",
-		"admin_tvt_abort",
-		"admin_tvt_finish",
-		"admin_tvt_sit",
-		"admin_tvt_dump",
-		"admin_tvt_save",
-		"admin_tvt_load",
-		"admin_tvt_jointime",
-		"admin_tvt_eventtime",
-		"admin_tvt_autoevent",
-		"admin_tvt_startevent",
-		"admin_tvt_minplayers",
-		"admin_tvt_maxplayers",
-		"admin_tvtkick",
-		"admin_tvt_interval"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_tvt"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_name "))
-		{
-			if (TvT.setEventName(command.substring(15)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_desc "))
-		{
-			if (TvT.setEventDesc(command.substring(15)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_minLevel "))
-		{
-			if (!TvT.checkMinLevel(Integer.parseInt(command.substring(17))))
-			{
-				return false;
-			}
-			
-			if (TvT.setMinlvl(Integer.parseInt(command.substring(17))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_maxLevel "))
-		{
-			if (!TvT.checkMaxLevel(Integer.parseInt(command.substring(17))))
-			{
-				return false;
-			}
-			
-			if (TvT.setMaxlvl(Integer.parseInt(command.substring(17))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_minplayers "))
-		{
-			if (TvT.setMinPlayers(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_maxplayers "))
-		{
-			if (TvT.setMaxPlayers(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_join_loc "))
-		{
-			if (TvT.setJoiningLocationName(command.substring(19)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_npc "))
-		{
-			if (TvT.setNpcId(Integer.parseInt(command.substring(14))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_tvt_npc_pos"))
-		{
-			TvT.setNpcPos(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_reward "))
-		{
-			if (TvT.setRewardId(Integer.parseInt(command.substring(17))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_reward_amount "))
-		{
-			if (TvT.setRewardAmount(Integer.parseInt(command.substring(24))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_jointime "))
-		{
-			if (TvT.setJoinTime(Integer.parseInt(command.substring(19))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_eventtime "))
-		{
-			if (TvT.setEventTime(Integer.parseInt(command.substring(20))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_interval "))
-		{
-			if (TvT.setIntervalBetweenMatches(Integer.parseInt(command.substring(20))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_team_add "))
-		{
-			final String teamName = command.substring(19);
-			TvT.addTeam(teamName);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_team_remove "))
-		{
-			final String teamName = command.substring(22);
-			TvT.removeTeam(teamName);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_team_pos "))
-		{
-			final String teamName = command.substring(19);
-			TvT.setTeamPos(teamName, activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_team_color "))
-		{
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 3)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usege: //tvt_team_color <colorHex> <teamName>");
-				return false;
-			}
-			
-			TvT.setTeamColor(command.substring(params[0].length() + params[1].length() + 2), Integer.decode("0x" + params[1]));
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_join"))
-		{
-			if (TvT.startJoin())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startJoin, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_tvt_teleport"))
-		{
-			TvT.startTeleport();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_start"))
-		{
-			if (TvT.startEvent())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startEvent, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_tvt_startevent"))
-		{
-			TvT.eventOnceStart();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_abort"))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Aborting event");
-			TvT.abortEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_finish"))
-		{
-			TvT.finishEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_sit"))
-		{
-			TvT.sit();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_load"))
-		{
-			TvT.loadData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_autoevent"))
-		{
-			if ((TvT.getJoinTime() > 0) && (TvT.getEventTime() > 0))
-			{
-				TvT.autoEvent();
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usege: join time or event time invalid.");
-			}
-			
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_save"))
-		{
-			TvT.saveData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_dump"))
-		{
-			TvT.dumpData();
-		}
-		else if (command.startsWith("admin_tvtkick"))
-		{
-			final StringTokenizer st = new StringTokenizer(command);
-			if (st.countTokens() > 1)
-			{
-				st.nextToken();
-				final String plyr = st.nextToken();
-				final PlayerInstance playerToKick = World.getInstance().getPlayer(plyr);
-				if (playerToKick != null)
-				{
-					TvT.kickPlayerFromTvt(playerToKick);
-					BuilderUtil.sendSysMessage(activeChar, "You kicked " + playerToKick.getName() + " from the TvT.");
-				}
-				else
-				{
-					BuilderUtil.sendSysMessage(activeChar, "Wrong usege: //tvtkick <player>");
-				}
-			}
-		}
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><title>Team vs Team</title><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[TvT Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"125\"></td><td><edit var=\"input2\" width=\"125\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Name\" action=\"bypass -h admin_tvt_name $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Description\" action=\"bypass -h admin_tvt_desc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_tvt_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_tvt_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_tvt_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max players\" action=\"bypass -h admin_tvt_maxplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min players\" action=\"bypass -h admin_tvt_minplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC\" action=\"bypass -h admin_tvt_npc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC Pos\" action=\"bypass -h admin_tvt_npc_pos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward\" action=\"bypass -h admin_tvt_reward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward Amount\" action=\"bypass -h admin_tvt_reward_amount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Time\" action=\"bypass -h admin_tvt_jointime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Event Time\" action=\"bypass -h admin_tvt_eventtime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Interval Time\" action=\"bypass -h admin_tvt_interval $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Add\" action=\"bypass -h admin_tvt_team_add $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Color\" action=\"bypass -h admin_tvt_team_color $input1 $input2\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Pos\" action=\"bypass -h admin_tvt_team_pos $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Remove\" action=\"bypass -h admin_tvt_team_remove $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join\" action=\"bypass -h admin_tvt_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Teleport\" action=\"bypass -h admin_tvt_teleport\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start\" action=\"bypass -h admin_tvt_start\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"StartEventOnceTime\" action=\"bypass -h admin_tvt_startevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Abort\" action=\"bypass -h admin_tvt_abort\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Finish\" action=\"bypass -h admin_tvt_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Sit Force\" action=\"bypass -h admin_tvt_sit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Dump\" action=\"bypass -h admin_tvt_dump\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Save\" action=\"bypass -h admin_tvt_save\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Load\" action=\"bypass -h admin_tvt_load\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Auto Event\" action=\"bypass -h admin_tvt_autoevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br>");
-		replyMSG.append("Current event:<br1>");
-		replyMSG.append("Name:&nbsp;<font color=\"00FF00\">" + TvT.getEventName() + "</font><br1>");
-		replyMSG.append("Description:&nbsp;<font color=\"00FF00\">" + TvT.getEventDesc() + "</font><br1>");
-		replyMSG.append("Joining location name:&nbsp;<font color=\"00FF00\">" + TvT.getJoiningLocationName() + "</font><br1>");
-		
-		final Location npcLoc = TvT.getNpcLocation();
-		replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + TvT.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
-		replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + TvT.getRewardId() + "</font><br1>");
-		replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + TvT.getRewardAmount() + "</font><br><br>");
-		replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMinLevel() + "</font><br>");
-		replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMaxLevel() + "</font><br><br>");
-		replyMSG.append("Min Players:&nbsp;<font color=\"00FF00\">" + TvT.getMinPlayers() + "</font><br>");
-		replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + TvT.getMaxPlayers() + "</font><br><br>");
-		replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + TvT.getJoinTime() + "</font><br>");
-		replyMSG.append("Event Timer:&nbsp;<font color=\"00FF00\">" + TvT.getEventTime() + "</font><br><br>");
-		replyMSG.append("Interval Time:&nbsp;<font color=\"00FF00\">" + TvT.getIntervalBetweenMatches() + "</font><br><br>");
-		replyMSG.append("Current teams:<br1>");
-		replyMSG.append("<center><table border=\"0\">");
-		for (String team : TvT._teams)
-		{
-			replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font>");
-			if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-			{
-				replyMSG.append("&nbsp;(" + TvT.teamPlayersCount(team) + " joined)");
-			}
-			else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				if (TvT.isTeleport() || TvT.isStarted())
-				{
-					replyMSG.append("&nbsp;(" + TvT.teamPlayersCount(team) + " in)");
-				}
-			}
-			
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(TvT._teamColors.get(TvT._teams.indexOf(team)));
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(TvT._teamsX.get(TvT._teams.indexOf(team)) + ", " + TvT._teamsY.get(TvT._teams.indexOf(team)) + ", " + TvT._teamsZ.get(TvT._teams.indexOf(team)));
-			replyMSG.append("</td></tr><tr><td width=\"60\"><button value=\"Remove\" action=\"bypass -h admin_tvt_team_remove " + team + "\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");
-		}
-		
-		replyMSG.append("</table></center>");
-		
-		if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			if (!TvT.isStarted())
-			{
-				replyMSG.append("<br1>");
-				replyMSG.append(TvT._playersShuffle.size() + " players participating. Waiting to shuffle in teams(done on teleport)!");
-				replyMSG.append("<br><br>");
-			}
-		}
-		
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminVIPEngine.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminVIPEngine.java
deleted file mode 100644
index 13c1d5e2c5..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminVIPEngine.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminVIPEngine implements IAdminCommandHandler
-{
-	private static String[] ADMIN_COMMANDS =
-	{
-		"admin_vip",
-		"admin_vip_setteam",
-		"admin_vip_randomteam",
-		"admin_vip_settime",
-		"admin_vip_endnpc",
-		"admin_vip_setdelay",
-		"admin_vip_joininit",
-		"admin_vip_joinnpc",
-		"admin_vip_joinlocxyz",
-		"admin_vip_setarea",
-		"admin_vip_vipreward",
-		"admin_vip_viprewardamount",
-		"admin_vip_thevipreward",
-		"admin_vip_theviprewardamount",
-		"admin_vip_notvipreward",
-		"admin_vip_notviprewardamount",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_vip"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_setteam "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_setteam <team>");
-				return false;
-			}
-			
-			VIP.setTeam(params[1], activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_randomteam"))
-		{
-			if (VIP._started || VIP._joining)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			VIP.setRandomTeam(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_settime "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_settime <time>");
-				return false;
-			}
-			
-			VIP._time = Integer.parseInt(params[1]) * 60 * 1000;
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_endnpc "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_endnpc <npc>");
-				return false;
-			}
-			
-			VIP.endNPC(Integer.parseInt(params[1]), activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joinnpc "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_joinnpc <npc>");
-				return false;
-			}
-			
-			VIP.joinNPC(Integer.parseInt(params[1]), activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_setdelay "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_setdelay <time>");
-				return false;
-			}
-			
-			VIP._delay = Integer.parseInt(params[1]) * 60 * 1000;
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joininit"))
-		{
-			VIP.startJoin(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joinlocxyz "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 4)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_joinlocxyz <x> <y> <z>");
-				return false;
-			}
-			
-			VIP.setJoinLOC(params[1], params[2], params[3]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joinnpc "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_joinnpc <npc>");
-				return false;
-			}
-			
-			VIP.joinNPC(Integer.parseInt(params[1]), activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_setarea "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_setarea <Area>");
-				return false;
-			}
-			VIP._joinArea = params[1];
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_vipreward "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_vipreward <id>");
-				return false;
-			}
-			
-			VIP._vipReward = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_viprewardamount "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_viprewardamount <amount>");
-				return false;
-			}
-			
-			VIP._vipRewardAmount = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_notvipreward "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_notvipreward <id>");
-				return false;
-			}
-			
-			VIP._notVipReward = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_notviprewardamount "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_notviprewardamount <amount>");
-				return false;
-			}
-			
-			VIP._notVipRewardAmount = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_thevipreward "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_thevipreward <id>");
-				return false;
-			}
-			
-			VIP._theVipReward = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_theviprewardamount "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_theviprewardamount <amount>");
-				return false;
-			}
-			
-			VIP._theVipRewardAmount = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[VIP Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"50\"></td><td><edit var=\"input2\" width=\"50\"></td><td><edit var=\"input3\" width\"50\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Team\" action=\"bypass -h admin_vip_setteam $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Random Team\" action=\"bypass -h admin_vip_randomteam\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Time\" action=\"bypass -h admin_vip_settime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Delay\" action=\"bypass -h admin_vip_setdelay $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Area\" action=\"bypass -h admin_vip_setarea $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"End NPC\" action=\"bypass -h admin_vip_endnpc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join NPC\" action=\"bypass -h admin_vip_joinnpc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join LOC\" action=\"bypass -h admin_vip_joinlocxyz $input1 $input2 $input3\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"VIP Reward\" action=\"bypass -h admin_vip_vipreward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"VIP Reward Am\" action=\"bypass -h admin_vip_viprewardamount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Not VIP Reward\" action=\"bypass -h admin_vip_notvipreward $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Not VIP Reward Am\" action=\"bypass -h admin_vip_notviprewardamount $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"The VIP Reward\" action=\"bypass -h admin_vip_thevipreward $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"The VIP Reward Am\" action=\"bypass -h admin_vip_theviprewardamount $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start Join\" action=\"bypass -h admin_vip_joininit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br>");
-		
-		replyMSG.append("<font color=\"LEVEL\">VIP Settings...</font><br1>");
-		replyMSG.append("Team:&nbsp;<font color=\"FFFFFF\">" + VIP._teamName + "</font><br>");
-		replyMSG.append("Delay:&nbsp;<font color=\"FFFFFF\">" + (VIP._delay / 1000 / 60) + "</font><br1>");
-		replyMSG.append("Time:&nbsp;<font color=\"FFFFFF\">" + (VIP._time / 1000 / 60) + "</font><br>");
-		replyMSG.append("End NPC ID:&nbsp;<font color=\"FFFFFF\">" + VIP._endNPC + " (" + VIP.getNPCName(VIP._endNPC, activeChar) + ")</font><br1>");
-		replyMSG.append("Join NPC ID:&nbsp;<font color=\"FFFFFF\">" + VIP._joinNPC + " (" + VIP.getNPCName(VIP._joinNPC, activeChar) + ")</font><br>");
-		replyMSG.append("Start Location:&nbsp;<font color=\"FFFFFF\">" + VIP._startX + "," + VIP._startY + "," + VIP._startZ + "</font><br1>");
-		replyMSG.append("End Location:&nbsp;<font color=\"FFFFFF\">" + VIP._endX + "," + VIP._endY + "," + VIP._endZ + "</font><br1>");
-		replyMSG.append("Join Location:&nbsp;<font color=\"FFFFFF\">" + VIP._joinX + "," + VIP._joinY + "," + VIP._joinZ + "</font><br>");
-		replyMSG.append("VIP Team Reward:&nbsp;<font color=\"FFFFFF\">" + VIP.getItemName(VIP._vipReward, activeChar) + " (" + VIP._vipRewardAmount + ")</font><br1>");
-		replyMSG.append("Not VIP Team Reward:&nbsp;<font color=\"FFFFFF\">" + VIP.getItemName(VIP._notVipReward, activeChar) + " (" + VIP._notVipRewardAmount + ")</font><br1>");
-		replyMSG.append("VIP Reward:&nbsp;<font color=\"FFFFFF\">" + VIP.getItemName(VIP._theVipReward, activeChar) + " (" + VIP._theVipRewardAmount + ")</font><br>");
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
index d6e5839b9d..cc0a8b5ebc 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
@@ -28,10 +28,6 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.handler.IItemHandler;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Effect.EffectType;
 import org.l2jmobius.gameserver.model.Skill;
@@ -41,7 +37,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 public class Potions implements IItemHandler
@@ -49,17 +44,17 @@ public class Potions implements IItemHandler
 	protected static final Logger LOGGER = Logger.getLogger(Potions.class.getName());
 	private int _herbstask = 0;
 	
-	private static final Map<Integer, PotionsSkills> POTIONS = new HashMap<>();
+	private static final Map<Integer, PotionSkill> POTIONS = new HashMap<>();
 	
 	private static void loadPotions()
 	{
-		for (PotionsSkills potionSkill : PotionsSkills.values())
+		for (PotionSkill potionSkill : PotionSkill.values())
 		{
 			POTIONS.put(potionSkill.potionId, potionSkill);
 		}
 	}
 	
-	public static PotionsSkills getSkillsForPotion(Integer potionId)
+	public static PotionSkill getSkillsForPotion(Integer potionId)
 	{
 		if (POTIONS.isEmpty())
 		{
@@ -76,7 +71,7 @@ public class Potions implements IItemHandler
 		}
 		
 		final List<Integer> outputPotions = new ArrayList<>();
-		for (Entry<Integer, PotionsSkills> entry : POTIONS.entrySet())
+		for (Entry<Integer, PotionSkill> entry : POTIONS.entrySet())
 		{
 			Map<Integer, Integer> itemSkills = null;
 			if (entry.getValue() != null)
@@ -208,30 +203,6 @@ public class Potions implements IItemHandler
 		{
 			PlayerInstance activeChar;
 			activeChar = (PlayerInstance) playable;
-			if (activeChar._inEventTvT && TvT.isStarted() && !Config.TVT_ALLOW_POTIONS)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
-			if (activeChar._inEventDM && DM.hasStarted() && !Config.DM_ALLOW_POTIONS)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
-			if (activeChar._inEventCTF && CTF.isStarted() && !Config.CTF_ALLOW_POTIONS)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
-			if (activeChar._inEventVIP && VIP._started)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
 			if (activeChar.isInOlympiadMode())
 			{
 				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
@@ -897,7 +868,7 @@ public class Potions implements IItemHandler
 		}
 	}
 	
-	enum PotionsSkills
+	enum PotionSkill
 	{
 		mana_drug(726, 2003, 1),
 		mana_potion(728, 2005, 1),
@@ -1003,13 +974,13 @@ public class Potions implements IItemHandler
 		public Integer potionId;
 		public Map<Integer, Integer> skills = new HashMap<>();
 		
-		private PotionsSkills(int potionItem, int skillIdentifier, int skillLevel)
+		private PotionSkill(int potionItem, int skillIdentifier, int skillLevel)
 		{
 			skills.put(skillIdentifier, skillLevel);
 			potionId = potionItem;
 		}
 		
-		private PotionsSkills(int potionItem, Integer[] skillIdentifiers, Integer[] skillLevels)
+		private PotionSkill(int potionItem, Integer[] skillIdentifiers, Integer[] skillLevels)
 		{
 			for (int i = 0; i < skillIdentifiers.length; i++)
 			{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
index 56f89c1116..4c973a0ac7 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
@@ -25,10 +25,6 @@ import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -101,27 +97,9 @@ public class ScrollOfEscape implements IItemHandler
 			return;
 		}
 		
-		if (player._inEventTvT && TvT.isStarted())
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You can't use Scroll of Escape in TvT.");
-			return;
-		}
-		
-		if (player._inEventDM && DM.hasStarted())
-		{
-			player.sendMessage("You can't use Scroll of Escape in DM.");
-			return;
-		}
-		
-		if (player._inEventCTF && CTF.isStarted())
-		{
-			player.sendMessage("You can't use Scroll of Escape in CTF.");
-			return;
-		}
-		
-		if (player._inEventVIP && VIP._started)
-		{
-			player.sendMessage("You can't use Scroll of Escape in VIP.");
+			player.sendMessage("You can't use Scroll of Escape in an event.");
 			return;
 		}
 		
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
index c335acd8a5..81ab1bdb79 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
@@ -16,16 +16,12 @@
  */
 package org.l2jmobius.gameserver.handler.itemhandlers;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.NpcTable;
 import org.l2jmobius.gameserver.data.xml.SummonItemData;
 import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.SummonItem;
 import org.l2jmobius.gameserver.model.World;
@@ -61,24 +57,9 @@ public class SummonItems implements IItemHandler
 			return;
 		}
 		
-		if (player._inEventTvT && TvT.isStarted() && !Config.TVT_ALLOW_SUMMON)
+		if (player.isOnCustomEvent())
 		{
-			final ActionFailed af = ActionFailed.STATIC_PACKET;
-			player.sendPacket(af);
-			return;
-		}
-		
-		if (player._inEventDM && DM.hasStarted() && !Config.DM_ALLOW_SUMMON)
-		{
-			final ActionFailed af = ActionFailed.STATIC_PACKET;
-			player.sendPacket(af);
-			return;
-		}
-		
-		if (player._inEventCTF && CTF.isStarted() && !Config.CTF_ALLOW_SUMMON)
-		{
-			final ActionFailed af = ActionFailed.STATIC_PACKET;
-			player.sendPacket(af);
+			playable.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
 		
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
index 540868ce4a..019c6803fe 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
@@ -53,7 +53,7 @@ public class ClanGate implements ISkillHandler
 			return;
 		}
 		
-		if (player.isInFunEvent() || player.isInsideZone(ZoneId.NO_LANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null))
+		if (player.isOnCustomEvent() || player.isInsideZone(ZoneId.NO_LANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null))
 		{
 			player.sendMessage("Cannot open the portal here.");
 			return;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
index 85e6403840..f3e80463b9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
@@ -21,10 +21,6 @@ import java.util.List;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.handler.ISkillHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -92,9 +88,9 @@ public class Recall implements ISkillHandler
 						continue;
 					}
 					
-					if ((targetChar._inEventCTF && CTF.isStarted()) || (targetChar._inEventTvT && TvT.isStarted()) || (targetChar._inEventDM && DM.hasStarted()) || (targetChar._inEventVIP && VIP._started))
+					if (targetChar.isOnCustomEvent())
 					{
-						targetChar.sendMessage("You can't use escape skill in Event.");
+						targetChar.sendMessage("You can't use escape skill in an event.");
 						continue;
 					}
 					
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
index cb606476c1..0df83e6dec 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
@@ -20,10 +20,6 @@ import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ISkillHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -62,31 +58,7 @@ public class SummonFriend implements ISkillHandler
 			return;
 		}
 		
-		if (activePlayer._inEvent)
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventCTF && CTF.isStarted())
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventDM && DM.hasStarted())
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventTvT && TvT.isStarted())
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventVIP && VIP._started)
+		if (activePlayer.isOnCustomEvent())
 		{
 			activePlayer.sendMessage("You cannot use this skill in an Event.");
 			return;
@@ -143,32 +115,6 @@ public class SummonFriend implements ISkillHandler
 						continue;
 					}
 					
-					if (targetPlayer._inEvent)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventCTF)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventDM)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventTvT)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventVIP)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					
 					if (targetPlayer.isInStoreMode())
 					{
 						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
index 6ae8789803..1bd27fe082 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
@@ -22,10 +22,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
@@ -51,31 +47,10 @@ public class Escape implements IUserCommandHandler
 			return false;
 		}
 		
-		// Check to see if the current player is in TVT Event.
-		if (player._inEventTvT && TvT.isStarted())
+		// Check to see if the current player is in an event.
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You may not use an escape skill in TvT.");
-			return false;
-		}
-		
-		// Check to see if the current player is in CTF Event.
-		if (player._inEventCTF && CTF.isStarted())
-		{
-			player.sendMessage("You may not use an escape skill in CTF.");
-			return false;
-		}
-		
-		// Check to see if the current player is in DM Event.
-		if (player._inEventDM && DM.hasStarted())
-		{
-			player.sendMessage("You may not use an escape skill in DM.");
-			return false;
-		}
-		
-		// Check to see if the current player is in Vip Event.
-		if (player._inEventVIP && VIP._started)
-		{
-			player.sendMessage("You may not use an escape skill in VIP.");
+			player.sendMessage("You may not use an escape skill in an event.");
 			return false;
 		}
 		
@@ -93,13 +68,6 @@ public class Escape implements IUserCommandHandler
 			return false;
 		}
 		
-		// Check to see if the current player is in fun event.
-		if (player.isInFunEvent())
-		{
-			player.sendMessage("You may not escape from an event.");
-			return false;
-		}
-		
 		// Check to see if the current player is in Observer Mode.
 		if (player.inObserverMode())
 		{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
index d0d9aa68b9..642f015a5c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
@@ -57,9 +57,9 @@ public class OfflineShop implements IUserCommandHandler
 			return false;
 		}
 		
-		if (player.isInFunEvent() && !player.isGM())
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You cannot Logout while in registered in an Event.");
+			player.sendMessage("You cannot logout while registered in an event.");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
@@ -105,12 +105,6 @@ public class OfflineShop implements IUserCommandHandler
 			return false;
 		}
 		
-		if (player.atEvent)
-		{
-			player.sendPacket(SystemMessage.sendString("A superior power doesn't allow you to leave the event."));
-			return false;
-		}
-		
 		if (player.isInOlympiadMode() || Olympiad.getInstance().isRegistered(player))
 		{
 			player.sendMessage("You can't Logout in Olympiad mode.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java
deleted file mode 100644
index 3ad6717971..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class CTFCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"ctfjoin",
-		"ctfleave",
-		"ctfinfo"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		if (command.startsWith("ctfjoin"))
-		{
-			JoinCTF(activeChar);
-		}
-		else if (command.startsWith("ctfleave"))
-		{
-			LeaveCTF(activeChar);
-		}
-		
-		else if (command.startsWith("ctfinfo"))
-		{
-			CTFinfo(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	public boolean JoinCTF(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!CTF.isJoining())
-		{
-			activeChar.sendMessage("There is no CTF Event in progress.");
-			return false;
-		}
-		else if (CTF.isJoining() && activeChar._inEventCTF)
-		{
-			activeChar.sendMessage("You are already registered.");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
-			return false;
-		}
-		else if (activeChar.getLevel() < CTF.getMinLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
-			return false;
-		}
-		else if (activeChar.getLevel() > CTF.getMaxLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
-			return false;
-		}
-		else if (activeChar.getKarma() > 0)
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you have Karma.");
-			return false;
-		}
-		else if (CTF.isTeleport() || CTF.isStarted())
-		{
-			activeChar.sendMessage("CTF Event registration period is over. You can't register now.");
-			return false;
-		}
-		else
-		{
-			activeChar.sendMessage("Your participation in the CTF event has been approved.");
-			CTF.addPlayer(activeChar, "");
-			return true;
-		}
-	}
-	
-	public boolean LeaveCTF(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!CTF.isJoining())
-		{
-			activeChar.sendMessage("There is no CTF Event in progress.");
-			return false;
-		}
-		else if ((CTF.isTeleport() || CTF.isStarted()) && activeChar._inEventCTF)
-		{
-			activeChar.sendMessage("You can not leave now because CTF event has started.");
-			return false;
-		}
-		else if (CTF.isJoining() && !activeChar._inEventCTF)
-		{
-			activeChar.sendMessage("You aren't registered in the CTF Event.");
-			return false;
-		}
-		else
-		{
-			CTF.removePlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean CTFinfo(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!CTF.isJoining())
-		{
-			activeChar.sendMessage("There is no CTF Event in progress.");
-			return false;
-		}
-		else if (CTF.isTeleport() || CTF.isStarted())
-		{
-			activeChar.sendMessage("I can't provide you this info. Command available only in joining period.");
-			return false;
-		}
-		else
-		{
-			if (CTF._playersShuffle.size() == 1)
-			{
-				activeChar.sendMessage("There is " + CTF._playersShuffle.size() + " player participating in this event.");
-				activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + CTF.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLevel() + ".");
-			}
-			else
-			{
-				activeChar.sendMessage("There are " + CTF._playersShuffle.size() + " players participating in this event.");
-				activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + CTF.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLevel() + ".");
-			}
-			return true;
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java
deleted file mode 100644
index d70acda612..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class DMCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"dmjoin",
-		"dmleave",
-		"dminfo"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		if (command.startsWith("dmjoin"))
-		{
-			JoinDM(activeChar);
-		}
-		else if (command.startsWith("dmleave"))
-		{
-			LeaveDM(activeChar);
-		}
-		
-		else if (command.startsWith("dminfo"))
-		{
-			DMinfo(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	public boolean JoinDM(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!DM.isJoining())
-		{
-			activeChar.sendMessage("There is no DeathMatch Event in progress.");
-			return false;
-		}
-		else if (DM.isJoining() && activeChar._inEventDM)
-		{
-			activeChar.sendMessage("You are already registered.");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
-			return false;
-		}
-		else if (activeChar.getLevel() < DM.getMinLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
-			return false;
-		}
-		else if (activeChar.getLevel() > DM.getMaxLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
-			return false;
-		}
-		else if (activeChar.getKarma() > 0)
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you have Karma.");
-			return false;
-		}
-		else if (DM.isTeleport() || DM.hasStarted())
-		{
-			activeChar.sendMessage("DeathMatch Event registration period is over. You can't register now.");
-			return false;
-		}
-		else
-		{
-			activeChar.sendMessage("Your participation in the DeathMatch event has been approved.");
-			DM.addPlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean LeaveDM(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!DM.isJoining())
-		{
-			activeChar.sendMessage("There is no DeathMatch Event in progress.");
-			return false;
-		}
-		else if ((DM.isTeleport() || DM.hasStarted()) && activeChar._inEventDM)
-		{
-			activeChar.sendMessage("You can not leave now because DeathMatch event has started.");
-			return false;
-		}
-		else if (DM.isJoining() && !activeChar._inEventDM)
-		{
-			activeChar.sendMessage("You aren't registered in the DeathMatch Event.");
-			return false;
-		}
-		else
-		{
-			DM.removePlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean DMinfo(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!DM.isJoining())
-		{
-			activeChar.sendMessage("There is no DeathMatch Event in progress.");
-			return false;
-		}
-		else if (DM.isTeleport() || DM.hasStarted())
-		{
-			activeChar.sendMessage("I can't provide you this info. Command available only in joining period.");
-			return false;
-		}
-		else
-		{
-			if (DM._players.size() == 1)
-			{
-				activeChar.sendMessage("There is " + DM._players.size() + " player participating in this event.");
-				activeChar.sendMessage("Reward: " + DM.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(DM.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + DM.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + DM.getMaxLevel() + ".");
-			}
-			else
-			{
-				activeChar.sendMessage("There are " + DM._players.size() + " players participating in this event.");
-				activeChar.sendMessage("Reward: " + DM.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(DM.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + DM.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + DM.getMaxLevel() + ".");
-			}
-			return true;
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java
deleted file mode 100644
index 76a57f84a1..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-
-public class FarmPvpCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"farm1",
-		"farm2",
-		"pvp1",
-		"pvp2"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		int placex;
-		int placey;
-		int placez;
-		String message;
-		if (command.equalsIgnoreCase("farm1") && Config.ALLOW_FARM1_COMMAND)
-		{
-			placex = Config.FARM1_X;
-			placey = Config.FARM1_Y;
-			placez = Config.FARM1_Z;
-			message = Config.FARM1_CUSTOM_MESSAGE;
-		}
-		else if (command.equalsIgnoreCase("farm2") && Config.ALLOW_FARM2_COMMAND)
-		{
-			placex = Config.FARM2_X;
-			placey = Config.FARM2_Y;
-			placez = Config.FARM2_Z;
-			message = Config.FARM2_CUSTOM_MESSAGE;
-		}
-		else if (command.equalsIgnoreCase("pvp1") && Config.ALLOW_PVP1_COMMAND)
-		{
-			placex = Config.PVP1_X;
-			placey = Config.PVP1_Y;
-			placez = Config.PVP1_Z;
-			message = Config.PVP1_CUSTOM_MESSAGE;
-		}
-		else if (command.equalsIgnoreCase("pvp2") && Config.ALLOW_PVP2_COMMAND)
-		{
-			placex = Config.PVP2_X;
-			placey = Config.PVP2_Y;
-			placez = Config.PVP2_Z;
-			message = Config.PVP2_CUSTOM_MESSAGE;
-		}
-		else
-		{
-			return false;
-		}
-		
-		if (activeChar.isInJail())
-		{
-			activeChar.sendMessage("Sorry, you are in Jail!");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("Sorry, you are in the Olympiad now.");
-			return false;
-		}
-		else if (activeChar.isInFunEvent())
-		{
-			activeChar.sendMessage("Sorry, you are in an event.");
-			return false;
-		}
-		else if (activeChar.inObserverMode())
-		{
-			activeChar.sendMessage("Sorry, you are in the observation mode.");
-			return false;
-		}
-		else if (activeChar.isFestivalParticipant())
-		{
-			activeChar.sendMessage("Sorry, you are in a festival.");
-			return false;
-		}
-		else if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_GK && (activeChar.getKarma() > 0))
-		{
-			activeChar.sendMessage("Sorry, you are PK");
-			return false;
-		}
-		else if (Olympiad.getInstance().isRegistered(activeChar))
-		{
-			activeChar.sendMessage("Sorry, you can't use this command while registered in Olympiad");
-			return false;
-		}
-		activeChar.sendPacket(new SetupGauge(SetupGauge.BLUE, 15000));
-		activeChar.setImmobilized(true);
-		
-		ThreadPool.schedule(new teleportTask(activeChar, placex, placey, placez, message), 15000);
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	class teleportTask implements Runnable
-	{
-		private final PlayerInstance _player;
-		private final int _x;
-		private final int _y;
-		private final int _z;
-		private final String _message;
-		
-		teleportTask(PlayerInstance activeChar, int x, int y, int z, String message)
-		{
-			_player = activeChar;
-			_x = x;
-			_y = y;
-			_z = z;
-			_message = message;
-		}
-		
-		@Override
-		public void run()
-		{
-			if (_player == null)
-			{
-				return;
-			}
-			
-			_player.teleToLocation(_x, _y, _z);
-			_player.sendMessage(_message);
-			_player.setImmobilized(false);
-		}
-	}
-}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
index 8fd38829bd..c45a71203b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
@@ -58,9 +58,9 @@ public class OfflineShop implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (player.isInFunEvent() && !player.isGM())
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You cannot Logout while in registered in an Event.");
+			player.sendMessage("You cannot Logout while registered in an event.");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
@@ -106,12 +106,6 @@ public class OfflineShop implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (player.atEvent)
-		{
-			player.sendPacket(SystemMessage.sendString("A superior power doesn't allow you to leave the event."));
-			return false;
-		}
-		
 		if (player.isInOlympiadMode() || Olympiad.getInstance().isRegistered(player))
 		{
 			player.sendMessage("You can't Logout in Olympiad mode.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java
index 8100a3eaed..5d680d5d09 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java
@@ -139,12 +139,10 @@ public class StatsCmd implements IVoicedCommandHandler
 					final StringBuilder replyMSG = new StringBuilder("<html><body>");
 					replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
 					replyMSG.append("<br>Statistics for player <font color=\"LEVEL\">" + targetp.getName() + "</font><br>");
-					replyMSG.append("Total kills <font color=\"FF0000\">" + targetp.kills.size() + "</font><br>");
+					replyMSG.append("Total kills <font color=\"FF0000\">" + (targetp.getPvpKills() + targetp.getPkKills()) + "</font><br>");
 					replyMSG.append("<br>Detailed list:<br>");
-					for (String kill : targetp.kills)
-					{
-						replyMSG.append("<font color=\"FF0000\">" + kill + "</font><br>");
-					}
+					replyMSG.append("<font color=\"FF0000\">PvP Kills: " + targetp.getPvpKills() + "</font><br>");
+					replyMSG.append("<font color=\"FF0000\">PK Kills: " + targetp.getPkKills() + "</font><br>");
 					replyMSG.append("</body></html>");
 					adminReply.setHtml(replyMSG.toString());
 					activeChar.sendPacket(adminReply);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java
deleted file mode 100644
index a446ded8b1..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class TvTCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"tvtjoin",
-		"tvtleave",
-		"tvtinfo"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		if (command.startsWith("tvtjoin"))
-		{
-			JoinTvT(activeChar);
-		}
-		else if (command.startsWith("tvtleave"))
-		{
-			LeaveTvT(activeChar);
-		}
-		
-		else if (command.startsWith("tvtinfo"))
-		{
-			TvTinfo(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	public boolean JoinTvT(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!TvT.isJoining())
-		{
-			activeChar.sendMessage("There is no TvT Event in progress.");
-			return false;
-		}
-		else if (TvT.isJoining() && activeChar._inEventTvT)
-		{
-			activeChar.sendMessage("You are already registered.");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
-			return false;
-		}
-		else if (activeChar.getLevel() < TvT.getMinLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
-			return false;
-		}
-		else if (activeChar.getLevel() > TvT.getMaxLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
-			return false;
-		}
-		else if (activeChar.getKarma() > 0)
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you have Karma.");
-			return false;
-		}
-		else if (TvT.isTeleport() || TvT.isStarted())
-		{
-			activeChar.sendMessage("TvT Event registration period is over. You can't register now.");
-			return false;
-		}
-		else
-		{
-			activeChar.sendMessage("Your participation in the TvT event has been approved.");
-			TvT.addPlayer(activeChar, "");
-			return false;
-		}
-	}
-	
-	public boolean LeaveTvT(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!TvT.isJoining())
-		{
-			activeChar.sendMessage("There is no TvT Event in progress.");
-			return false;
-		}
-		else if ((TvT.isTeleport() || TvT.isStarted()) && activeChar._inEventTvT)
-		{
-			activeChar.sendMessage("You can not leave now because TvT event has started.");
-			return false;
-		}
-		else if (TvT.isJoining() && !activeChar._inEventTvT)
-		{
-			activeChar.sendMessage("You aren't registered in the TvT Event.");
-			return false;
-		}
-		else
-		{
-			TvT.removePlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean TvTinfo(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!TvT.isJoining())
-		{
-			activeChar.sendMessage("There is no TvT Event in progress.");
-			return false;
-		}
-		else if (TvT.isTeleport() || TvT.isStarted())
-		{
-			activeChar.sendMessage("I can't provide you this info. Command available only in joining period.");
-			return false;
-		}
-		else
-		{
-			if (TvT._playersShuffle.size() == 1)
-			{
-				activeChar.sendMessage("There is " + TvT._playersShuffle.size() + " player participating in this event.");
-				activeChar.sendMessage("Reward: " + TvT.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(TvT.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + TvT.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + TvT.getMaxLevel() + ".");
-			}
-			else
-			{
-				activeChar.sendMessage("There are " + TvT._playersShuffle.size() + " players participating in this event.");
-				activeChar.sendMessage("Reward: " + TvT.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(TvT.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + TvT.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + TvT.getMaxLevel() + ".");
-			}
-			return true;
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
index 5b247ba798..dc6ef9cccd 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
@@ -26,10 +26,6 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.CoupleManager;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -56,9 +52,9 @@ public class Wedding implements IVoicedCommandHandler
 	@Override
 	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
 	{
-		if (activeChar.isInFunEvent() || activeChar.isInOlympiadMode())
+		if (activeChar.isRegisteredOnCustomEvent() || activeChar.isInOlympiadMode())
 		{
-			activeChar.sendMessage("Sorry, you are in an event now.");
+			activeChar.sendMessage("Sorry, you have registered in an event.");
 			return false;
 		}
 		
@@ -230,10 +226,10 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		// Check to see if the current player is in fun event.
-		if (activeChar.isInFunEvent())
+		// Check to see if the current player is in an event.
+		if (activeChar.isOnCustomEvent())
 		{
-			activeChar.sendMessage("You're partener is in a Fun Event.");
+			activeChar.sendMessage("You are in an event.");
 			return false;
 		}
 		
@@ -267,7 +263,7 @@ public class Wedding implements IVoicedCommandHandler
 			activeChar.sendMessage("Your partner is in the Olympiad now.");
 			return false;
 		}
-		else if (partner.atEvent)
+		else if (partner.isOnCustomEvent())
 		{
 			activeChar.sendMessage("Your partner is in an event.");
 			return false;
@@ -307,31 +303,6 @@ public class Wedding implements IVoicedCommandHandler
 			activeChar.sendMessage("You are in the Olympiad now.");
 			return false;
 		}
-		else if (activeChar.atEvent)
-		{
-			activeChar.sendMessage("You are in an event.");
-			return false;
-		}
-		if (activeChar._inEventTvT && TvT.isStarted())
-		{
-			activeChar.sendMessage("You may not use go to love in TvT.");
-			return false;
-		}
-		if (activeChar._inEventCTF && CTF.isStarted())
-		{
-			activeChar.sendMessage("You may not use go to love in CTF.");
-			return false;
-		}
-		if (activeChar._inEventDM && DM.hasStarted())
-		{
-			activeChar.sendMessage("You may not use go to love in DM.");
-			return false;
-		}
-		if (activeChar._inEventVIP && VIP._started)
-		{
-			activeChar.sendMessage("You may not use go to love in VIP.");
-			return false;
-		}
 		else if (activeChar.inObserverMode())
 		{
 			activeChar.sendMessage("You are in the observation.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
index 809421a002..e7a30f5242 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
@@ -156,7 +156,7 @@ public class PrecautionaryRestartManager
 				return true;
 			}
 			
-			if (player._inEvent || player.atEvent)
+			if (player.isOnCustomEvent())
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java
deleted file mode 100644
index ff0bf44c27..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java
+++ /dev/null
@@ -1,3283 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SkillTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.Radar;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
-import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.ItemList;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.RadarControl;
-import org.l2jmobius.gameserver.network.serverpackets.Ride;
-import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
-
-public class CTF implements EventTask
-{
-	protected static final Logger LOGGER = Logger.getLogger(CTF.class.getName());
-	
-	protected static String _eventName = "";
-	protected static String _eventDesc = "";
-	protected static String _joiningLocationName = "";
-	private static Spawn _npcSpawn;
-	protected static boolean _joining = false;
-	protected static boolean _teleport = false;
-	protected static boolean _started = false;
-	protected static boolean _aborted = false;
-	protected static boolean _sitForced = false;
-	protected static boolean _inProgress = false;
-	protected static int _npcId = 0;
-	protected static int _npcX = 0;
-	protected static int _npcY = 0;
-	protected static int _npcZ = 0;
-	protected static int _npcHeading = 0;
-	protected static int _rewardId = 0;
-	protected static int _rewardAmount = 0;
-	protected static int _minLevel = 0;
-	protected static int _maxLevel = 0;
-	protected static int _joinTime = 0;
-	protected static int _eventTime = 0;
-	protected static int _minPlayers = 0;
-	protected static int _maxPlayers = 0;
-	protected static long _intervalBetweenMatches = 0;
-	private String startEventTime;
-	protected static boolean _teamEvent = true; // TODO to be integrated
-	public static List<PlayerInstance> _players = new ArrayList<>();
-	private static String _topTeam = "";
-	public static List<PlayerInstance> _playersShuffle = new ArrayList<>();
-	public static List<String> _teams = new ArrayList<>();
-	public static List<String> _savePlayers = new ArrayList<>();
-	public static List<String> _savePlayerTeams = new ArrayList<>();
-	public static List<Integer> _teamPlayersCount = new ArrayList<>();
-	public static List<Integer> _teamColors = new ArrayList<>();
-	public static List<Integer> _teamsX = new ArrayList<>();
-	public static List<Integer> _teamsY = new ArrayList<>();
-	public static List<Integer> _teamsZ = new ArrayList<>();
-	public static List<Integer> _teamPointsCount = new ArrayList<>();
-	public static int _topScore = 0;
-	public static int _eventCenterX = 0;
-	public static int _eventCenterY = 0;
-	public static int _eventCenterZ = 0;
-	public static int _eventOffset = 0;
-	private static int _FlagNPC = 35062;
-	private static int _FLAG_IN_HAND_ITEM_ID = 6718;
-	public static List<Integer> _flagIds = new ArrayList<>();
-	public static List<Integer> _flagsX = new ArrayList<>();
-	public static List<Integer> _flagsY = new ArrayList<>();
-	public static List<Integer> _flagsZ = new ArrayList<>();
-	public static List<Spawn> _flagSpawns = new ArrayList<>();
-	public static List<Spawn> _throneSpawns = new ArrayList<>();
-	public static List<Boolean> _flagsTaken = new ArrayList<>();
-	
-	/**
-	 * Instantiates a new cTF.
-	 */
-	private CTF()
-	{
-	}
-	
-	/**
-	 * Gets the new instance.
-	 * @return the new instance
-	 */
-	public static CTF getNewInstance()
-	{
-		return new CTF();
-	}
-	
-	/**
-	 * Gets the _event name.
-	 * @return the _eventName
-	 */
-	public static String getEventName()
-	{
-		return _eventName;
-	}
-	
-	/**
-	 * Set_event name.
-	 * @param eventName the _eventName to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventName(String eventName)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventName = eventName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event desc.
-	 * @return the _eventDesc
-	 */
-	public static String getEventDesc()
-	{
-		return _eventDesc;
-	}
-	
-	/**
-	 * Set_event desc.
-	 * @param eventDesc the _eventDesc to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventDesc(String eventDesc)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventDesc = eventDesc;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _joining location name.
-	 * @return the _joiningLocationName
-	 */
-	public static String getJoiningLocationName()
-	{
-		return _joiningLocationName;
-	}
-	
-	/**
-	 * Set_joining location name.
-	 * @param joiningLocationName the _joiningLocationName to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoiningLocationName(String joiningLocationName)
-	{
-		if (!_inProgress)
-		{
-			CTF._joiningLocationName = joiningLocationName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc id.
-	 * @return the _npcId
-	 */
-	public static int getNpcId()
-	{
-		return _npcId;
-	}
-	
-	/**
-	 * Set_npc id.
-	 * @param npcId the _npcId to set
-	 * @return true, if successful
-	 */
-	public static boolean setNpcId(int npcId)
-	{
-		if (!_inProgress)
-		{
-			CTF._npcId = npcId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc location.
-	 * @return the _npc location
-	 */
-	public static Location getNpcLocation()
-	{
-		return new Location(_npcX, _npcY, _npcZ, _npcHeading);
-	}
-	
-	/**
-	 * Gets the _reward id.
-	 * @return the _rewardId
-	 */
-	public static int getRewardId()
-	{
-		return _rewardId;
-	}
-	
-	/**
-	 * Set_reward id.
-	 * @param rewardId the _rewardId to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardId(int rewardId)
-	{
-		if (!_inProgress)
-		{
-			CTF._rewardId = rewardId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _reward amount.
-	 * @return the _rewardAmount
-	 */
-	public static int getRewardAmount()
-	{
-		return _rewardAmount;
-	}
-	
-	/**
-	 * Set_reward amount.
-	 * @param rewardAmount the _rewardAmount to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardAmount(int rewardAmount)
-	{
-		if (!_inProgress)
-		{
-			CTF._rewardAmount = rewardAmount;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _minLevel.
-	 * @return the _minLevel
-	 */
-	public static int getMinLevel()
-	{
-		return _minLevel;
-	}
-	
-	/**
-	 * Set_minLevel.
-	 * @param minLevel the _minLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinLevel(int minLevel)
-	{
-		if (!_inProgress)
-		{
-			CTF._minLevel = minLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _maxLevel.
-	 * @return the _maxLevel
-	 */
-	public static int getMaxLevel()
-	{
-		return _maxLevel;
-	}
-	
-	/**
-	 * Set_maxLevel.
-	 * @param maxLevel the _maxLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxLevel(int maxLevel)
-	{
-		if (!_inProgress)
-		{
-			CTF._maxLevel = maxLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _join time.
-	 * @return the _joinTime
-	 */
-	public static int getJoinTime()
-	{
-		return _joinTime;
-	}
-	
-	/**
-	 * Set_join time.
-	 * @param joinTime the _joinTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoinTime(int joinTime)
-	{
-		if (!_inProgress)
-		{
-			CTF._joinTime = joinTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event time.
-	 * @return the _eventTime
-	 */
-	public static int getEventTime()
-	{
-		return _eventTime;
-	}
-	
-	/**
-	 * Set_event time.
-	 * @param eventTime the _eventTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventTime(int eventTime)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventTime = eventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _min players.
-	 * @return the _minPlayers
-	 */
-	public static int getMinPlayers()
-	{
-		return _minPlayers;
-	}
-	
-	/**
-	 * Set_min players.
-	 * @param minPlayers the _minPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinPlayers(int minPlayers)
-	{
-		if (!_inProgress)
-		{
-			CTF._minPlayers = minPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _max players.
-	 * @return the _maxPlayers
-	 */
-	public static int getMaxPlayers()
-	{
-		return _maxPlayers;
-	}
-	
-	/**
-	 * Set_max players.
-	 * @param maxPlayers the _maxPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxPlayers(int maxPlayers)
-	{
-		if (!_inProgress)
-		{
-			CTF._maxPlayers = maxPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _interval between matches.
-	 * @return the _intervalBetweenMatches
-	 */
-	public static long getIntervalBetweenMatches()
-	{
-		return _intervalBetweenMatches;
-	}
-	
-	/**
-	 * Set_interval between matches.
-	 * @param intervalBetweenMatches the _intervalBetweenMatches to set
-	 * @return true, if successful
-	 */
-	public static boolean setIntervalBetweenMatches(long intervalBetweenMatches)
-	{
-		if (!_inProgress)
-		{
-			CTF._intervalBetweenMatches = intervalBetweenMatches;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the start event time.
-	 * @return the startEventTime
-	 */
-	public String getStartEventTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the start event time.
-	 * @param startEventTime the startEventTime to set
-	 * @return true, if successful
-	 */
-	public boolean setStartEventTime(String startEventTime)
-	{
-		if (!_inProgress)
-		{
-			this.startEventTime = startEventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks if is _joining.
-	 * @return the _joining
-	 */
-	public static boolean isJoining()
-	{
-		return _joining;
-	}
-	
-	/**
-	 * Checks if is _teleport.
-	 * @return the _teleport
-	 */
-	public static boolean isTeleport()
-	{
-		return _teleport;
-	}
-	
-	/**
-	 * Checks if is _started.
-	 * @return the _started
-	 */
-	public static boolean isStarted()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Checks if is _aborted.
-	 * @return the _aborted
-	 */
-	public static boolean isAborted()
-	{
-		return _aborted;
-	}
-	
-	/**
-	 * Checks if is _sit forced.
-	 * @return the _sitForced
-	 */
-	public static boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	/**
-	 * Checks if is _in progress.
-	 * @return the _inProgress
-	 */
-	public static boolean isInProgress()
-	{
-		return _inProgress;
-	}
-	
-	/**
-	 * Check max level.
-	 * @param maxLevel the maxLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxLevel(int maxLevel)
-	{
-		return _minLevel < maxLevel;
-	}
-	
-	/**
-	 * Check min level.
-	 * @param minLevel the minLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMinLevel(int minLevel)
-	{
-		return _maxLevel > minLevel;
-	}
-	
-	/**
-	 * returns true if participated players is higher or equal then minimum needed players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMinPlayers(int players)
-	{
-		return _minPlayers <= players;
-	}
-	
-	/**
-	 * returns true if max players is higher or equal then participated players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxPlayers(int players)
-	{
-		return _maxPlayers > players;
-	}
-	
-	/**
-	 * Check start join ok.
-	 * @return true, if successful
-	 */
-	public static boolean checkStartJoinOk()
-	{
-		if (_started || _teleport || _joining || _eventName.equals("") || _joiningLocationName.equals("") || _eventDesc.equals("") || (_npcId == 0) || (_npcX == 0) || (_npcY == 0) || (_npcZ == 0) || (_rewardId == 0) || (_rewardAmount == 0))
-		{
-			return false;
-		}
-		
-		if (_teamEvent)
-		{
-			if (!checkStartJoinTeamInfo())
-			{
-				return false;
-			}
-		}
-		else if (!checkStartJoinPlayerInfo())
-		{
-			return false;
-		}
-		
-		if (!Config.ALLOW_EVENTS_DURING_OLY && Olympiad.getInstance().inCompPeriod())
-		{
-			return false;
-		}
-		
-		for (Castle castle : CastleManager.getInstance().getCastles())
-		{
-			if ((castle != null) && (castle.getSiege() != null) && castle.getSiege().isInProgress())
-			{
-				return false;
-			}
-		}
-		
-		if (!checkOptionalEventStartJoinOk())
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Check start join team info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinTeamInfo()
-	{
-		return (_teams.size() >= 2) && !_teamsX.contains(0) && !_teamsY.contains(0) && !_teamsZ.contains(0);
-	}
-	
-	/**
-	 * Check start join player info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinPlayerInfo()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Check auto event start join ok.
-	 * @return true, if successful
-	 */
-	protected static boolean checkAutoEventStartJoinOk()
-	{
-		return (_joinTime != 0) && (_eventTime != 0);
-	}
-	
-	/**
-	 * Check optional event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkOptionalEventStartJoinOk()
-	{
-		try
-		{
-			if (_flagsX.contains(0) || _flagsY.contains(0) || _flagsZ.contains(0) || _flagIds.contains(0))
-			{
-				return false;
-			}
-			if ((_flagsX.size() < _teams.size()) || (_flagsY.size() < _teams.size()) || (_flagsZ.size() < _teams.size()) || (_flagIds.size() < _teams.size()))
-			{
-				return false;
-			}
-		}
-		catch (ArrayIndexOutOfBoundsException e)
-		{
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Sets the npc pos.
-	 * @param player the new npc pos
-	 */
-	public static void setNpcPos(PlayerInstance player)
-	{
-		_npcX = player.getX();
-		_npcY = player.getY();
-		_npcZ = player.getZ();
-		_npcHeading = player.getHeading();
-	}
-	
-	/**
-	 * Spawn event npc.
-	 */
-	private static void spawnEventNpc()
-	{
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_npcId);
-		
-		try
-		{
-			_npcSpawn = new Spawn(tmpl);
-			_npcSpawn.setX(_npcX);
-			_npcSpawn.setY(_npcY);
-			_npcSpawn.setZ(_npcZ);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(_npcHeading);
-			_npcSpawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_npcSpawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			_npcSpawn.getLastSpawn().setTitle(_eventName);
-			_npcSpawn.getLastSpawn()._isEventMobCTF = true;
-			_npcSpawn.getLastSpawn().isAggressive();
-			_npcSpawn.getLastSpawn().decayMe();
-			_npcSpawn.getLastSpawn().spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_npcSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_npcSpawn.getLastSpawn(), _npcSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[spawnEventNpc(exception: " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Unspawn event npc.
-	 */
-	private static void unspawnEventNpc()
-	{
-		if ((_npcSpawn == null) || (_npcSpawn.getLastSpawn() == null))
-		{
-			return;
-		}
-		
-		_npcSpawn.getLastSpawn().deleteMe();
-		_npcSpawn.stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_npcSpawn, true);
-	}
-	
-	/**
-	 * Start join.
-	 * @return true, if successful
-	 */
-	public static boolean startJoin()
-	{
-		if (!checkStartJoinOk())
-		{
-			return false;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		spawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Event " + _eventName + "!");
-		if (Config.CTF_ANNOUNCE_REWARD && (ItemTable.getInstance().getTemplate(_rewardId) != null))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
-		}
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + ".");
-		if (Config.CTF_COMMAND)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Commands .ctfjoin .ctfleave .ctfinfo!");
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Start teleport.
-	 * @return true, if successful
-	 */
-	public static boolean startTeleport()
-	{
-		if (!_joining || _started || _teleport)
-		{
-			return false;
-		}
-		
-		removeOfflinePlayers();
-		
-		if (_teamEvent)
-		{
-			if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && checkMinPlayers(_playersShuffle.size()))
-			{
-				shuffleTeams();
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && !checkMinPlayers(_playersShuffle.size()))
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-				if (Config.CTF_STATS_LOGGER)
-				{
-					LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-				}
-				
-				return false;
-			}
-		}
-		else if (!checkMinPlayers(_players.size()))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _players.size());
-			if (Config.CTF_STATS_LOGGER)
-			{
-				LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _players.size());
-			}
-			return false;
-		}
-		
-		_joining = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport to team spot in 20 seconds!");
-		setUserData();
-		ThreadPool.schedule(() ->
-		{
-			sit();
-			afterTeleportOperations();
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// Remove Summon's buffs
-						if (Config.CTF_ON_START_UNSUMMON_PET && (player.getPet() != null))
-						{
-							final Summon summon = player.getPet();
-							for (Effect e1 : summon.getAllEffects())
-							{
-								if (e1 != null)
-								{
-									e1.exit(true);
-								}
-							}
-							
-							if (summon instanceof PetInstance)
-							{
-								summon.unSummon(player);
-							}
-						}
-						
-						if (Config.CTF_ON_START_REMOVE_ALL_EFFECTS)
-						{
-							for (Effect e2 : player.getAllEffects())
-							{
-								if (e2 != null)
-								{
-									e2.exit(true);
-								}
-							}
-						}
-						
-						// Remove player from his party
-						if (player.getParty() != null)
-						{
-							final Party party = player.getParty();
-							party.removePartyMember(player);
-						}
-						
-						if (_teamEvent)
-						{
-							final int offset = Config.CTF_SPAWN_OFFSET;
-							player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsY.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsZ.get(_teams.indexOf(player._teamNameCTF)));
-						}
-					}
-				}
-			}
-		}, 20000);
-		_teleport = true;
-		return true;
-	}
-	
-	/**
-	 * After teleport operations.
-	 */
-	protected static void afterTeleportOperations()
-	{
-		spawnAllFlags();
-	}
-	
-	/**
-	 * Start event.
-	 * @return true, if successful
-	 */
-	public static boolean startEvent()
-	{
-		if (!startEventOk())
-		{
-			return false;
-		}
-		
-		_teleport = false;
-		sit();
-		
-		afterStartOperations();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Started. Go Capture the Flags!");
-		_started = true;
-		return true;
-	}
-	
-	/**
-	 * After start operations.
-	 */
-	private static void afterStartOperations()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					player._teamNameHaveFlagCTF = null;
-					player._haveFlagCTF = false;
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Restarts Event checks if event was aborted. and if true cancels restart task
-	 */
-	public static synchronized void restartEvent()
-	{
-		LOGGER.info(_eventName + ": Event has been restarted...");
-		_joining = false;
-		_started = false;
-		_inProgress = false;
-		_aborted = false;
-		final long delay = _intervalBetweenMatches;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": joining period will be avaible again in " + _intervalBetweenMatches + " minute(s)!");
-		waiter(delay);
-		
-		try
-		{
-			if (!_aborted)
-			{
-				autoEvent(); // start a new event
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": next event aborted!");
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + ": Error While Trying to restart Event... " + e);
-		}
-	}
-	
-	/**
-	 * Finish event.
-	 */
-	public static void finishEvent()
-	{
-		if (!finishEventOk())
-		{
-			return;
-		}
-		
-		_started = false;
-		_aborted = false;
-		unspawnEventNpc();
-		
-		afterFinishOperations();
-		
-		if (_teamEvent)
-		{
-			processTopTeam();
-			
-			if (_topScore != 0)
-			{
-				playKneelAnimation(_topTeam);
-				
-				if (Config.CTF_ANNOUNCE_TEAM_STATS)
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + " Team Statistics:");
-					for (String team : _teams)
-					{
-						final int _flags_ = teamPointsCount(team);
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Team: " + team + " - Flags taken: " + _flags_);
-					}
-				}
-				
-				if (_topTeam != null)
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Team " + _topTeam + " wins the match, with " + _topScore + " flags taken!");
-				}
-				else
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: " + _topScore + " flags taken by each team!");
-				}
-				rewardTeam(_topTeam);
-				
-				if (Config.CTF_STATS_LOGGER)
-				{
-					LOGGER.info("**** " + _eventName + " ****");
-					LOGGER.info(_eventName + " Team Statistics:");
-					for (String team : _teams)
-					{
-						final int _flags_ = teamPointsCount(team);
-						LOGGER.info("Team: " + team + " - Flags taken: " + _flags_);
-					}
-					
-					LOGGER.info(_eventName + ": Team " + _topTeam + " wins the match, with " + _topScore + " flags taken!");
-				}
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: No team wins the match(nobody took flags)!");
-				if (Config.CTF_STATS_LOGGER)
-				{
-					LOGGER.info(_eventName + ": No team win the match(nobody took flags).");
-				}
-				
-				rewardTeam(_topTeam);
-			}
-		}
-		else
-		{
-			processTopPlayer();
-		}
-		
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish operations.
-	 */
-	private static void afterFinishOperations()
-	{
-		unspawnAllFlags();
-	}
-	
-	/**
-	 * Abort event.
-	 */
-	public static void abortEvent()
-	{
-		if (!_joining && !_teleport && !_started)
-		{
-			return;
-		}
-		
-		if (_joining && !_teleport && !_started)
-		{
-			unspawnEventNpc();
-			cleanCTF();
-			_joining = false;
-			_inProgress = false;
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-			return;
-		}
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_aborted = true;
-		unspawnEventNpc();
-		
-		afterFinish();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish.
-	 */
-	private static void afterFinish()
-	{
-		unspawnAllFlags();
-	}
-	
-	/**
-	 * Teleport finish.
-	 */
-	public static void teleportFinish()
-	{
-		sit();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport back to participation NPC in 20 seconds!");
-		ThreadPool.schedule(() ->
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						if (player.isOnline())
-						{
-							player.teleToLocation(_npcX, _npcY, _npcZ);
-						}
-						else
-						{
-							try (Connection con = DatabaseFactory.getConnection())
-							{
-								final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=? WHERE char_name=?");
-								statement.setInt(1, _npcX);
-								statement.setInt(2, _npcY);
-								statement.setInt(3, _npcZ);
-								statement.setString(4, player.getName());
-								statement.execute();
-								statement.close();
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning(e.getMessage());
-							}
-						}
-					}
-				}
-			}
-			
-			sit();
-			cleanCTF();
-		}, 20000);
-	}
-	
-	protected static class AutoEventTask implements Runnable
-	{
-		@Override
-		public void run()
-		{
-			LOGGER.info("Starting " + _eventName + "!");
-			LOGGER.info("Matchs Are Restarted At Every: " + getIntervalBetweenMatchs() + " Minutes.");
-			if (checkAutoEventStartJoinOk() && startJoin() && !_aborted)
-			{
-				if (_joinTime > 0)
-				{
-					waiter(_joinTime * 60 * 1000); // minutes for join event
-				}
-				else if (_joinTime <= 0)
-				{
-					LOGGER.info(_eventName + ": join time <=0 aborting event.");
-					abortEvent();
-					return;
-				}
-				if (startTeleport() && !_aborted)
-				{
-					waiter(30 * 1000); // 30 sec wait time untill start fight after teleported
-					if (startEvent() && !_aborted)
-					{
-						LOGGER.warning(_eventName + ": waiting.....minutes for event time " + _eventTime);
-						waiter(_eventTime * 60 * 1000); // minutes for event time
-						finishEvent();
-						
-						LOGGER.info(_eventName + ": waiting... delay for final messages ");
-						waiter(60000); // just a give a delay delay for final messages
-						sendFinalMessages();
-						
-						if (!_started && !_aborted)
-						{ // if is not already started and it's not aborted
-							
-							LOGGER.info(_eventName + ": waiting.....delay for restart event  " + _intervalBetweenMatches + " minutes.");
-							waiter(60000); // just a give a delay to next restart
-							
-							try
-							{
-								if (!_aborted)
-								{
-									restartEvent();
-								}
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning("Error while tying to Restart Event " + e);
-							}
-						}
-					}
-				}
-				else if (!_aborted)
-				{
-					abortEvent();
-					restartEvent();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Auto event.
-	 */
-	public static void autoEvent()
-	{
-		ThreadPool.execute(new AutoEventTask());
-	}
-	
-	// start without restart
-	/**
-	 * Event once start.
-	 */
-	public static void eventOnceStart()
-	{
-		if (startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(1 * 60 * 1000); // 1 min wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Waiter.
-	 * @param interval the interval
-	 */
-	protected static void waiter(long interval)
-	{
-		final long startWaiterTime = Chronos.currentTimeMillis();
-		int seconds = (int) (interval / 1000);
-		
-		while (((startWaiterTime + interval) > Chronos.currentTimeMillis()) && !_aborted)
-		{
-			seconds--; // Here because we don't want to see two time announce at the same time
-			if (_joining || _started || _teleport)
-			{
-				switch (seconds)
-				{
-					case 3600: // 1 hour left
-					{
-						removeOfflinePlayers();
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till event finish!");
-						}
-						break;
-					}
-					case 1800: // 30 minutes left
-					case 900: // 15 minutes left
-					case 600: // 10 minutes left
-					case 300: // 5 minutes left
-					case 240: // 4 minutes left
-					case 180: // 3 minutes left
-					case 120: // 2 minutes left
-					case 60: // 1 minute left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till event finish!");
-						}
-						break;
-					}
-					case 30: // 30 seconds left
-					case 15: // 15 seconds left
-					case 10: // 10 seconds left
-					{
-						removeOfflinePlayers();
-						// fallthrou?
-					}
-					case 3: // 3 seconds left
-					case 2: // 2 seconds left
-					case 1: // 1 seconds left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till registration close!");
-						}
-						else if (_teleport)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " seconds(s) till start fight!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till event finish!");
-						}
-						break;
-					}
-				}
-			}
-			
-			final long startOneSecondWaiterStartTime = Chronos.currentTimeMillis();
-			
-			// Only the try catch with Thread.sleep(1000) give bad countdown on high wait times
-			while ((startOneSecondWaiterStartTime + 1000) > Chronos.currentTimeMillis())
-			{
-				try
-				{
-					Thread.sleep(1);
-				}
-				catch (InterruptedException ie)
-				{
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Sit.
-	 */
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (_sitForced)
-					{
-						player.stopMove(null, false);
-						player.abortAttack();
-						player.abortCast();
-						
-						if (!player.isSitting())
-						{
-							player.sitDown();
-						}
-					}
-					else if (player.isSitting())
-					{
-						player.standUp();
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Removes the offline players.
-	 */
-	public static void removeOfflinePlayers()
-	{
-		try
-		{
-			if ((_playersShuffle == null) || _playersShuffle.isEmpty())
-			{
-				return;
-			}
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player == null)
-				{
-					_playersShuffle.remove(player);
-				}
-				else if (!player.isOnline() || player.isInJail() || player.isInOfflineMode())
-				{
-					removePlayer(player);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-	}
-	
-	/**
-	 * Start event ok.
-	 * @return true, if successful
-	 */
-	private static boolean startEventOk()
-	{
-		if (_joining || !_teleport || _started)
-		{
-			return false;
-		}
-		
-		if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-		{
-			if (_teamPlayersCount.contains(0))
-			{
-				return false;
-			}
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			final List<PlayerInstance> playersShuffleTemp = new ArrayList<>();
-			int loopCount = 0;
-			loopCount = _playersShuffle.size();
-			for (int i = 0; i < loopCount; i++)
-			{
-				playersShuffleTemp.add(_playersShuffle.get(i));
-			}
-			
-			_playersShuffle = playersShuffleTemp;
-			playersShuffleTemp.clear();
-		}
-		return true;
-	}
-	
-	/**
-	 * Finish event ok.
-	 * @return true, if successful
-	 */
-	private static boolean finishEventOk()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Adds the player ok.
-	 * @param teamName the team name
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	private static boolean addPlayerOk(String teamName, PlayerInstance eventPlayer)
-	{
-		if (eventPlayer.isAio() && !Config.ALLOW_AIO_IN_EVENTS)
-		{
-			eventPlayer.sendMessage("AIO charactes are not allowed to participate in events :/");
-		}
-		if (checkShufflePlayers(eventPlayer) || eventPlayer._inEventCTF)
-		{
-			eventPlayer.sendMessage("You already participated in the event!");
-			return false;
-		}
-		
-		if (eventPlayer._inEventTvT || eventPlayer._inEventDM)
-		{
-			eventPlayer.sendMessage("You already participated in another event!");
-			return false;
-		}
-		
-		if (Olympiad.getInstance().isRegistered(eventPlayer) || eventPlayer.isInOlympiadMode())
-		{
-			eventPlayer.sendMessage("You already participated in Olympiad!");
-			return false;
-		}
-		
-		if ((eventPlayer._activeBoxes > 1) && !Config.ALLOW_DUALBOX_EVENT)
-		{
-			final List<String> playerBoxes = eventPlayer._activeBoxCharacters;
-			if ((playerBoxes != null) && (playerBoxes.size() > 1))
-			{
-				for (String characterName : playerBoxes)
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(characterName);
-					if ((player != null) && player._inEventCTF)
-					{
-						eventPlayer.sendMessage("You already participated in event with another char!");
-						return false;
-					}
-				}
-			}
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-				else if (player.getName().equalsIgnoreCase(eventPlayer.getName()))
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-			}
-			
-			if (_players.contains(eventPlayer))
-			{
-				eventPlayer.sendMessage("You already participated in the event!");
-				return false;
-			}
-		}
-		
-		if (_savePlayers.contains(eventPlayer.getName()))
-		{
-			eventPlayer.sendMessage("You already participated in another event!");
-			return false;
-		}
-		
-		if (Config.CTF_EVEN_TEAMS.equals("NO"))
-		{
-			return true;
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-		{
-			boolean allTeamsEqual = true;
-			int countBefore = -1;
-			for (int playersCount : _teamPlayersCount)
-			{
-				if (countBefore == -1)
-				{
-					countBefore = playersCount;
-				}
-				
-				if (countBefore != playersCount)
-				{
-					allTeamsEqual = false;
-					break;
-				}
-				
-				countBefore = playersCount;
-			}
-			
-			if (allTeamsEqual)
-			{
-				return true;
-			}
-			
-			countBefore = Integer.MAX_VALUE;
-			for (int teamPlayerCount : _teamPlayersCount)
-			{
-				if (teamPlayerCount < countBefore)
-				{
-					countBefore = teamPlayerCount;
-				}
-			}
-			
-			final List<String> joinableTeams = new ArrayList<>();
-			for (String team : _teams)
-			{
-				if (teamPlayersCount(team) == countBefore)
-				{
-					joinableTeams.add(team);
-				}
-			}
-			
-			if (joinableTeams.contains(teamName))
-			{
-				return true;
-			}
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			return true;
-		}
-		
-		eventPlayer.sendMessage("Too many players in team \"" + teamName + "\"");
-		return false;
-	}
-	
-	/**
-	 * Sets the user data.
-	 */
-	public static void setUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player._originalNameColorCTF = player.getAppearance().getNameColor();
-				player._originalKarmaCTF = player.getKarma();
-				player._originalTitleCTF = player.getTitle();
-				player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameCTF)));
-				player.setKarma(0);
-				if (Config.CTF_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(_teams.indexOf(player._teamNameCTF) + 1);
-				}
-				
-				if (player.isMounted() && player.setMountType(0))
-				{
-					if (player.isFlying())
-					{
-						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
-					}
-					
-					player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
-					player.setMountObjectID(0);
-				}
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * Dump data.
-	 */
-	public static void dumpData()
-	{
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		if (!_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (INACTIVE) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (JOINING) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		else if (!_joining && _teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (TELEPORT) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (!_joining && !_teleport && _started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (STARTED) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		
-		LOGGER.info("Name: " + _eventName);
-		LOGGER.info("Desc: " + _eventDesc);
-		LOGGER.info("Join location: " + _joiningLocationName);
-		LOGGER.info("Min lvl: " + _minLevel);
-		LOGGER.info("Max lvl: " + _maxLevel);
-		LOGGER.info("");
-		LOGGER.info("##########################");
-		LOGGER.info("# _teams(List<String>) #");
-		LOGGER.info("##########################");
-		
-		for (String team : _teams)
-		{
-			LOGGER.info(team + " Flags Taken :" + _teamPointsCount.get(_teams.indexOf(team)));
-		}
-		
-		if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			LOGGER.info("");
-			LOGGER.info("#########################################");
-			LOGGER.info("# _playersShuffle(List<PlayerInstance>) #");
-			LOGGER.info("#########################################");
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName());
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("##################################");
-		LOGGER.info("# _players(List<PlayerInstance>) #");
-		LOGGER.info("##################################");
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName() + "   Team: " + player._teamNameCTF + "  Flags :" + player._countCTFflags);
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("#####################################################################");
-		LOGGER.info("# _savePlayers(List<String>) and _savePlayerTeams(List<String>) #");
-		LOGGER.info("#####################################################################");
-		
-		for (String player : _savePlayers)
-		{
-			LOGGER.info("Name: " + player + "	Team: " + _savePlayerTeams.get(_savePlayers.indexOf(player)));
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		dumpLocalEventInfo();
-	}
-	
-	/**
-	 * Dump local event info.
-	 */
-	private static void dumpLocalEventInfo()
-	{
-		LOGGER.info("**********==CTF==************");
-		LOGGER.info("CTF._teamPointsCount:" + _teamPointsCount);
-		LOGGER.info("CTF._flagIds:" + _flagIds);
-		LOGGER.info("CTF._flagSpawns:" + _flagSpawns);
-		LOGGER.info("CTF._throneSpawns:" + _throneSpawns);
-		LOGGER.info("CTF._flagsTaken:" + _flagsTaken);
-		LOGGER.info("CTF._flagsX:" + _flagsX);
-		LOGGER.info("CTF._flagsY:" + _flagsY);
-		LOGGER.info("CTF._flagsZ:" + _flagsZ);
-		LOGGER.info("************EOF**************\n");
-		LOGGER.info("");
-	}
-	
-	/**
-	 * Load data.
-	 */
-	public static void loadData()
-	{
-		_eventName = "";
-		_eventDesc = "";
-		_joiningLocationName = "";
-		_savePlayers = new ArrayList<>();
-		synchronized (_players)
-		{
-			_players = new ArrayList<>();
-		}
-		
-		_topTeam = "";
-		_teams = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_playersShuffle = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamColors = new ArrayList<>();
-		_teamsX = new ArrayList<>();
-		_teamsY = new ArrayList<>();
-		_teamsZ = new ArrayList<>();
-		_throneSpawns = new ArrayList<>();
-		_flagSpawns = new ArrayList<>();
-		_flagsTaken = new ArrayList<>();
-		_flagIds = new ArrayList<>();
-		_flagsX = new ArrayList<>();
-		_flagsY = new ArrayList<>();
-		_flagsZ = new ArrayList<>();
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_sitForced = false;
-		_aborted = false;
-		_inProgress = false;
-		_npcId = 0;
-		_npcX = 0;
-		_npcY = 0;
-		_npcZ = 0;
-		_npcHeading = 0;
-		_rewardId = 0;
-		_rewardAmount = 0;
-		_topScore = 0;
-		_minLevel = 0;
-		_maxLevel = 0;
-		_joinTime = 0;
-		_eventTime = 0;
-		_minPlayers = 0;
-		_maxPlayers = 0;
-		_intervalBetweenMatches = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			ResultSet rs;
-			statement = con.prepareStatement("Select * from ctf");
-			rs = statement.executeQuery();
-			int teams = 0;
-			
-			while (rs.next())
-			{
-				_eventName = rs.getString("eventName");
-				_eventDesc = rs.getString("eventDesc");
-				_joiningLocationName = rs.getString("joiningLocation");
-				_minLevel = rs.getInt("minLevel");
-				_maxLevel = rs.getInt("maxLevel");
-				_npcId = rs.getInt("npcId");
-				_npcX = rs.getInt("npcX");
-				_npcY = rs.getInt("npcY");
-				_npcZ = rs.getInt("npcZ");
-				_npcHeading = rs.getInt("npcHeading");
-				_rewardId = rs.getInt("rewardId");
-				_rewardAmount = rs.getInt("rewardAmount");
-				teams = rs.getInt("teamsCount");
-				_joinTime = rs.getInt("joinTime");
-				_eventTime = rs.getInt("eventTime");
-				_minPlayers = rs.getInt("minPlayers");
-				_maxPlayers = rs.getInt("maxPlayers");
-				_intervalBetweenMatches = rs.getLong("delayForNextEvent");
-			}
-			statement.close();
-			
-			int index = -1;
-			if (teams > 0)
-			{
-				index = 0;
-			}
-			while ((index < teams) && (index > -1))
-			{
-				statement = con.prepareStatement("Select * from ctf_teams where teamId = ?");
-				statement.setInt(1, index);
-				rs = statement.executeQuery();
-				while (rs.next())
-				{
-					_teams.add(rs.getString("teamName"));
-					_teamPlayersCount.add(0);
-					_teamPointsCount.add(0);
-					_teamColors.add(0);
-					_teamsX.add(0);
-					_teamsY.add(0);
-					_teamsZ.add(0);
-					_teamsX.set(index, rs.getInt("teamX"));
-					_teamsY.set(index, rs.getInt("teamY"));
-					_teamsZ.set(index, rs.getInt("teamZ"));
-					_teamColors.set(index, rs.getInt("teamColor"));
-					_flagsX.add(0);
-					_flagsY.add(0);
-					_flagsZ.add(0);
-					_flagsX.set(index, rs.getInt("flagX"));
-					_flagsY.set(index, rs.getInt("flagY"));
-					_flagsZ.set(index, rs.getInt("flagZ"));
-					_flagSpawns.add(null);
-					_flagIds.add(_FlagNPC);
-					_flagsTaken.add(false);
-				}
-				index++;
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: loadData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Save data.
-	 */
-	public static void saveData()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			statement = con.prepareStatement("Delete from ctf");
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("INSERT INTO ctf (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-			statement.setString(1, _eventName);
-			statement.setString(2, _eventDesc);
-			statement.setString(3, _joiningLocationName);
-			statement.setInt(4, _minLevel);
-			statement.setInt(5, _maxLevel);
-			statement.setInt(6, _npcId);
-			statement.setInt(7, _npcX);
-			statement.setInt(8, _npcY);
-			statement.setInt(9, _npcZ);
-			statement.setInt(10, _npcHeading);
-			statement.setInt(11, _rewardId);
-			statement.setInt(12, _rewardAmount);
-			statement.setInt(13, _teams.size());
-			statement.setInt(14, _joinTime);
-			statement.setInt(15, _eventTime);
-			statement.setInt(16, _minPlayers);
-			statement.setInt(17, _maxPlayers);
-			statement.setLong(18, _intervalBetweenMatches);
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("Delete from ctf_teams");
-			statement.execute();
-			statement.close();
-			
-			for (String teamName : _teams)
-			{
-				final int index = _teams.indexOf(teamName);
-				if (index == -1)
-				{
-					return;
-				}
-				statement = con.prepareStatement("INSERT INTO ctf_teams (teamId ,teamName, teamX, teamY, teamZ, teamColor, flagX, flagY, flagZ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
-				statement.setInt(1, index);
-				statement.setString(2, teamName);
-				statement.setInt(3, _teamsX.get(index));
-				statement.setInt(4, _teamsY.get(index));
-				statement.setInt(5, _teamsZ.get(index));
-				statement.setInt(6, _teamColors.get(index));
-				statement.setInt(7, _flagsX.get(index));
-				statement.setInt(8, _flagsY.get(index));
-				statement.setInt(9, _flagsZ.get(index));
-				statement.execute();
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: saveData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Show event html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 */
-	public static void showEventHtml(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><title>" + _eventName + "</title><body>");
-			replyMSG.append("<center><img src=\"L2UI_CH3.herotower_deco\" width=256 height=32></center><br1>");
-			replyMSG.append("<center><font color=\"3366CC\">Current event:</font></center><br1>");
-			replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
-			replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
-			if (!_started && !_joining)
-			{
-				replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && !checkMaxPlayers(_playersShuffle.size()))
-			{
-				if (!_started)
-				{
-					replyMSG.append("Currently participated: <font color=\"00FF00\">" + _playersShuffle.size() + ".</font><br>");
-					replyMSG.append("Max players: <font color=\"00FF00\">" + _maxPlayers + "</font><br><br>");
-					replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-				}
-			}
-			else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
-			{
-				synchronized (_players)
-				{
-					if (_players.contains(eventPlayer) || _playersShuffle.contains(eventPlayer) || checkShufflePlayers(eventPlayer))
-					{
-						if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("You participated already in team <font color=\"LEVEL\">" + eventPlayer._teamNameCTF + "</font><br><br>");
-						}
-						else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center><font color=\"3366CC\">You participated already!</font></center><br><br>");
-						}
-						
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _playersShuffle.size() + "</font></center><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Wait till event start or remove your participation!</font><center>");
-						replyMSG.append("<center><button value=\"Remove\" action=\"bypass -h npc_" + objectId + "_ctf_player_leave\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-					}
-					else
-					{
-						replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
-						replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
-						replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Teams:</font></center><br>");
-						if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("<center><table border=\"0\">");
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font>&nbsp;(" + teamPlayersCount(team) + " joined)</td>");
-								replyMSG.append("<center><td width=\"60\"><button value=\"Join\" action=\"bypass -h npc_" + objectId + "_ctf_player_join " + team + "\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center></td></tr>");
-							}
-							replyMSG.append("</table></center>");
-						}
-						else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center>");
-							
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font> &nbsp;</td>");
-							}
-							
-							replyMSG.append("</center><br>");
-							
-							replyMSG.append("<center><button value=\"Join Event\" action=\"bypass -h npc_" + objectId + "_ctf_player_join eventShuffle\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-							replyMSG.append("<center><font color=\"3366CC\">Teams will be reandomly generated!</font></center><br>");
-							replyMSG.append("<center>Joined Players:</font> <font color=\"LEVEL\">" + _playersShuffle.size() + "</center></font><br>");
-							replyMSG.append("<center>Reward: <font color=\"LEVEL\">" + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName() + "</center></font>");
-						}
-					}
-				}
-			}
-			else if (_started && !_joining)
-			{
-				replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
-			}
-			else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
-			{
-				replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
-				replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
-				replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
-				replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			eventPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Adds the player.
-	 * @param player the player
-	 * @param teamName the team name
-	 */
-	public static void addPlayer(PlayerInstance player, String teamName)
-	{
-		if (!addPlayerOk(teamName, player))
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-			{
-				player._teamNameCTF = teamName;
-				_players.add(player);
-				setTeamPlayersCount(teamName, teamPlayersCount(teamName) + 1);
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				_playersShuffle.add(player);
-			}
-		}
-		
-		player._inEventCTF = true;
-		player._countCTFflags = 0;
-		player.sendMessage(_eventName + ": You successfully registered for the event.");
-	}
-	
-	/**
-	 * Removes the player.
-	 * @param player the player
-	 */
-	public static void removePlayer(PlayerInstance player)
-	{
-		if (player._inEventCTF)
-		{
-			if (!_joining)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorCTF);
-				player.setTitle(player._originalTitleCTF);
-				player.setKarma(player._originalKarmaCTF);
-				if (Config.CTF_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(0); // clear aura :P
-				}
-				player.broadcastUserInfo();
-			}
-			
-			// after remove, all event data must be cleaned in player
-			player._originalNameColorCTF = 0;
-			player._originalTitleCTF = null;
-			player._originalKarmaCTF = 0;
-			player._teamNameCTF = "";
-			player._countCTFflags = 0;
-			player._inEventCTF = false;
-			
-			synchronized (_players)
-			{
-				if ((Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE")) && _players.contains(player))
-				{
-					setTeamPlayersCount(player._teamNameCTF, teamPlayersCount(player._teamNameCTF) - 1);
-					_players.remove(player);
-				}
-				else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && (!_playersShuffle.isEmpty() && _playersShuffle.contains(player)))
-				{
-					_playersShuffle.remove(player);
-				}
-			}
-			
-			player.sendMessage("Your participation in the CTF event has been removed.");
-		}
-	}
-	
-	/**
-	 * Clean ctf.
-	 */
-	public static void cleanCTF()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					cleanEventPlayer(player);
-					
-					removePlayer(player);
-					if (_savePlayers.contains(player.getName()))
-					{
-						_savePlayers.remove(player.getName());
-					}
-					player._inEventCTF = false;
-				}
-			}
-		}
-		
-		if ((_playersShuffle != null) && !_playersShuffle.isEmpty())
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					player._inEventCTF = false;
-				}
-			}
-		}
-		
-		_topScore = 0;
-		_topTeam = "";
-		synchronized (_players)
-		{
-			_players = new ArrayList<>();
-		}
-		
-		_playersShuffle = new ArrayList<>();
-		_savePlayers = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		cleanLocalEventInfo();
-		
-		_inProgress = false;
-		loadData();
-	}
-	
-	/**
-	 * Clean local event info.
-	 */
-	private static void cleanLocalEventInfo()
-	{
-		_flagSpawns = new ArrayList<>();
-		_flagsTaken = new ArrayList<>();
-	}
-	
-	/**
-	 * Clean event player.
-	 * @param player the player
-	 */
-	private static void cleanEventPlayer(PlayerInstance player)
-	{
-		if (player._haveFlagCTF)
-		{
-			removeFlagFromPlayer(player);
-		}
-		else
-		{
-			player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
-		}
-		player._haveFlagCTF = false;
-	}
-	
-	/**
-	 * Adds the disconnected player.
-	 * @param player the player
-	 */
-	public static synchronized void addDisconnectedPlayer(PlayerInstance player)
-	{
-		if ((Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && (_teleport || _started)) || (Config.CTF_EVEN_TEAMS.equals("NO") || (Config.CTF_EVEN_TEAMS.equals("BALANCE") && (_teleport || _started))))
-		{
-			if (Config.CTF_ON_START_REMOVE_ALL_EFFECTS)
-			{
-				player.stopAllEffects();
-			}
-			
-			player._teamNameCTF = _savePlayerTeams.get(_savePlayers.indexOf(player.getName()));
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance p : _players)
-				{
-					// check by name incase player got new objectId
-					if ((p != null) && p.getName().equals(player.getName()))
-					{
-						player._originalNameColorCTF = player.getAppearance().getNameColor();
-						player._originalTitleCTF = player.getTitle();
-						player._originalKarmaCTF = player.getKarma();
-						player._inEventCTF = true;
-						player._countCTFflags = p._countCTFflags;
-						_players.remove(p); // removing old object id from vector
-						_players.add(player); // adding new objectId to vector
-						break;
-					}
-				}
-			}
-			
-			player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameCTF)));
-			player.setKarma(0);
-			if (Config.CTF_AURA && (_teams.size() >= 2))
-			{
-				player.setTeam(_teams.indexOf(player._teamNameCTF) + 1);
-			}
-			player.broadcastUserInfo();
-			
-			final int offset = Config.CTF_SPAWN_OFFSET;
-			player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsY.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsZ.get(_teams.indexOf(player._teamNameCTF)));
-			afterAddDisconnectedPlayerOperations(player);
-		}
-	}
-	
-	/**
-	 * After add disconnected player operations.
-	 * @param player the player
-	 */
-	private static void afterAddDisconnectedPlayerOperations(PlayerInstance player)
-	{
-		player._teamNameHaveFlagCTF = null;
-		player._haveFlagCTF = false;
-		checkRestoreFlags();
-	}
-	
-	/**
-	 * Shuffle teams.
-	 */
-	public static void shuffleTeams()
-	{
-		int teamCount = 0;
-		int playersCount = 0;
-		
-		synchronized (_players)
-		{
-			for (;;)
-			{
-				if (_playersShuffle.isEmpty())
-				{
-					break;
-				}
-				
-				final int playerToAddIndex = Rnd.get(_playersShuffle.size());
-				PlayerInstance player = null;
-				player = _playersShuffle.get(playerToAddIndex);
-				_players.add(player);
-				_players.get(playersCount)._teamNameCTF = _teams.get(teamCount);
-				_savePlayers.add(_players.get(playersCount).getName());
-				_savePlayerTeams.add(_teams.get(teamCount));
-				playersCount++;
-				
-				if (teamCount == (_teams.size() - 1))
-				{
-					teamCount = 0;
-				}
-				else
-				{
-					teamCount++;
-				}
-				
-				_playersShuffle.remove(playerToAddIndex);
-			}
-		}
-	}
-	
-	/**
-	 * Play kneel animation.
-	 * @param teamName the team name
-	 */
-	public static void playKneelAnimation(String teamName)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (!player._teamNameCTF.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 7));
-					}
-					else if (player._teamNameCTF.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 3));
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Reward team.
-	 * @param teamName the team name
-	 */
-	public static void rewardTeam(String teamName)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if ((player != null) && player.isOnline() && (player._inEventCTF))
-				{
-					if ((teamName != null) && (player._teamNameCTF.equals(teamName)))
-					{
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, _rewardAmount, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team wins the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-					else if (teamName == null)
-					{
-						int minusReward = 0;
-						if (_topScore != 0)
-						{
-							minusReward = _rewardAmount / 2;
-						}
-						else
-						{
-							// nobody took flags
-							minusReward = _rewardAmount / 4;
-						}
-						
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, minusReward, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team had a tie in the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Process top player.
-	 */
-	private static void processTopPlayer()
-	{
-		//
-	}
-	
-	/**
-	 * Process top team.
-	 */
-	private static void processTopTeam()
-	{
-		_topTeam = null;
-		for (String team : _teams)
-		{
-			if ((teamPointsCount(team) == _topScore) && (_topScore > 0))
-			{
-				_topTeam = null;
-			}
-			
-			if (teamPointsCount(team) > _topScore)
-			{
-				_topTeam = team;
-				_topScore = teamPointsCount(team);
-			}
-		}
-	}
-	
-	/**
-	 * Adds the team.
-	 * @param teamName the team name
-	 */
-	public static void addTeam(String teamName)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		if (teamName.equals(" "))
-		{
-			return;
-		}
-		
-		_teams.add(teamName);
-		_teamPlayersCount.add(0);
-		_teamPointsCount.add(0);
-		_teamColors.add(0);
-		_teamsX.add(0);
-		_teamsY.add(0);
-		_teamsZ.add(0);
-		
-		addTeamEventOperations(teamName);
-	}
-	
-	/**
-	 * Adds the team event operations.
-	 * @param teamName the team name
-	 */
-	private static void addTeamEventOperations(String teamName)
-	{
-		addOrSet(_teams.indexOf(teamName), null, false, _FlagNPC, 0, 0, 0);
-	}
-	
-	/**
-	 * Removes the team.
-	 * @param teamName the team name
-	 */
-	public static void removeTeam(String teamName)
-	{
-		if (_inProgress || _teams.isEmpty())
-		{
-			return;
-		}
-		
-		if (teamPlayersCount(teamName) > 0)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsZ.remove(index);
-		_teamsY.remove(index);
-		_teamsX.remove(index);
-		_teamColors.remove(index);
-		_teamPointsCount.remove(index);
-		_teamPlayersCount.remove(index);
-		_teams.remove(index);
-		
-		removeTeamEventItems(teamName);
-	}
-	
-	/**
-	 * Removes the team event items.
-	 * @param teamName the team name
-	 */
-	private static void removeTeamEventItems(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		_flagSpawns.remove(index);
-		_flagsTaken.remove(index);
-		_flagIds.remove(index);
-		_flagsX.remove(index);
-		_flagsY.remove(index);
-		_flagsZ.remove(index);
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param player the player
-	 */
-	public static void setTeamPos(String teamName, PlayerInstance player)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, player.getX());
-		_teamsY.set(index, player.getY());
-		_teamsZ.set(index, player.getZ());
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param x the x
-	 * @param y the y
-	 * @param z the z
-	 */
-	public static void setTeamPos(String teamName, int x, int y, int z)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, x);
-		_teamsY.set(index, y);
-		_teamsZ.set(index, z);
-	}
-	
-	/**
-	 * Sets the team color.
-	 * @param teamName the team name
-	 * @param color the color
-	 */
-	public static void setTeamColor(String teamName, int color)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamColors.set(index, color);
-	}
-	
-	/**
-	 * Team players count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamPlayersCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPlayersCount.get(index);
-	}
-	
-	/**
-	 * Sets the team players count.
-	 * @param teamName the team name
-	 * @param teamPlayersCount the team players count
-	 */
-	public static void setTeamPlayersCount(String teamName, int teamPlayersCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPlayersCount.set(index, teamPlayersCount);
-	}
-	
-	/**
-	 * Check shuffle players.
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	public static boolean checkShufflePlayers(PlayerInstance eventPlayer)
-	{
-		try
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if ((player == null) || !player.isOnline())
-				{
-					_playersShuffle.remove(player);
-					eventPlayer._inEventCTF = false;
-				}
-				else if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer._inEventCTF = true;
-					eventPlayer._countCTFflags = 0;
-					return true;
-				}
-				// This 1 is incase player got new objectid after DC or reconnect
-				else if (player.getName().equals(eventPlayer.getName()))
-				{
-					_playersShuffle.remove(player);
-					_playersShuffle.add(eventPlayer);
-					eventPlayer._inEventCTF = true;
-					eventPlayer._countCTFflags = 0;
-					return true;
-				}
-			}
-		}
-		catch (Exception e)
-		{
-		}
-		return false;
-	}
-	
-	/**
-	 * just an announcer to send termination messages.
-	 */
-	public static void sendFinalMessages()
-	{
-		if (!_started && !_aborted)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Thank you For Participating At, " + _eventName + " Event.");
-		}
-	}
-	
-	/**
-	 * returns the interval between each event.
-	 * @return the interval between matches
-	 */
-	public static int getIntervalBetweenMatchs()
-	{
-		final long actualTime = Chronos.currentTimeMillis();
-		final long totalTime = actualTime + _intervalBetweenMatches;
-		final long interval = totalTime - actualTime;
-		final int seconds = (int) (interval / 1000);
-		return seconds / 60;
-	}
-	
-	@Override
-	public void run()
-	{
-		LOGGER.info(_eventName + ": Event notification start");
-		eventOnceStart();
-	}
-	
-	@Override
-	public String getEventIdentifier()
-	{
-		return _eventName;
-	}
-	
-	@Override
-	public String getEventStartTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the event start time.
-	 * @param newTime the new event start time
-	 */
-	public void setEventStartTime(String newTime)
-	{
-		startEventTime = newTime;
-	}
-	
-	/**
-	 * On disconnect.
-	 * @param player the player
-	 */
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventCTF)
-		{
-			removePlayer(player);
-			player.teleToLocation(_npcX, _npcY, _npcZ);
-		}
-	}
-	
-	/**
-	 * Team points count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamPointsCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPointsCount.get(index);
-	}
-	
-	/**
-	 * Sets the team points count.
-	 * @param teamName the team name
-	 * @param teamPointCount the team point count
-	 */
-	public static void setTeamPointsCount(String teamName, int teamPointCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPointsCount.set(index, teamPointCount);
-	}
-	
-	/**
-	 * Gets the _event offset.
-	 * @return the _eventOffset
-	 */
-	public static int getEventOffset()
-	{
-		return _eventOffset;
-	}
-	
-	/**
-	 * Set_event offset.
-	 * @param eventOffset the _eventOffset to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventOffset(int eventOffset)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventOffset = eventOffset;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Show flag html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 * @param teamName the team name
-	 */
-	public static void showFlagHtml(PlayerInstance eventPlayer, String objectId, String teamName)
-	{
-		if (eventPlayer == null)
-		{
-			return;
-		}
-		
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><head><body><center>");
-			replyMSG.append("CTF Flag<br><br>");
-			replyMSG.append("<font color=\"00FF00\">" + teamName + "'s Flag</font><br1>");
-			if ((eventPlayer._teamNameCTF != null) && eventPlayer._teamNameCTF.equals(teamName))
-			{
-				replyMSG.append("<font color=\"LEVEL\">This is your Flag</font><br1>");
-			}
-			else
-			{
-				replyMSG.append("<font color=\"LEVEL\">Enemy Flag!</font><br1>");
-			}
-			if (_started)
-			{
-				processInFlagRange(eventPlayer);
-			}
-			else
-			{
-				replyMSG.append("CTF match is not in progress yet.<br>Wait for a GM to start the event<br>");
-			}
-			replyMSG.append("</center></body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception: " + e.getStackTrace());
-		}
-	}
-	
-	/**
-	 * Check restore flags.
-	 */
-	public static void checkRestoreFlags()
-	{
-		final List<Integer> teamsTakenFlag = new ArrayList<>();
-		try
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// logged off with a flag in his hands
-						if (!player.isOnline() && player._haveFlagCTF)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player.getName() + " logged off with a CTF flag!");
-							player._haveFlagCTF = false;
-							if ((_teams.indexOf(player._teamNameHaveFlagCTF) >= 0) && _flagsTaken.get(_teams.indexOf(player._teamNameHaveFlagCTF)))
-							{
-								_flagsTaken.set(_teams.indexOf(player._teamNameHaveFlagCTF), false);
-								spawnFlag(player._teamNameHaveFlagCTF);
-								AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player._teamNameHaveFlagCTF + " flag now returned to place.");
-							}
-							removeFlagFromPlayer(player);
-							player._teamNameHaveFlagCTF = null;
-							return;
-						}
-						else if (player._haveFlagCTF)
-						{
-							teamsTakenFlag.add(_teams.indexOf(player._teamNameHaveFlagCTF));
-						}
-					}
-				}
-			}
-			
-			// Go over the list of ALL teams
-			for (String team : _teams)
-			{
-				if (team == null)
-				{
-					continue;
-				}
-				final int index = _teams.indexOf(team);
-				if (!teamsTakenFlag.contains(index) && _flagsTaken.get(index))
-				{
-					_flagsTaken.set(index, false);
-					spawnFlag(team);
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + team + " flag returned due to player error.");
-				}
-			}
-			// Check if a player ran away from the event holding a flag:
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if ((player != null) && player._haveFlagCTF && isOutsideCTFArea(player))
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player.getName() + " escaped from the event holding a flag!");
-						player._haveFlagCTF = false;
-						if ((_teams.indexOf(player._teamNameHaveFlagCTF) >= 0) && _flagsTaken.get(_teams.indexOf(player._teamNameHaveFlagCTF)))
-						{
-							_flagsTaken.set(_teams.indexOf(player._teamNameHaveFlagCTF), false);
-							spawnFlag(player._teamNameHaveFlagCTF);
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player._teamNameHaveFlagCTF + " flag now returned to place.");
-						}
-						removeFlagFromPlayer(player);
-						player._teamNameHaveFlagCTF = null;
-						player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameCTF)), _teamsY.get(_teams.indexOf(player._teamNameCTF)), _teamsZ.get(_teams.indexOf(player._teamNameCTF)));
-						player.sendMessage("You have been returned to your team spawn");
-						return;
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF.restoreFlags() Error:" + e);
-		}
-	}
-	
-	/**
-	 * Adds the flag to player.
-	 * @param player the player
-	 */
-	public static void addFlagToPlayer(PlayerInstance player)
-	{
-		// Remove items from the player hands (right, left, both)
-		// This is NOT a BUG, I don't want them to see the icon they have 8D
-		ItemInstance wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
-		if (wpn == null)
-		{
-			wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LRHAND);
-			if (wpn != null)
-			{
-				player.getInventory().unEquipItemInBodySlotAndRecord(Inventory.PAPERDOLL_LRHAND);
-			}
-		}
-		else
-		{
-			player.getInventory().unEquipItemInBodySlotAndRecord(Inventory.PAPERDOLL_RHAND);
-			wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
-			if (wpn != null)
-			{
-				player.getInventory().unEquipItemInBodySlotAndRecord(Inventory.PAPERDOLL_LHAND);
-			}
-		}
-		// Add the flag in his hands
-		player.getInventory().equipItem(ItemTable.getInstance().createItem("", _FLAG_IN_HAND_ITEM_ID, 1, player, null));
-		player.broadcastPacket(new SocialAction(player.getObjectId(), 16)); // Amazing glow
-		player._haveFlagCTF = true;
-		player.broadcastUserInfo();
-		player.sendPacket(new CreatureSay(player.getObjectId(), ChatType.PARTYROOM_COMMANDER, ":", "You got it! Run back! ::"));
-	}
-	
-	/**
-	 * Removes the flag from player.
-	 * @param player the player
-	 */
-	public static void removeFlagFromPlayer(PlayerInstance player)
-	{
-		final ItemInstance wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LRHAND);
-		player._haveFlagCTF = false;
-		if (wpn != null)
-		{
-			player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
-			final InventoryUpdate iu = new InventoryUpdate();
-			for (ItemInstance element : player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()))
-			{
-				iu.addModifiedItem(element);
-			}
-			player.sendPacket(iu);
-			player.sendPacket(new ItemList(player, true)); // Get your weapon back now ...
-			player.abortAttack();
-			player.broadcastUserInfo();
-		}
-		else
-		{
-			player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
-			player.sendPacket(new ItemList(player, true)); // Get your weapon back now ...
-			player.abortAttack();
-			player.broadcastUserInfo();
-		}
-	}
-	
-	/**
-	 * Sets the team flag.
-	 * @param teamName the team name
-	 * @param player the player
-	 */
-	public static void setTeamFlag(String teamName, PlayerInstance player)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		addOrSet(_teams.indexOf(teamName), null, false, _FlagNPC, player.getX(), player.getY(), player.getZ());
-	}
-	
-	/**
-	 * Spawn all flags.
-	 */
-	public static void spawnAllFlags()
-	{
-		while (_flagSpawns.size() < _teams.size())
-		{
-			_flagSpawns.add(null);
-		}
-		while (_throneSpawns.size() < _teams.size())
-		{
-			_throneSpawns.add(null);
-		}
-		for (String team : _teams)
-		{
-			final int index = _teams.indexOf(team);
-			final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_flagIds.get(index));
-			final NpcTemplate throne = NpcTable.getInstance().getTemplate(32027);
-			try
-			{
-				// Spawn throne
-				_throneSpawns.set(index, new Spawn(throne));
-				_throneSpawns.get(index).setX(_flagsX.get(index));
-				_throneSpawns.get(index).setY(_flagsY.get(index));
-				_throneSpawns.get(index).setZ(_flagsZ.get(index) - 10);
-				_throneSpawns.get(index).setAmount(1);
-				_throneSpawns.get(index).setHeading(0);
-				_throneSpawns.get(index).setRespawnDelay(1);
-				SpawnTable.getInstance().addNewSpawn(_throneSpawns.get(index), false);
-				_throneSpawns.get(index).init();
-				_throneSpawns.get(index).getLastSpawn().getStatus().setCurrentHp(999999999);
-				_throneSpawns.get(index).getLastSpawn().decayMe();
-				_throneSpawns.get(index).getLastSpawn().spawnMe(_throneSpawns.get(index).getLastSpawn().getX(), _throneSpawns.get(index).getLastSpawn().getY(), _throneSpawns.get(index).getLastSpawn().getZ());
-				_throneSpawns.get(index).getLastSpawn().setTitle(team + " Throne");
-				_throneSpawns.get(index).getLastSpawn().broadcastPacket(new MagicSkillUse(_throneSpawns.get(index).getLastSpawn(), _throneSpawns.get(index).getLastSpawn(), 1036, 1, 5500, 1));
-				_throneSpawns.get(index).getLastSpawn()._isCTF_throneSpawn = true;
-				// Spawn flag
-				_flagSpawns.set(index, new Spawn(tmpl));
-				_flagSpawns.get(index).setX(_flagsX.get(index));
-				_flagSpawns.get(index).setY(_flagsY.get(index));
-				_flagSpawns.get(index).setZ(_flagsZ.get(index));
-				_flagSpawns.get(index).setAmount(1);
-				_flagSpawns.get(index).setHeading(0);
-				_flagSpawns.get(index).setRespawnDelay(1);
-				SpawnTable.getInstance().addNewSpawn(_flagSpawns.get(index), false);
-				_flagSpawns.get(index).init();
-				_flagSpawns.get(index).getLastSpawn().getStatus().setCurrentHp(999999999);
-				_flagSpawns.get(index).getLastSpawn().setTitle(team + "'s Flag");
-				_flagSpawns.get(index).getLastSpawn()._CTF_FlagTeamName = team;
-				_flagSpawns.get(index).getLastSpawn().decayMe();
-				_flagSpawns.get(index).getLastSpawn().spawnMe(_flagSpawns.get(index).getLastSpawn().getX(), _flagSpawns.get(index).getLastSpawn().getY(), _flagSpawns.get(index).getLastSpawn().getZ());
-				_flagSpawns.get(index).getLastSpawn()._isCTF_Flag = true;
-				calculateOutSideOfCTF(); // Sets event boundaries so players don't run with the flag.
-			}
-			catch (Exception e)
-			{
-				LOGGER.info("CTF Engine[spawnAllFlags()]: exception: " + e);
-			}
-		}
-	}
-	
-	/**
-	 * Unspawn all flags.
-	 */
-	public static void unspawnAllFlags()
-	{
-		try
-		{
-			if ((_throneSpawns == null) || (_flagSpawns == null) || (_teams == null))
-			{
-				return;
-			}
-			for (String team : _teams)
-			{
-				final int index = _teams.indexOf(team);
-				if (_throneSpawns.get(index) != null)
-				{
-					_throneSpawns.get(index).getLastSpawn().deleteMe();
-					_throneSpawns.get(index).stopRespawn();
-					SpawnTable.getInstance().deleteSpawn(_throneSpawns.get(index), true);
-				}
-				if (_flagSpawns.get(index) != null)
-				{
-					_flagSpawns.get(index).getLastSpawn().deleteMe();
-					_flagSpawns.get(index).stopRespawn();
-					SpawnTable.getInstance().deleteSpawn(_flagSpawns.get(index), true);
-				}
-			}
-			_throneSpawns.clear();
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF Engine[unspawnAllFlags()]: exception: " + e);
-		}
-	}
-	
-	/**
-	 * Unspawn flag.
-	 * @param teamName the team name
-	 */
-	private static void unspawnFlag(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		_flagSpawns.get(index).getLastSpawn().deleteMe();
-		_flagSpawns.get(index).stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_flagSpawns.get(index), true);
-	}
-	
-	/**
-	 * Spawn flag.
-	 * @param teamName the team name
-	 */
-	public static void spawnFlag(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_flagIds.get(index));
-		
-		try
-		{
-			_flagSpawns.set(index, new Spawn(tmpl));
-			_flagSpawns.get(index).setX(_flagsX.get(index));
-			_flagSpawns.get(index).setY(_flagsY.get(index));
-			_flagSpawns.get(index).setZ(_flagsZ.get(index));
-			_flagSpawns.get(index).setAmount(1);
-			_flagSpawns.get(index).setHeading(0);
-			_flagSpawns.get(index).setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_flagSpawns.get(index), false);
-			_flagSpawns.get(index).init();
-			_flagSpawns.get(index).getLastSpawn().getStatus().setCurrentHp(999999999);
-			_flagSpawns.get(index).getLastSpawn().setTitle(teamName + "'s Flag");
-			_flagSpawns.get(index).getLastSpawn()._CTF_FlagTeamName = teamName;
-			_flagSpawns.get(index).getLastSpawn()._isCTF_Flag = true;
-			_flagSpawns.get(index).getLastSpawn().decayMe();
-			_flagSpawns.get(index).getLastSpawn().spawnMe(_flagSpawns.get(index).getLastSpawn().getX(), _flagSpawns.get(index).getLastSpawn().getY(), _flagSpawns.get(index).getLastSpawn().getZ());
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF Engine[spawnFlag(" + teamName + ")]: exception: " + e);
-		}
-	}
-	
-	/**
-	 * In range of flag.
-	 * @param player the _player
-	 * @param flagIndex the flag index
-	 * @param offset the offset
-	 * @return true, if successful
-	 */
-	public static boolean inRangeOfFlag(PlayerInstance player, int flagIndex, int offset)
-	{
-		return (player.getX() > (_flagsX.get(flagIndex) - offset)) && (player.getX() < (_flagsX.get(flagIndex) + offset)) && (player.getY() > (_flagsY.get(flagIndex) - offset)) && (player.getY() < (_flagsY.get(flagIndex) + offset)) && (player.getZ() > (_flagsZ.get(flagIndex) - offset)) && (player.getZ() < (_flagsZ.get(flagIndex) + offset));
-	}
-	
-	/**
-	 * Process in flag range.
-	 * @param player the _player
-	 */
-	public static void processInFlagRange(PlayerInstance player)
-	{
-		try
-		{
-			checkRestoreFlags();
-			for (String team : _teams)
-			{
-				if (team.equals(player._teamNameCTF))
-				{
-					final int indexOwn = _teams.indexOf(player._teamNameCTF);
-					// If player is near his team flag holding the enemy flag
-					if (inRangeOfFlag(player, indexOwn, 100) && !_flagsTaken.get(indexOwn) && player._haveFlagCTF)
-					{
-						final int indexEnemy = _teams.indexOf(player._teamNameHaveFlagCTF);
-						// Return enemy flag to place
-						_flagsTaken.set(indexEnemy, false);
-						spawnFlag(player._teamNameHaveFlagCTF);
-						// Remove the flag from this player
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 16)); // Amazing glow
-						player.broadcastUserInfo();
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 3)); // Victory
-						player.broadcastUserInfo();
-						removeFlagFromPlayer(player);
-						_teamPointsCount.set(indexOwn, teamPointsCount(team) + 1);
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player.getName() + " scores for " + player._teamNameCTF + ".");
-					}
-				}
-				else
-				{
-					final int indexEnemy = _teams.indexOf(team);
-					// If the player is near a enemy flag
-					if (inRangeOfFlag(player, indexEnemy, 100) && !_flagsTaken.get(indexEnemy) && !player._haveFlagCTF && !player.isDead())
-					{
-						_flagsTaken.set(indexEnemy, true);
-						unspawnFlag(team);
-						player._teamNameHaveFlagCTF = team;
-						addFlagToPlayer(player);
-						player.broadcastUserInfo();
-						player._haveFlagCTF = true;
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + team + " flag taken by " + player.getName() + "...");
-						pointTeamTo(player, team);
-						break;
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-	}
-	
-	/**
-	 * Point team to.
-	 * @param hasFlag the has flag
-	 * @param ourFlag the our flag
-	 */
-	public static void pointTeamTo(PlayerInstance hasFlag, String ourFlag)
-	{
-		try
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if ((player != null) && player.isOnline() && player._teamNameCTF.equals(ourFlag))
-					{
-						player.sendMessage(hasFlag.getName() + " took your flag!");
-						if (player._haveFlagCTF)
-						{
-							player.sendMessage("You can not return the flag to headquarters, until your flag is returned to it's place.");
-							player.sendPacket(new RadarControl(1, 1, player.getX(), player.getY(), player.getZ()));
-						}
-						else
-						{
-							player.sendPacket(new RadarControl(0, 1, hasFlag.getX(), hasFlag.getY(), hasFlag.getZ()));
-							final Radar rdr = new Radar(player);
-							final Radar.RadarOnPlayer radar = rdr.new RadarOnPlayer(hasFlag, player);
-							ThreadPool.schedule(radar, 10000 + Rnd.get(30000));
-						}
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-	}
-	
-	/**
-	 * Adds the or set.
-	 * @param listSize the list size
-	 * @param flagSpawn the flag spawn
-	 * @param flagsTaken the flags taken
-	 * @param flagId the flag id
-	 * @param flagX the flag x
-	 * @param flagY the flag y
-	 * @param flagZ the flag z
-	 */
-	private static void addOrSet(int listSize, Spawn flagSpawn, boolean flagsTaken, int flagId, int flagX, int flagY, int flagZ)
-	{
-		while (_flagsX.size() <= listSize)
-		{
-			_flagSpawns.add(null);
-			_flagsTaken.add(false);
-			_flagIds.add(_FlagNPC);
-			_flagsX.add(0);
-			_flagsY.add(0);
-			_flagsZ.add(0);
-		}
-		_flagSpawns.set(listSize, flagSpawn);
-		_flagsTaken.set(listSize, flagsTaken);
-		_flagIds.set(listSize, flagId);
-		_flagsX.set(listSize, flagX);
-		_flagsY.set(listSize, flagY);
-		_flagsZ.set(listSize, flagZ);
-	}
-	
-	/**
-	 * Used to calculate the event CTF area, so that players don't run off with the flag. Essential, since a player may take the flag just so other teams can't score points. This function is Only called upon ONE time on BEGINING OF EACH EVENT right after we spawn the flags.
-	 */
-	private static void calculateOutSideOfCTF()
-	{
-		if ((_teams == null) || (_flagSpawns == null) || (_teamsX == null) || (_teamsY == null) || (_teamsZ == null))
-		{
-			return;
-		}
-		final int division = _teams.size() * 2;
-		int pos = 0;
-		final int[] locX = new int[division];
-		final int[] locY = new int[division];
-		final int[] locZ = new int[division];
-		// Get all coordinates inorder to create a polygon:
-		for (Spawn flag : _flagSpawns)
-		{
-			if (flag == null)
-			{
-				continue;
-			}
-			
-			locX[pos] = flag.getX();
-			locY[pos] = flag.getY();
-			locZ[pos] = flag.getZ();
-			pos++;
-			if (pos > (division / 2))
-			{
-				break;
-			}
-		}
-		for (int x = 0; x < _teams.size(); x++)
-		{
-			locX[pos] = _teamsX.get(x);
-			locY[pos] = _teamsY.get(x);
-			locZ[pos] = _teamsZ.get(x);
-			pos++;
-			if (pos > division)
-			{
-				break;
-			}
-		}
-		// Find the polygon center, note that it's not the mathematical center of the polygon,
-		// Rather than a point which centers all coordinates:
-		int centerX = 0;
-		int centerY = 0;
-		int centerZ = 0;
-		for (int x = 0; x < pos; x++)
-		{
-			centerX += (locX[x] / division);
-			centerY += (locY[x] / division);
-			centerZ += (locZ[x] / division);
-		}
-		// Now let's find the furthest distance from the "center" to the egg shaped sphere
-		// Surrounding the polygon, size x1.5 (for maximum logical area to wander...):
-		int maxX = 0;
-		int maxY = 0;
-		int maxZ = 0;
-		for (int x = 0; x < pos; x++)
-		{
-			if (maxX < (2 * Math.abs(centerX - locX[x])))
-			{
-				maxX = (2 * Math.abs(centerX - locX[x]));
-			}
-			if (maxY < (2 * Math.abs(centerY - locY[x])))
-			{
-				maxY = (2 * Math.abs(centerY - locY[x]));
-			}
-			if (maxZ < (2 * Math.abs(centerZ - locZ[x])))
-			{
-				maxZ = (2 * Math.abs(centerZ - locZ[x]));
-			}
-		}
-		
-		// CenterX,centerY,centerZ are the coordinates of the "event center".
-		// So let's save those coordinates to check on the players:
-		_eventCenterX = centerX;
-		_eventCenterY = centerY;
-		_eventCenterZ = centerZ;
-		_eventOffset = maxX;
-		if (_eventOffset < maxY)
-		{
-			_eventOffset = maxY;
-		}
-		if (_eventOffset < maxZ)
-		{
-			_eventOffset = maxZ;
-		}
-	}
-	
-	/**
-	 * Checks if is outside ctf area.
-	 * @param player the player
-	 * @return true, if is outside ctf area
-	 */
-	public static boolean isOutsideCTFArea(PlayerInstance player)
-	{
-		return (player == null) || !player.isOnline() || (player.getX() <= (_eventCenterX - _eventOffset)) || (player.getX() >= (_eventCenterX + _eventOffset)) || (player.getY() <= (_eventCenterY - _eventOffset)) || (player.getY() >= (_eventCenterY + _eventOffset)) || (player.getZ() <= (_eventCenterZ - _eventOffset)) || (player.getZ() >= (_eventCenterZ + _eventOffset));
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/DM.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/DM.java
deleted file mode 100644
index 3f5119dfda..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/DM.java
+++ /dev/null
@@ -1,2062 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SkillTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.ClassId;
-import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.Ride;
-import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-
-public class DM implements EventTask
-{
-	protected static final Logger LOGGER = Logger.getLogger(DM.class.getName());
-	
-	private static String _eventName = "";
-	private static String _eventDesc = "";
-	private static String _joiningLocationName = "";
-	private static Spawn _npcSpawn;
-	private static boolean _joining = false;
-	private static boolean _teleport = false;
-	private static boolean _started = false;
-	private static boolean _aborted = false;
-	private static boolean _sitForced = false;
-	private static boolean _inProgress = false;
-	protected static int _npcId = 0;
-	protected static int _npcX = 0;
-	protected static int _npcY = 0;
-	protected static int _npcZ = 0;
-	protected static int _npcHeading = 0;
-	protected static int _rewardId = 0;
-	protected static int _rewardAmount = 0;
-	protected static int _minLevel = 0;
-	protected static int _maxLevel = 0;
-	protected static int _joinTime = 0;
-	protected static int _eventTime = 0;
-	protected static int _minPlayers = 0;
-	protected static int _maxPlayers = 0;
-	protected static int _topKills = 0;
-	protected static int _playerColors = 0;
-	protected static int _playerX = 0;
-	protected static int _playerY = 0;
-	protected static int _playerZ = 0;
-	private static long _intervalBetweenMatches = 0;
-	private String startEventTime;
-	protected static boolean _teamEvent = false; // TODO to be integrated
-	public static List<PlayerInstance> _players = new ArrayList<>();
-	public static List<PlayerInstance> _topPlayers = new ArrayList<>();
-	public static List<String> _savePlayers = new ArrayList<>();
-	
-	/**
-	 * Instantiates a new dM.
-	 */
-	private DM()
-	{
-	}
-	
-	/**
-	 * Gets the new instance.
-	 * @return the new instance
-	 */
-	public static DM getNewInstance()
-	{
-		return new DM();
-	}
-	
-	/**
-	 * Gets the _event name.
-	 * @return the _eventName
-	 */
-	public static String getEventName()
-	{
-		return _eventName;
-	}
-	
-	/**
-	 * Set_event name.
-	 * @param eventName the _eventName to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventName(String eventName)
-	{
-		if (!_inProgress)
-		{
-			DM._eventName = eventName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event desc.
-	 * @return the _eventDesc
-	 */
-	public static String getEventDesc()
-	{
-		return _eventDesc;
-	}
-	
-	/**
-	 * Set_event desc.
-	 * @param eventDesc the _eventDesc to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventDesc(String eventDesc)
-	{
-		if (!_inProgress)
-		{
-			DM._eventDesc = eventDesc;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _joining location name.
-	 * @return the _joiningLocationName
-	 */
-	public static String getJoiningLocationName()
-	{
-		return _joiningLocationName;
-	}
-	
-	/**
-	 * Set_joining location name.
-	 * @param joiningLocationName the _joiningLocationName to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoiningLocationName(String joiningLocationName)
-	{
-		if (!_inProgress)
-		{
-			DM._joiningLocationName = joiningLocationName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc id.
-	 * @return the _npcId
-	 */
-	public static int getNpcId()
-	{
-		return _npcId;
-	}
-	
-	/**
-	 * Set_npc id.
-	 * @param npcId the _npcId to set
-	 * @return true, if successful
-	 */
-	public static boolean setNpcId(int npcId)
-	{
-		if (!_inProgress)
-		{
-			DM._npcId = npcId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc location.
-	 * @return the _npc location
-	 */
-	public static Location getNpcLocation()
-	{
-		return new Location(_npcX, _npcY, _npcZ, _npcHeading);
-	}
-	
-	/**
-	 * Gets the _reward id.
-	 * @return the _rewardId
-	 */
-	public static int getRewardId()
-	{
-		return _rewardId;
-	}
-	
-	/**
-	 * Set_reward id.
-	 * @param rewardId the _rewardId to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardId(int rewardId)
-	{
-		if (!_inProgress)
-		{
-			DM._rewardId = rewardId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _reward amount.
-	 * @return the _rewardAmount
-	 */
-	public static int getRewardAmount()
-	{
-		return _rewardAmount;
-	}
-	
-	/**
-	 * Set_reward amount.
-	 * @param rewardAmount the _rewardAmount to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardAmount(int rewardAmount)
-	{
-		if (!_inProgress)
-		{
-			DM._rewardAmount = rewardAmount;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _minLevel.
-	 * @return the _minLevel
-	 */
-	public static int getMinLevel()
-	{
-		return _minLevel;
-	}
-	
-	/**
-	 * Set_minLevel.
-	 * @param minLevel the _minLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinlvl(int minLevel)
-	{
-		if (!_inProgress)
-		{
-			DM._minLevel = minLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _maxLevel.
-	 * @return the _maxLevel
-	 */
-	public static int getMaxLevel()
-	{
-		return _maxLevel;
-	}
-	
-	/**
-	 * Set_maxLevel.
-	 * @param maxLevel the _maxLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxlvl(int maxLevel)
-	{
-		if (!_inProgress)
-		{
-			DM._maxLevel = maxLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _join time.
-	 * @return the _joinTime
-	 */
-	public static int getJoinTime()
-	{
-		return _joinTime;
-	}
-	
-	/**
-	 * Set_join time.
-	 * @param joinTime the _joinTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoinTime(int joinTime)
-	{
-		if (!_inProgress)
-		{
-			DM._joinTime = joinTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event time.
-	 * @return the _eventTime
-	 */
-	public static int getEventTime()
-	{
-		return _eventTime;
-	}
-	
-	/**
-	 * Set_event time.
-	 * @param eventTime the _eventTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventTime(int eventTime)
-	{
-		if (!_inProgress)
-		{
-			DM._eventTime = eventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _min players.
-	 * @return the _minPlayers
-	 */
-	public static int getMinPlayers()
-	{
-		return _minPlayers;
-	}
-	
-	/**
-	 * Set_min players.
-	 * @param minPlayers the _minPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinPlayers(int minPlayers)
-	{
-		if (!_inProgress)
-		{
-			DM._minPlayers = minPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _max players.
-	 * @return the _maxPlayers
-	 */
-	public static int getMaxPlayers()
-	{
-		return _maxPlayers;
-	}
-	
-	/**
-	 * Set_max players.
-	 * @param maxPlayers the _maxPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxPlayers(int maxPlayers)
-	{
-		if (!_inProgress)
-		{
-			DM._maxPlayers = maxPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _interval between matches.
-	 * @return the _intervalBetweenMatchs
-	 */
-	public static long getIntervalBetweenMatches()
-	{
-		return _intervalBetweenMatches;
-	}
-	
-	/**
-	 * Set_interval between matches.
-	 * @param intervalBetweenMatches the _intervalBetweenMatchs to set
-	 * @return true, if successful
-	 */
-	public static boolean setIntervalBetweenMatches(long intervalBetweenMatches)
-	{
-		if (!_inProgress)
-		{
-			DM._intervalBetweenMatches = intervalBetweenMatches;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the start event time.
-	 * @return the startEventTime
-	 */
-	public String getStartEventTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the start event time.
-	 * @param startEventTime the startEventTime to set
-	 * @return true, if successful
-	 */
-	public boolean setStartEventTime(String startEventTime)
-	{
-		if (!_inProgress)
-		{
-			this.startEventTime = startEventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks if is _joining.
-	 * @return the _joining
-	 */
-	public static boolean isJoining()
-	{
-		return _joining;
-	}
-	
-	/**
-	 * Checks if is _teleport.
-	 * @return the _teleport
-	 */
-	public static boolean isTeleport()
-	{
-		return _teleport;
-	}
-	
-	/**
-	 * Checks if is _started.
-	 * @return the _started
-	 */
-	public static boolean hasStarted()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Checks if is _aborted.
-	 * @return the _aborted
-	 */
-	public static boolean isAborted()
-	{
-		return _aborted;
-	}
-	
-	/**
-	 * Checks if is _sit forced.
-	 * @return the _sitForced
-	 */
-	public static boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	/**
-	 * Checks if is _in progress.
-	 * @return the _inProgress
-	 */
-	public static boolean isInProgress()
-	{
-		return _inProgress;
-	}
-	
-	/**
-	 * Check max level.
-	 * @param maxLevel the maxLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxLevel(int maxLevel)
-	{
-		return _minLevel < maxLevel;
-	}
-	
-	/**
-	 * Check min level.
-	 * @param minLevel the minLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMinLevel(int minLevel)
-	{
-		return _maxLevel > minLevel;
-	}
-	
-	/**
-	 * returns true if participated players is higher or equal then minimum needed players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMinPlayers(int players)
-	{
-		return _minPlayers <= players;
-	}
-	
-	/**
-	 * returns true if max players is higher or equal then participated players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxPlayers(int players)
-	{
-		return _maxPlayers > players;
-	}
-	
-	/**
-	 * Check start join ok.
-	 * @return true, if successful
-	 */
-	public static boolean checkStartJoinOk()
-	{
-		if (_started || _teleport || _joining || _eventName.equals("") || _joiningLocationName.equals("") || _eventDesc.equals("") || (_npcId == 0) || (_npcX == 0) || (_npcY == 0) || (_npcZ == 0) || (_rewardId == 0) || (_rewardAmount == 0))
-		{
-			return false;
-		}
-		
-		if (_teamEvent)
-		{
-			if (!checkStartJoinTeamInfo())
-			{
-				return false;
-			}
-		}
-		else if (!checkStartJoinPlayerInfo())
-		{
-			return false;
-		}
-		
-		if (!Config.ALLOW_EVENTS_DURING_OLY && Olympiad.getInstance().inCompPeriod())
-		{
-			return false;
-		}
-		
-		for (Castle castle : CastleManager.getInstance().getCastles())
-		{
-			if ((castle != null) && (castle.getSiege() != null) && castle.getSiege().isInProgress())
-			{
-				return false;
-			}
-		}
-		
-		if (!checkOptionalEventStartJoinOk())
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Check start join team info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinTeamInfo()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Check start join player info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinPlayerInfo()
-	{
-		return (_playerX != 0) && (_playerY != 0) && (_playerZ != 0) && (_playerColors != 0);
-	}
-	
-	/**
-	 * Check auto event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkAutoEventStartJoinOk()
-	{
-		return (_joinTime != 0) && (_eventTime != 0);
-	}
-	
-	/**
-	 * Check optional event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkOptionalEventStartJoinOk()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Sets the npc pos.
-	 * @param player the new npc pos
-	 */
-	public static void setNpcPos(PlayerInstance player)
-	{
-		_npcX = player.getX();
-		_npcY = player.getY();
-		_npcZ = player.getZ();
-		_npcHeading = player.getHeading();
-	}
-	
-	/**
-	 * Spawn event npc.
-	 */
-	private static void spawnEventNpc()
-	{
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_npcId);
-		
-		try
-		{
-			_npcSpawn = new Spawn(tmpl);
-			_npcSpawn.setX(_npcX);
-			_npcSpawn.setY(_npcY);
-			_npcSpawn.setZ(_npcZ);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(_npcHeading);
-			_npcSpawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_npcSpawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			_npcSpawn.getLastSpawn().setTitle(_eventName);
-			_npcSpawn.getLastSpawn()._isEventMobDM = true;
-			_npcSpawn.getLastSpawn().isAggressive();
-			_npcSpawn.getLastSpawn().decayMe();
-			_npcSpawn.getLastSpawn().spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_npcSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_npcSpawn.getLastSpawn(), _npcSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[spawnEventNpc(exception: " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Unspawn event npc.
-	 */
-	private static void unspawnEventNpc()
-	{
-		if ((_npcSpawn == null) || (_npcSpawn.getLastSpawn() == null))
-		{
-			return;
-		}
-		
-		_npcSpawn.getLastSpawn().deleteMe();
-		_npcSpawn.stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_npcSpawn, true);
-	}
-	
-	/**
-	 * Start join.
-	 * @return true, if successful
-	 */
-	public static boolean startJoin()
-	{
-		if (!checkStartJoinOk())
-		{
-			return false;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		spawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Event " + _eventName + "!");
-		if (Config.DM_ANNOUNCE_REWARD && (ItemTable.getInstance().getTemplate(_rewardId) != null))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
-		}
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName);
-		if (Config.DM_COMMAND)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Commands .dmjoin .dmleave .dminfo");
-		}
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": FULL BUFF Event: be ready with your buffs, they won't be deleted!!!");
-		return true;
-	}
-	
-	/**
-	 * Start teleport.
-	 * @return true, if successful
-	 */
-	public static boolean startTeleport()
-	{
-		if (!_joining || _started || _teleport)
-		{
-			return false;
-		}
-		
-		removeOfflinePlayers();
-		
-		if (!_teamEvent)
-		{
-			synchronized (_players)
-			{
-				final int size = _players.size();
-				if (!checkMinPlayers(size))
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + size);
-					if (Config.DM_STATS_LOGGER)
-					{
-						LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + size);
-					}
-					
-					return false;
-				}
-			}
-		}
-		
-		_joining = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport to team spot in 20 seconds!");
-		setUserData();
-		ThreadPool.schedule(() ->
-		{
-			sit();
-			afterTeleportOperations();
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// Remove Summon's buffs
-						if (Config.DM_ON_START_UNSUMMON_PET && (player.getPet() != null))
-						{
-							final Summon summon = player.getPet();
-							summon.stopAllEffects();
-							
-							if (summon instanceof PetInstance)
-							{
-								summon.unSummon(player);
-							}
-						}
-						
-						if (Config.DM_ON_START_REMOVE_ALL_EFFECTS)
-						{
-							player.stopAllEffects();
-						}
-						
-						// Remove player from his party
-						if (player.getParty() != null)
-						{
-							final Party party = player.getParty();
-							party.removePartyMember(player);
-						}
-						
-						if (!_teamEvent)
-						{
-							final int offset = Config.DM_SPAWN_OFFSET;
-							player.teleToLocation(_playerX + Rnd.get(offset), _playerY + Rnd.get(offset), _playerZ);
-						}
-					}
-				}
-			}
-		}, 20000);
-		_teleport = true;
-		return true;
-	}
-	
-	/**
-	 * After teleport operations.
-	 */
-	protected static void afterTeleportOperations()
-	{
-	}
-	
-	/**
-	 * Start event.
-	 * @return true, if successful
-	 */
-	public static boolean startEvent()
-	{
-		if (!startEventOk())
-		{
-			return false;
-		}
-		
-		_teleport = false;
-		sit();
-		removeParties();
-		
-		afterStartOperations();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Started. Go to kill your enemies!");
-		_started = true;
-		return true;
-	}
-	
-	/**
-	 * Removes the parties.
-	 */
-	private static void removeParties()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player.getParty() != null)
-				{
-					final Party party = player.getParty();
-					party.removePartyMember(player);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * After start operations.
-	 */
-	private static void afterStartOperations()
-	{
-	}
-	
-	/**
-	 * Restarts Event checks if event was aborted. and if true cancels restart task
-	 */
-	public static synchronized void restartEvent()
-	{
-		LOGGER.info(_eventName + ": Event has been restarted...");
-		_joining = false;
-		_started = false;
-		_inProgress = false;
-		_aborted = false;
-		final long delay = _intervalBetweenMatches;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": joining period will be avaible again in " + _intervalBetweenMatches + " minute(s)!");
-		waiter(delay);
-		
-		try
-		{
-			if (!_aborted)
-			{
-				autoEvent(); // start a new event
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": next event aborted!");
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + ": Error While Trying to restart Event... " + e);
-		}
-	}
-	
-	/**
-	 * Finish event.
-	 */
-	public static void finishEvent()
-	{
-		if (!finishEventOk())
-		{
-			return;
-		}
-		
-		_started = false;
-		_aborted = false;
-		unspawnEventNpc();
-		
-		afterFinishOperations();
-		
-		if (_teamEvent)
-		{
-			processTopTeam();
-		}
-		else
-		{
-			processTopPlayer();
-			
-			if (_topKills != 0)
-			{
-				String winners = "";
-				for (PlayerInstance winner : _topPlayers)
-				{
-					winners = winners + " " + winner.getName();
-				}
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + winners + " win the match! " + _topKills + " kills.");
-				rewardPlayer();
-				
-				if (Config.DM_STATS_LOGGER)
-				{
-					LOGGER.info("**** " + _eventName + " ****");
-					LOGGER.info(_eventName + ": " + winners + " win the match! " + _topKills + " kills.");
-				}
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": No players win the match(nobody killed).");
-				if (Config.DM_STATS_LOGGER)
-				{
-					LOGGER.info(_eventName + ": No players win the match(nobody killed).");
-				}
-			}
-		}
-		
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish operations.
-	 */
-	private static void afterFinishOperations()
-	{
-	}
-	
-	/**
-	 * Abort event.
-	 */
-	public static void abortEvent()
-	{
-		if (!_joining && !_teleport && !_started)
-		{
-			return;
-		}
-		
-		if (_joining && !_teleport && !_started)
-		{
-			unspawnEventNpc();
-			cleanDM();
-			_joining = false;
-			_inProgress = false;
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-			return;
-		}
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_aborted = true;
-		unspawnEventNpc();
-		
-		afterFinish();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish.
-	 */
-	private static void afterFinish()
-	{
-	}
-	
-	/**
-	 * Teleport finish.
-	 */
-	public static void teleportFinish()
-	{
-		sit();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport back to participation NPC in 20 seconds!");
-		removeUserData();
-		ThreadPool.schedule(() ->
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						if (player.isOnline())
-						{
-							player.teleToLocation(_npcX, _npcY, _npcZ);
-						}
-						else
-						{
-							try (Connection con = DatabaseFactory.getConnection())
-							{
-								final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=? WHERE char_name=?");
-								statement.setInt(1, _npcX);
-								statement.setInt(2, _npcY);
-								statement.setInt(3, _npcZ);
-								statement.setString(4, player.getName());
-								statement.execute();
-								statement.close();
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning(e.getMessage());
-							}
-						}
-					}
-				}
-			}
-			
-			sit();
-			cleanDM();
-		}, 20000);
-	}
-	
-	/**
-	 * Auto event.
-	 */
-	public static void autoEvent()
-	{
-		LOGGER.info("Starting " + _eventName + "!");
-		LOGGER.info("Matchs Are Restarted At Every: " + getIntervalBetweenMatchs() + " Minutes.");
-		if (checkAutoEventStartJoinOk() && startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				LOGGER.info(_eventName + ": join time <=0 aborting event.");
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(30 * 1000); // 30 sec wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					LOGGER.warning(_eventName + ": waiting.....minutes for event time " + _eventTime);
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-					
-					LOGGER.info(_eventName + ": waiting... delay for final messages ");
-					waiter(60000); // just a give a delay delay for final messages
-					sendFinalMessages();
-					
-					if (!_started && !_aborted) // if is not already started and it's not aborted
-					{
-						LOGGER.info(_eventName + ": waiting.....delay for restart event  " + _intervalBetweenMatches + " minutes.");
-						waiter(60000); // just a give a delay to next restart
-						
-						try
-						{
-							if (!_aborted)
-							{
-								restartEvent();
-							}
-						}
-						catch (Exception e)
-						{
-							LOGGER.warning("Error while tying to Restart Event " + e);
-						}
-					}
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-				restartEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Event once start.
-	 */
-	public static void eventOnceStart()
-	{
-		if (startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(1 * 60 * 1000); // 1 min wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Waiter.
-	 * @param interval the interval
-	 */
-	private static void waiter(long interval)
-	{
-		final long startWaiterTime = Chronos.currentTimeMillis();
-		int seconds = (int) (interval / 1000);
-		
-		while (((startWaiterTime + interval) > Chronos.currentTimeMillis()) && !_aborted)
-		{
-			seconds--; // Here because we don't want to see two time announce at the same time
-			if (_joining || _started || _teleport)
-			{
-				switch (seconds)
-				{
-					case 3600: // 1 hour left
-					{
-						removeOfflinePlayers();
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till event finish!");
-						}
-						break;
-					}
-					case 1800: // 30 minutes left
-					case 900: // 15 minutes left
-					case 600: // 10 minutes left
-					case 300: // 5 minutes left
-					case 240: // 4 minutes left
-					case 180: // 3 minutes left
-					case 120: // 2 minutes left
-					case 60: // 1 minute left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till event finish!");
-						}
-						break;
-					}
-					case 30: // 30 seconds left
-					case 15: // 15 seconds left
-					case 10: // 10 seconds left
-					{
-						removeOfflinePlayers();
-						// fallthrough?
-					}
-					case 3: // 3 seconds left
-					case 2: // 2 seconds left
-					case 1: // 1 seconds left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till registration close!");
-						}
-						else if (_teleport)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " seconds(s) till start fight!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till event finish!");
-						}
-						break;
-					}
-				}
-			}
-			
-			final long startOneSecondWaiterStartTime = Chronos.currentTimeMillis();
-			
-			// Only the try catch with Thread.sleep(1000) give bad countdown on high wait times
-			while ((startOneSecondWaiterStartTime + 1000) > Chronos.currentTimeMillis())
-			{
-				try
-				{
-					Thread.sleep(1);
-				}
-				catch (InterruptedException ie)
-				{
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Sit.
-	 */
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (_sitForced)
-					{
-						player.stopMove(null, false);
-						player.abortAttack();
-						player.abortCast();
-						
-						if (!player.isSitting())
-						{
-							player.sitDown();
-						}
-					}
-					else if (player.isSitting())
-					{
-						player.standUp();
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Removes the offline players.
-	 */
-	public static void removeOfflinePlayers()
-	{
-		try
-		{
-			synchronized (_players)
-			{
-				if ((_players == null) || _players.isEmpty())
-				{
-					return;
-				}
-				
-				final List<PlayerInstance> toBeRemoved = new ArrayList<>();
-				for (PlayerInstance player : _players)
-				{
-					if (player == null)
-					{
-						continue;
-					}
-					
-					if ((player._inEventDM && !player.isOnline()) || player.isInJail() || player.isInOfflineMode())
-					{
-						if (!_joining)
-						{
-							player.getAppearance().setNameColor(player._originalNameColorDM);
-							player.setTitle(player._originalTitleDM);
-							player.setKarma(player._originalKarmaDM);
-							
-							player.broadcastUserInfo();
-						}
-						
-						// after remove, all event data must be cleaned in player
-						player._originalNameColorDM = 0;
-						player._originalTitleDM = null;
-						player._originalKarmaDM = 0;
-						player._countDMkills = 0;
-						player._inEventDM = false;
-						toBeRemoved.add(player);
-						
-						player.sendMessage("Your participation in the DeathMatch event has been removed.");
-					}
-				}
-				_players.removeAll(toBeRemoved);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-	}
-	
-	/**
-	 * Start event ok.
-	 * @return true, if successful
-	 */
-	private static boolean startEventOk()
-	{
-		return !_joining && _teleport && !_started;
-	}
-	
-	/**
-	 * Finish event ok.
-	 * @return true, if successful
-	 */
-	private static boolean finishEventOk()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Adds the player ok.
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	private static boolean addPlayerOk(PlayerInstance eventPlayer)
-	{
-		if (eventPlayer.isAio() && !Config.ALLOW_AIO_IN_EVENTS)
-		{
-			eventPlayer.sendMessage("AIO charactes are not allowed to participate in events :/");
-		}
-		if (eventPlayer._inEventDM)
-		{
-			eventPlayer.sendMessage("You already participated in the event!");
-			return false;
-		}
-		
-		if (eventPlayer._inEventTvT || eventPlayer._inEventCTF)
-		{
-			eventPlayer.sendMessage("You already participated to another event!");
-			return false;
-		}
-		
-		if (Olympiad.getInstance().isRegistered(eventPlayer) || eventPlayer.isInOlympiadMode())
-		{
-			eventPlayer.sendMessage("You already participated in Olympiad!");
-			return false;
-		}
-		
-		if ((eventPlayer._activeBoxes > 1) && !Config.ALLOW_DUALBOX_EVENT)
-		{
-			final List<String> playerBoxes = eventPlayer._activeBoxCharacters;
-			if ((playerBoxes != null) && (playerBoxes.size() > 1))
-			{
-				for (String characterName : playerBoxes)
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(characterName);
-					if ((player != null) && player._inEventDM)
-					{
-						eventPlayer.sendMessage("You already participated in event with another char!");
-						return false;
-					}
-				}
-			}
-		}
-		
-		if (!Config.DM_ALLOW_HEALER_CLASSES && ((eventPlayer.getClassId() == ClassId.CARDINAL) || (eventPlayer.getClassId() == ClassId.EVA_SAINT) || (eventPlayer.getClassId() == ClassId.SHILLIEN_SAINT)))
-		{
-			eventPlayer.sendMessage("You cant join with Healer Class!");
-			return false;
-		}
-		
-		synchronized (_players)
-		{
-			if (_players.contains(eventPlayer))
-			{
-				eventPlayer.sendMessage("You already participated in the event!");
-				return false;
-			}
-			
-			for (PlayerInstance player : _players)
-			{
-				if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-				else if (player.getName().equalsIgnoreCase(eventPlayer.getName()))
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-			}
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Sets the user data.
-	 */
-	public static void setUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player._originalNameColorDM = player.getAppearance().getNameColor();
-				player._originalKarmaDM = player.getKarma();
-				player._originalTitleDM = player.getTitle();
-				player.getAppearance().setNameColor(_playerColors);
-				player.setKarma(0);
-				player.setTitle("Kills: " + player._countDMkills);
-				if (player.isMounted() && player.setMountType(0))
-				{
-					if (player.isFlying())
-					{
-						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
-					}
-					
-					player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
-					player.setMountObjectID(0);
-				}
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * Dump data.
-	 */
-	public static void dumpData()
-	{
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		if (!_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (INACTIVE) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (JOINING) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		else if (!_joining && _teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (TELEPORT) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (!_joining && !_teleport && _started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (STARTED) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		
-		LOGGER.info("Name: " + _eventName);
-		LOGGER.info("Desc: " + _eventDesc);
-		LOGGER.info("Join location: " + _joiningLocationName);
-		LOGGER.info("Min lvl: " + _minLevel);
-		LOGGER.info("Max lvl: " + _maxLevel);
-		
-		LOGGER.info("");
-		LOGGER.info("##################################");
-		LOGGER.info("# _players(List<PlayerInstance>) #");
-		LOGGER.info("##################################");
-		
-		synchronized (_players)
-		{
-			LOGGER.info("Total Players : " + _players.size());
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName() + " kills :" + player._countDMkills);
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("################################");
-		LOGGER.info("# _savePlayers(List<String>) #");
-		LOGGER.info("################################");
-		
-		for (String player : _savePlayers)
-		{
-			LOGGER.info("Name: " + player);
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		dumpLocalEventInfo();
-	}
-	
-	/**
-	 * Dump local event info.
-	 */
-	private static void dumpLocalEventInfo()
-	{
-	}
-	
-	/**
-	 * Load data.
-	 */
-	public static void loadData()
-	{
-		_eventName = "";
-		_eventDesc = "";
-		_joiningLocationName = "";
-		_savePlayers = new ArrayList<>();
-		
-		synchronized (_players)
-		{
-			_players.clear();
-		}
-		
-		_topPlayers = new ArrayList<>();
-		_npcSpawn = null;
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_sitForced = false;
-		_aborted = false;
-		_inProgress = false;
-		_npcId = 0;
-		_npcX = 0;
-		_npcY = 0;
-		_npcZ = 0;
-		_npcHeading = 0;
-		_rewardId = 0;
-		_rewardAmount = 0;
-		_topKills = 0;
-		_minLevel = 0;
-		_maxLevel = 0;
-		_joinTime = 0;
-		_eventTime = 0;
-		_minPlayers = 0;
-		_maxPlayers = 0;
-		_intervalBetweenMatches = 0;
-		_playerColors = 0;
-		_playerX = 0;
-		_playerY = 0;
-		_playerZ = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			ResultSet rs;
-			statement = con.prepareStatement("Select * from dm");
-			rs = statement.executeQuery();
-			
-			while (rs.next())
-			{
-				_eventName = rs.getString("eventName");
-				_eventDesc = rs.getString("eventDesc");
-				_joiningLocationName = rs.getString("joiningLocation");
-				_minLevel = rs.getInt("minLevel");
-				_maxLevel = rs.getInt("maxLevel");
-				_npcId = rs.getInt("npcId");
-				_npcX = rs.getInt("npcX");
-				_npcY = rs.getInt("npcY");
-				_npcZ = rs.getInt("npcZ");
-				_npcHeading = rs.getInt("npcHeading");
-				_rewardId = rs.getInt("rewardId");
-				_rewardAmount = rs.getInt("rewardAmount");
-				_joinTime = rs.getInt("joinTime");
-				_eventTime = rs.getInt("eventTime");
-				_minPlayers = rs.getInt("minPlayers");
-				_maxPlayers = rs.getInt("maxPlayers");
-				_playerColors = rs.getInt("color");
-				_playerX = rs.getInt("playerX");
-				_playerY = rs.getInt("playerY");
-				_playerZ = rs.getInt("playerZ");
-				_intervalBetweenMatches = rs.getInt("delayForNextEvent");
-			}
-			statement.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: DM.loadData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Save data.
-	 */
-	public static void saveData()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			statement = con.prepareStatement("Delete from dm");
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("INSERT INTO dm (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, joinTime, eventTime, minPlayers, maxPlayers, color, playerX, playerY, playerZ, delayForNextEvent ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-			statement.setString(1, _eventName);
-			statement.setString(2, _eventDesc);
-			statement.setString(3, _joiningLocationName);
-			statement.setInt(4, _minLevel);
-			statement.setInt(5, _maxLevel);
-			statement.setInt(6, _npcId);
-			statement.setInt(7, _npcX);
-			statement.setInt(8, _npcY);
-			statement.setInt(9, _npcZ);
-			statement.setInt(10, _npcHeading);
-			statement.setInt(11, _rewardId);
-			statement.setInt(12, _rewardAmount);
-			statement.setInt(13, _joinTime);
-			statement.setInt(14, _eventTime);
-			statement.setInt(15, _minPlayers);
-			statement.setInt(16, _maxPlayers);
-			statement.setInt(17, _playerColors);
-			statement.setInt(18, _playerX);
-			statement.setInt(19, _playerY);
-			statement.setInt(20, _playerZ);
-			statement.setLong(21, _intervalBetweenMatches);
-			statement.execute();
-			statement.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: DM.saveData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Show event html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 */
-	public static void showEventHtml(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><title>" + _eventName + "</title><body>");
-			replyMSG.append("<center><img src=\"L2UI_CH3.herotower_deco\" width=256 height=32></center><br1>");
-			replyMSG.append("<center><font color=\"3366CC\">Current event:</font></center><br1>");
-			replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
-			replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
-			replyMSG.append("<center>Event Type:&nbsp;<font color=\"00FF00\"> Full Buff Event!!! </font></center><br><br>");
-			
-			synchronized (_players)
-			{
-				if (!_started && !_joining)
-				{
-					replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
-				}
-				else if (!checkMaxPlayers(_players.size()))
-				{
-					if (!_started)
-					{
-						replyMSG.append("Currently participated: <font color=\"00FF00\">" + _players.size() + ".</font><br>");
-						replyMSG.append("Max players: <font color=\"00FF00\">" + _maxPlayers + "</font><br><br>");
-						replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-					}
-				}
-				else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
-				{
-					if (_players.contains(eventPlayer))
-					{
-						replyMSG.append("<center><font color=\"3366CC\">You participated already!</font></center><br><br>");
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _players.size() + "</font></center><br>");
-						replyMSG.append("<table border=\"0\"><tr>");
-						replyMSG.append("<td width=\"200\">Wait till event start or</td>");
-						replyMSG.append("<td width=\"60\"><center><button value=\"remove\" action=\"bypass -h npc_" + objectId + "_dmevent_player_leave\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></td>");
-						replyMSG.append("<td width=\"100\">your participation!</td>");
-						replyMSG.append("</tr></table>");
-					}
-					else
-					{
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _players.size() + "</font></center><br>");
-						replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
-						replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
-						replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
-						replyMSG.append("<center><button value=\"Join\" action=\"bypass -h npc_" + objectId + "_dmevent_player_join\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center><br>");
-					}
-				}
-				else if (_started && !_joining)
-				{
-					replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
-				}
-				else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
-				{
-					replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
-					replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
-					replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
-					replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-				}
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			eventPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Adds the player.
-	 * @param player the player
-	 */
-	public static void addPlayer(PlayerInstance player)
-	{
-		if (!addPlayerOk(player))
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			_players.add(player);
-		}
-		
-		player._inEventDM = true;
-		player._countDMkills = 0;
-		_savePlayers.add(player.getName());
-		player.sendMessage("DM: You successfully registered for the DeathMatch event.");
-	}
-	
-	/**
-	 * Removes the player.
-	 * @param player the player
-	 */
-	public static void removePlayer(PlayerInstance player)
-	{
-		if ((player != null) && player._inEventDM)
-		{
-			if (!_joining)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorDM);
-				player.setTitle(player._originalTitleDM);
-				player.setKarma(player._originalKarmaDM);
-				
-				player.broadcastUserInfo();
-			}
-			
-			// after remove, all event data must be cleaned in player
-			player._originalNameColorDM = 0;
-			player._originalTitleDM = null;
-			player._originalKarmaDM = 0;
-			player._countDMkills = 0;
-			player._inEventDM = false;
-			
-			synchronized (_players)
-			{
-				_players.remove(player);
-			}
-			
-			player.sendMessage("Your participation in the DeathMatch event has been removed.");
-		}
-	}
-	
-	/**
-	 * Clean dm.
-	 */
-	public static void cleanDM()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					cleanEventPlayer(player);
-					
-					if (player._inEventDM)
-					{
-						if (!_joining)
-						{
-							player.getAppearance().setNameColor(player._originalNameColorDM);
-							player.setTitle(player._originalTitleDM);
-							player.setKarma(player._originalKarmaDM);
-							
-							player.broadcastUserInfo();
-						}
-						
-						// after remove, all event data must be cleaned in player
-						player._originalNameColorDM = 0;
-						player._originalTitleDM = null;
-						player._originalKarmaDM = 0;
-						player._countDMkills = 0;
-						player._inEventDM = false;
-						player.sendMessage("Your participation in the DeathMatch event has been removed.");
-					}
-					
-					if (_savePlayers.contains(player.getName()))
-					{
-						_savePlayers.remove(player.getName());
-					}
-					player._inEventDM = false;
-				}
-			}
-			
-			_players.clear();
-		}
-		
-		_topKills = 0;
-		_savePlayers = new ArrayList<>();
-		_topPlayers = new ArrayList<>();
-		cleanLocalEventInfo();
-		
-		_inProgress = false;
-		loadData();
-	}
-	
-	/**
-	 * Clean local event info.
-	 */
-	private static void cleanLocalEventInfo()
-	{
-		// nothing
-	}
-	
-	/**
-	 * Clean event player.
-	 * @param player the player
-	 */
-	private static void cleanEventPlayer(PlayerInstance player)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Adds the disconnected player.
-	 * @param player the player
-	 */
-	public static void addDisconnectedPlayer(PlayerInstance player)
-	{
-		synchronized (_players)
-		{
-			if (!_players.contains(player) && _savePlayers.contains(player.getName()))
-			{
-				if (Config.DM_ON_START_REMOVE_ALL_EFFECTS)
-				{
-					player.stopAllEffects();
-				}
-				
-				_players.add(player);
-				
-				player._originalNameColorDM = player.getAppearance().getNameColor();
-				player._originalTitleDM = player.getTitle();
-				player._originalKarmaDM = player.getKarma();
-				player._inEventDM = true;
-				player._countDMkills = 0;
-				if (_teleport || _started)
-				{
-					player.setTitle("Kills: " + player._countDMkills);
-					player.getAppearance().setNameColor(_playerColors);
-					player.setKarma(0);
-					player.broadcastUserInfo();
-					player.teleToLocation(_playerX + Rnd.get(Config.DM_SPAWN_OFFSET), _playerY + Rnd.get(Config.DM_SPAWN_OFFSET), _playerZ);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Gets the _player colors.
-	 * @return the _playerColors
-	 */
-	public static int getPlayerColors()
-	{
-		return _playerColors;
-	}
-	
-	/**
-	 * Set_player colors.
-	 * @param playerColors the _playerColors to set
-	 * @return true, if successful
-	 */
-	public static boolean setPlayerColors(int playerColors)
-	{
-		if (!_inProgress)
-		{
-			DM._playerColors = playerColors;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Reward player.
-	 */
-	public static void rewardPlayer()
-	{
-		for (PlayerInstance _topPlayer : _topPlayers)
-		{
-			_topPlayer.addItem("DM Event: " + _eventName, _rewardId, _rewardAmount, _topPlayer, true);
-			
-			final StatusUpdate su = new StatusUpdate(_topPlayer.getObjectId());
-			su.addAttribute(StatusUpdate.CUR_LOAD, _topPlayer.getCurrentLoad());
-			_topPlayer.sendPacket(su);
-			
-			final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("");
-			replyMSG.append("<html><body>You won the event. Look in your inventory for the reward.</body></html>");
-			nhm.setHtml(replyMSG.toString());
-			_topPlayer.sendPacket(nhm);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			_topPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-	}
-	
-	/**
-	 * Process top player.
-	 */
-	private static void processTopPlayer()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player._countDMkills > _topKills)
-				{
-					_topPlayers.clear();
-					_topPlayers.add(player);
-					_topKills = player._countDMkills;
-				}
-				else if (player._countDMkills == _topKills)
-				{
-					if (!_topPlayers.contains(player))
-					{
-						_topPlayers.add(player);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Process top team.
-	 */
-	private static void processTopTeam()
-	{
-	}
-	
-	/**
-	 * Gets the _players spawn location.
-	 * @return the _players spawn location
-	 */
-	public static Location getPlayersSpawnLocation()
-	{
-		return new Location(_playerX + Rnd.get(Config.DM_SPAWN_OFFSET), _playerY + Rnd.get(Config.DM_SPAWN_OFFSET), _playerZ, 0);
-	}
-	
-	/**
-	 * Sets the players pos.
-	 * @param player the new players pos
-	 */
-	public static void setPlayersPos(PlayerInstance player)
-	{
-		_playerX = player.getX();
-		_playerY = player.getY();
-		_playerZ = player.getZ();
-	}
-	
-	/**
-	 * Removes the user data.
-	 */
-	public static void removeUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorDM);
-				player.setTitle(player._originalTitleDM);
-				player.setKarma(player._originalKarmaDM);
-				player._inEventDM = false;
-				player._countDMkills = 0;
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * just an announcer to send termination messages.
-	 */
-	public static void sendFinalMessages()
-	{
-		if (!_started && !_aborted)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Thank you For participating!");
-		}
-	}
-	
-	/**
-	 * returns the interval between each event.
-	 * @return the interval between matchs
-	 */
-	public static int getIntervalBetweenMatchs()
-	{
-		final long actualTime = Chronos.currentTimeMillis();
-		final long totalTime = actualTime + _intervalBetweenMatches;
-		final long interval = totalTime - actualTime;
-		final int seconds = (int) (interval / 1000);
-		return seconds / 60;
-	}
-	
-	/**
-	 * Sets the event start time.
-	 * @param newTime the new event start time
-	 */
-	public void setEventStartTime(String newTime)
-	{
-		startEventTime = newTime;
-	}
-	
-	@Override
-	public String getEventIdentifier()
-	{
-		return _eventName;
-	}
-	
-	@Override
-	public void run()
-	{
-		LOGGER.info("DM: Event notification start");
-		eventOnceStart();
-	}
-	
-	@Override
-	public String getEventStartTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * On disconnect.
-	 * @param player the player
-	 */
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventDM)
-		{
-			removePlayer(player);
-			player.teleToLocation(_npcX, _npcY, _npcZ);
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/EventManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/EventManager.java
deleted file mode 100644
index c671c2c61a..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/EventManager.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-/**
- * @author Shyla
- */
-public class EventManager
-{
-	protected static final Logger LOGGER = Logger.getLogger(EventManager.class.getName());
-	
-	private static final String EVENT_MANAGER_CONFIGURATION_FILE = "./config/events/EventManager.ini";
-	
-	public static boolean TVT_EVENT_ENABLED;
-	public static List<String> TVT_TIMES_LIST;
-	
-	public static boolean CTF_EVENT_ENABLED;
-	public static List<String> CTF_TIMES_LIST;
-	
-	public static boolean DM_EVENT_ENABLED;
-	public static List<String> DM_TIMES_LIST;
-	
-	private static EventManager instance = null;
-	
-	private EventManager()
-	{
-		loadConfiguration();
-	}
-	
-	public static EventManager getInstance()
-	{
-		if (instance == null)
-		{
-			instance = new EventManager();
-		}
-		return instance;
-	}
-	
-	public static void loadConfiguration()
-	{
-		InputStream is = null;
-		try
-		{
-			final Properties eventSettings = new Properties();
-			is = new FileInputStream(new File(EVENT_MANAGER_CONFIGURATION_FILE));
-			eventSettings.load(is);
-			
-			TVT_EVENT_ENABLED = Boolean.parseBoolean(eventSettings.getProperty("TVTEventEnabled", "false"));
-			TVT_TIMES_LIST = new ArrayList<>();
-			String[] propertySplit;
-			propertySplit = eventSettings.getProperty("TVTStartTime", "").split(";");
-			for (String time : propertySplit)
-			{
-				TVT_TIMES_LIST.add(time);
-			}
-			
-			CTF_EVENT_ENABLED = Boolean.parseBoolean(eventSettings.getProperty("CTFEventEnabled", "false"));
-			CTF_TIMES_LIST = new ArrayList<>();
-			propertySplit = eventSettings.getProperty("CTFStartTime", "").split(";");
-			for (String time : propertySplit)
-			{
-				CTF_TIMES_LIST.add(time);
-			}
-			
-			DM_EVENT_ENABLED = Boolean.parseBoolean(eventSettings.getProperty("DMEventEnabled", "false"));
-			DM_TIMES_LIST = new ArrayList<>();
-			propertySplit = eventSettings.getProperty("DMStartTime", "").split(";");
-			for (String time : propertySplit)
-			{
-				DM_TIMES_LIST.add(time);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-		finally
-		{
-			if (is != null)
-			{
-				try
-				{
-					is.close();
-				}
-				catch (IOException e)
-				{
-					LOGGER.warning(e.toString());
-				}
-			}
-		}
-	}
-	
-	public void startEventRegistration()
-	{
-		if (TVT_EVENT_ENABLED)
-		{
-			registerTvT();
-		}
-		
-		if (CTF_EVENT_ENABLED)
-		{
-			registerCTF();
-		}
-		
-		if (DM_EVENT_ENABLED)
-		{
-			registerDM();
-		}
-	}
-	
-	private void registerTvT()
-	{
-		TvT.loadData();
-		if (!TvT.checkStartJoinOk())
-		{
-			LOGGER.warning("registerTvT: TvT Event is not setted Properly");
-		}
-		
-		EventsGlobalTask.getInstance().clearEventTasksByEventName(TvT.getEventName());
-		
-		for (String time : TVT_TIMES_LIST)
-		{
-			final TvT newInstance = TvT.getNewInstance();
-			newInstance.setEventStartTime(time);
-			EventsGlobalTask.getInstance().registerNewEventTask(newInstance);
-		}
-	}
-	
-	private void registerCTF()
-	{
-		CTF.loadData();
-		if (!CTF.checkStartJoinOk())
-		{
-			LOGGER.warning("registerCTF: CTF Event is not setted Properly");
-		}
-		
-		EventsGlobalTask.getInstance().clearEventTasksByEventName(CTF.getEventName());
-		
-		for (String time : CTF_TIMES_LIST)
-		{
-			final CTF newInstance = CTF.getNewInstance();
-			newInstance.setEventStartTime(time);
-			EventsGlobalTask.getInstance().registerNewEventTask(newInstance);
-		}
-	}
-	
-	private void registerDM()
-	{
-		DM.loadData();
-		if (!DM.checkStartJoinOk())
-		{
-			LOGGER.warning("registerDM: DM Event is not setted Properly");
-		}
-		
-		EventsGlobalTask.getInstance().clearEventTasksByEventName(DM.getEventName());
-		
-		for (String time : DM_TIMES_LIST)
-		{
-			final DM newInstance = DM.getNewInstance();
-			newInstance.setEventStartTime(time);
-			EventsGlobalTask.getInstance().registerNewEventTask(newInstance);
-		}
-	}
-}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
deleted file mode 100644
index 21f3dee2ac..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.EventData;
-
-public class GameEvent
-{
-	protected static final Logger LOGGER = Logger.getLogger(GameEvent.class.getName());
-	
-	public static final Map<Integer, LinkedList<String>> players = new ConcurrentHashMap<>();
-	public static final Map<String, EventData> connectionLossData = new ConcurrentHashMap<>();
-	public static final Map<Integer, String> names = new ConcurrentHashMap<>();
-	public static final List<String> participatingPlayers = new LinkedList<>();
-	public static final List<String> npcs = new LinkedList<>();
-	public static String eventName = "";
-	public static int teamsNumber = 0;
-	public static boolean active = false;
-	public static int id = 12760;
-	
-	public static int getTeamOfPlayer(String name)
-	{
-		for (int i = 1; i <= players.size(); i++)
-		{
-			final LinkedList<String> temp = players.get(i);
-			final Iterator<String> it = temp.iterator();
-			
-			while (it.hasNext())
-			{
-				if (it.next().equals(name))
-				{
-					return i;
-				}
-			}
-		}
-		return 0;
-	}
-	
-	public static String[] getTopNKillers(int n)
-	{
-		// this will return top N players sorted by kills, first element in the array will be the one with more kills
-		final String[] killers = new String[n];
-		String playerTemp = "";
-		int kills = 0;
-		
-		final LinkedList<String> killersTemp = new LinkedList<>();
-		for (int k = 0; k < n; k++)
-		{
-			kills = 0;
-			for (int i = 1; i <= teamsNumber; i++)
-			{
-				final LinkedList<String> temp = players.get(i);
-				final Iterator<String> it = temp.iterator();
-				
-				while (it.hasNext())
-				{
-					try
-					{
-						final PlayerInstance player = World.getInstance().getPlayer(it.next());
-						if (!killersTemp.contains(player.getName()) && (player.kills.size() > kills))
-						{
-							kills = player.kills.size();
-							playerTemp = player.getName();
-						}
-					}
-					catch (Exception e)
-					{
-					}
-				}
-			}
-			
-			killersTemp.add(playerTemp);
-		}
-		
-		for (int i = 0; i < n; i++)
-		{
-			kills = 0;
-			final Iterator<String> it = killersTemp.iterator();
-			
-			while (it.hasNext())
-			{
-				try
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(it.next());
-					if (player.kills.size() > kills)
-					{
-						kills = player.kills.size();
-						playerTemp = player.getName();
-					}
-				}
-				catch (Exception e)
-				{
-				}
-			}
-			
-			killers[i] = playerTemp;
-			killersTemp.remove(playerTemp);
-		}
-		
-		return killers;
-	}
-	
-	public static void showEventHtml(PlayerInstance player, String objectid)
-	{
-		FileInputStream fis = null;
-		BufferedInputStream buff = null;
-		DataInputStream in = null;
-		InputStreamReader isr = null;
-		BufferedReader inbr = null;
-		
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			fis = new FileInputStream("data/events/" + eventName);
-			buff = new BufferedInputStream(fis);
-			in = new DataInputStream(buff);
-			isr = new InputStreamReader(in);
-			inbr = new BufferedReader(isr);
-			
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("<center><font color=\"LEVEL\">" + eventName + "</font><font color=\"FF0000\"> bY " + inbr.readLine() + "</font></center><br>");
-			replyMSG.append("<br>" + inbr.readLine());
-			if (participatingPlayers.contains(player.getName()))
-			{
-				replyMSG.append("<br><center>You are already in the event players list !!</center></body></html>");
-			}
-			else
-			{
-				replyMSG.append("<br><center><button value=\"Participate !! \" action=\"bypass -h npc_" + objectid + "_event_participate\" width=90 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></center></body></html>");
-			}
-			
-			adminReply.setHtml(replyMSG.toString());
-			player.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-		finally
-		{
-			if (inbr != null)
-			{
-				try
-				{
-					inbr.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (isr != null)
-			{
-				try
-				{
-					isr.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (in != null)
-			{
-				try
-				{
-					in.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (buff != null)
-			{
-				try
-				{
-					buff.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (fis != null)
-			{
-				try
-				{
-					fis.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-		}
-	}
-	
-	public static void spawn(PlayerInstance target, int npcid)
-	{
-		final NpcTemplate template1 = NpcTable.getInstance().getTemplate(npcid);
-		
-		try
-		{
-			final Spawn spawn = new Spawn(template1);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
-			spawn.setAmount(1);
-			spawn.setHeading(target.getHeading());
-			spawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(spawn, false);
-			spawn.init();
-			spawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			spawn.getLastSpawn().setName("event inscriptor");
-			spawn.getLastSpawn().setTitle(eventName);
-			spawn.getLastSpawn().isEventMob = true;
-			spawn.getLastSpawn().isAggressive();
-			spawn.getLastSpawn().decayMe();
-			spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ());
-			spawn.getLastSpawn().broadcastPacket(new MagicSkillUse(spawn.getLastSpawn(), spawn.getLastSpawn(), 1034, 1, 1, 1));
-			npcs.add(String.valueOf(spawn.getLastSpawn().getObjectId()));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-	}
-	
-	public static void announceAllPlayers(String text)
-	{
-		final CreatureSay cs = new CreatureSay(0, ChatType.ANNOUNCEMENT, "", text);
-		for (PlayerInstance player : World.getInstance().getAllPlayers())
-		{
-			player.sendPacket(cs);
-		}
-	}
-	
-	public static boolean isOnEvent(PlayerInstance player)
-	{
-		for (int k = 0; k < teamsNumber; k++)
-		{
-			final Iterator<String> it = players.get(k + 1).iterator();
-			boolean temp = false;
-			
-			while (it.hasNext())
-			{
-				temp = player.getName().equalsIgnoreCase(it.next());
-				if (temp)
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public static void inscribePlayer(PlayerInstance player)
-	{
-		try
-		{
-			participatingPlayers.add(player.getName());
-			player.eventKarma = player.getKarma();
-			player.eventX = player.getX();
-			player.eventY = player.getY();
-			player.eventZ = player.getZ();
-			player.eventPkKills = player.getPkKills();
-			player.eventPvpKills = player.getPvpKills();
-			player.eventTitle = player.getTitle();
-			player.kills.clear();
-			player.atEvent = true;
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("error when signing in the event:" + e.getMessage());
-		}
-	}
-	
-	public static void restoreChar(PlayerInstance player)
-	{
-		try
-		{
-			player.eventX = connectionLossData.get(player.getName()).eventX;
-			player.eventY = connectionLossData.get(player.getName()).eventY;
-			player.eventZ = connectionLossData.get(player.getName()).eventZ;
-			player.eventKarma = connectionLossData.get(player.getName()).eventKarma;
-			player.eventPvpKills = connectionLossData.get(player.getName()).eventPvpKills;
-			player.eventPkKills = connectionLossData.get(player.getName()).eventPkKills;
-			player.eventTitle = connectionLossData.get(player.getName()).eventTitle;
-			player.kills = connectionLossData.get(player.getName()).kills;
-			player.eventSitForced = connectionLossData.get(player.getName()).eventSitForced;
-			player.atEvent = true;
-		}
-		catch (Exception e)
-		{
-		}
-	}
-	
-	public static void restoreAndTeleChar(PlayerInstance target)
-	{
-		try
-		{
-			restoreChar(target);
-			target.setTitle(target.eventTitle);
-			target.setKarma(target.eventKarma);
-			target.setPvpKills(target.eventPvpKills);
-			target.setPkKills(target.eventPkKills);
-			target.teleToLocation(target.eventX, target.eventY, target.eventZ);
-			target.kills.clear();
-			target.eventSitForced = false;
-			target.atEvent = false;
-		}
-		catch (Exception e)
-		{
-		}
-	}
-}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/TvT.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/TvT.java
deleted file mode 100644
index f4a5d09942..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/TvT.java
+++ /dev/null
@@ -1,2777 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SkillTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.data.xml.DoorData;
-import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.Ride;
-import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
-
-public class TvT implements EventTask
-{
-	protected static final Logger LOGGER = Logger.getLogger(TvT.class.getName());
-	
-	protected static String _eventName = "";
-	protected static String _eventDesc = "";
-	protected static String _joiningLocationName = "";
-	private static Spawn _npcSpawn;
-	protected static boolean _joining = false;
-	protected static boolean _teleport = false;
-	protected static boolean _started = false;
-	protected static boolean _aborted = false;
-	protected static boolean _sitForced = false;
-	protected static boolean _inProgress = false;
-	protected static int _npcId = 0;
-	protected static int _npcX = 0;
-	protected static int _npcY = 0;
-	protected static int _npcZ = 0;
-	protected static int _npcHeading = 0;
-	protected static int _rewardId = 0;
-	protected static int _rewardAmount = 0;
-	protected static int _minLevel = 0;
-	protected static int _maxLevel = 0;
-	protected static int _joinTime = 0;
-	protected static int _eventTime = 0;
-	protected static int _minPlayers = 0;
-	protected static int _maxPlayers = 0;
-	protected static long _intervalBetweenMatches = 0;
-	private String startEventTime;
-	private static boolean _teamEvent = true; // TODO to be integrated
-	public static List<PlayerInstance> _players = new ArrayList<>();
-	private static String _topTeam = "";
-	public static List<PlayerInstance> _playersShuffle = new ArrayList<>();
-	public static List<String> _teams = new ArrayList<>();
-	public static List<String> _savePlayers = new ArrayList<>();
-	public static List<String> _savePlayerTeams = new ArrayList<>();
-	public static List<Integer> _teamPlayersCount = new ArrayList<>();
-	public static List<Integer> _teamColors = new ArrayList<>();
-	public static List<Integer> _teamsX = new ArrayList<>();
-	public static List<Integer> _teamsY = new ArrayList<>();
-	public static List<Integer> _teamsZ = new ArrayList<>();
-	public static List<Integer> _teamPointsCount = new ArrayList<>();
-	public static int _topKills = 0;
-	
-	/**
-	 * Instantiates a new tvt.
-	 */
-	private TvT()
-	{
-	}
-	
-	/**
-	 * Gets the new instance.
-	 * @return the new instance
-	 */
-	public static TvT getNewInstance()
-	{
-		return new TvT();
-	}
-	
-	/**
-	 * Gets the _event name.
-	 * @return the _eventName
-	 */
-	public static String getEventName()
-	{
-		return _eventName;
-	}
-	
-	/**
-	 * Set_event name.
-	 * @param eventName the _eventName to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventName(String eventName)
-	{
-		if (!_inProgress)
-		{
-			TvT._eventName = eventName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event desc.
-	 * @return the _eventDesc
-	 */
-	public static String getEventDesc()
-	{
-		return _eventDesc;
-	}
-	
-	/**
-	 * Set_event desc.
-	 * @param eventDesc the _eventDesc to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventDesc(String eventDesc)
-	{
-		if (!_inProgress)
-		{
-			TvT._eventDesc = eventDesc;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _joining location name.
-	 * @return the _joiningLocationName
-	 */
-	public static String getJoiningLocationName()
-	{
-		return _joiningLocationName;
-	}
-	
-	/**
-	 * Set_joining location name.
-	 * @param joiningLocationName the _joiningLocationName to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoiningLocationName(String joiningLocationName)
-	{
-		if (!_inProgress)
-		{
-			TvT._joiningLocationName = joiningLocationName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc id.
-	 * @return the _npcId
-	 */
-	public static int getNpcId()
-	{
-		return _npcId;
-	}
-	
-	/**
-	 * Set_npc id.
-	 * @param npcId the _npcId to set
-	 * @return true, if successful
-	 */
-	public static boolean setNpcId(int npcId)
-	{
-		if (!_inProgress)
-		{
-			TvT._npcId = npcId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc location.
-	 * @return the _npc location
-	 */
-	public static Location getNpcLocation()
-	{
-		return new Location(_npcX, _npcY, _npcZ, _npcHeading);
-	}
-	
-	/**
-	 * Gets the _reward id.
-	 * @return the _rewardId
-	 */
-	public static int getRewardId()
-	{
-		return _rewardId;
-	}
-	
-	/**
-	 * Set_reward id.
-	 * @param rewardId the _rewardId to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardId(int rewardId)
-	{
-		if (!_inProgress)
-		{
-			TvT._rewardId = rewardId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _reward amount.
-	 * @return the _rewardAmount
-	 */
-	public static int getRewardAmount()
-	{
-		return _rewardAmount;
-	}
-	
-	/**
-	 * Set_reward amount.
-	 * @param rewardAmount the _rewardAmount to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardAmount(int rewardAmount)
-	{
-		if (!_inProgress)
-		{
-			TvT._rewardAmount = rewardAmount;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _minLevel.
-	 * @return the _minLevel
-	 */
-	public static int getMinLevel()
-	{
-		return _minLevel;
-	}
-	
-	/**
-	 * Set_minLevel.
-	 * @param minLevel the _minLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinlvl(int minLevel)
-	{
-		if (!_inProgress)
-		{
-			TvT._minLevel = minLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _maxLevel.
-	 * @return the _maxLevel
-	 */
-	public static int getMaxLevel()
-	{
-		return _maxLevel;
-	}
-	
-	/**
-	 * Set_maxLevel.
-	 * @param maxLevel the _maxLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxlvl(int maxLevel)
-	{
-		if (!_inProgress)
-		{
-			TvT._maxLevel = maxLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _join time.
-	 * @return the _joinTime
-	 */
-	public static int getJoinTime()
-	{
-		return _joinTime;
-	}
-	
-	/**
-	 * Set_join time.
-	 * @param joinTime the _joinTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoinTime(int joinTime)
-	{
-		if (!_inProgress)
-		{
-			TvT._joinTime = joinTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event time.
-	 * @return the _eventTime
-	 */
-	public static int getEventTime()
-	{
-		return _eventTime;
-	}
-	
-	/**
-	 * Set_event time.
-	 * @param eventTime the _eventTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventTime(int eventTime)
-	{
-		if (!_inProgress)
-		{
-			TvT._eventTime = eventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _min players.
-	 * @return the _minPlayers
-	 */
-	public static int getMinPlayers()
-	{
-		return _minPlayers;
-	}
-	
-	/**
-	 * Set_min players.
-	 * @param minPlayers the _minPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinPlayers(int minPlayers)
-	{
-		if (!_inProgress)
-		{
-			TvT._minPlayers = minPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _max players.
-	 * @return the _maxPlayers
-	 */
-	public static int getMaxPlayers()
-	{
-		return _maxPlayers;
-	}
-	
-	/**
-	 * Set_max players.
-	 * @param maxPlayers the _maxPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxPlayers(int maxPlayers)
-	{
-		if (!_inProgress)
-		{
-			TvT._maxPlayers = maxPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _interval between matches.
-	 * @return the _intervalBetweenMatches
-	 */
-	public static long getIntervalBetweenMatches()
-	{
-		return _intervalBetweenMatches;
-	}
-	
-	/**
-	 * Set_interval between matches.
-	 * @param intervalBetweenMatches the _intervalBetweenMatches to set
-	 * @return true, if successful
-	 */
-	public static boolean setIntervalBetweenMatches(long intervalBetweenMatches)
-	{
-		if (!_inProgress)
-		{
-			TvT._intervalBetweenMatches = intervalBetweenMatches;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the start event time.
-	 * @return the startEventTime
-	 */
-	public String getStartEventTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the start event time.
-	 * @param startEventTime the startEventTime to set
-	 * @return true, if successful
-	 */
-	public boolean setStartEventTime(String startEventTime)
-	{
-		if (!_inProgress)
-		{
-			this.startEventTime = startEventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks if is _joining.
-	 * @return the _joining
-	 */
-	public static boolean isJoining()
-	{
-		return _joining;
-	}
-	
-	/**
-	 * Checks if is _teleport.
-	 * @return the _teleport
-	 */
-	public static boolean isTeleport()
-	{
-		return _teleport;
-	}
-	
-	/**
-	 * Checks if is _started.
-	 * @return the _started
-	 */
-	public static boolean isStarted()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Checks if is _aborted.
-	 * @return the _aborted
-	 */
-	public static boolean isAborted()
-	{
-		return _aborted;
-	}
-	
-	/**
-	 * Checks if is _sit forced.
-	 * @return the _sitForced
-	 */
-	public static boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	/**
-	 * Checks if is _in progress.
-	 * @return the _inProgress
-	 */
-	public static boolean isInProgress()
-	{
-		return _inProgress;
-	}
-	
-	/**
-	 * Check max level.
-	 * @param maxLevel the maxLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxLevel(int maxLevel)
-	{
-		return _minLevel < maxLevel;
-	}
-	
-	/**
-	 * Check min level.
-	 * @param minLevel the minLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMinLevel(int minLevel)
-	{
-		return _maxLevel > minLevel;
-	}
-	
-	/**
-	 * returns true if participated players is higher or equal then minimum needed players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMinPlayers(int players)
-	{
-		return _minPlayers <= players;
-	}
-	
-	/**
-	 * returns true if max players is higher or equal then participated players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxPlayers(int players)
-	{
-		return _maxPlayers > players;
-	}
-	
-	/**
-	 * Check start join ok.
-	 * @return true, if successful
-	 */
-	public static boolean checkStartJoinOk()
-	{
-		if (_started || _teleport || _joining || _eventName.equals("") || _joiningLocationName.equals("") || _eventDesc.equals("") || (_npcId == 0) || (_npcX == 0) || (_npcY == 0) || (_npcZ == 0) || (_rewardId == 0) || (_rewardAmount == 0))
-		{
-			return false;
-		}
-		
-		if (_teamEvent)
-		{
-			if (!checkStartJoinTeamInfo())
-			{
-				return false;
-			}
-		}
-		else if (!checkStartJoinPlayerInfo())
-		{
-			return false;
-		}
-		
-		if (!Config.ALLOW_EVENTS_DURING_OLY && Olympiad.getInstance().inCompPeriod())
-		{
-			return false;
-		}
-		
-		for (Castle castle : CastleManager.getInstance().getCastles())
-		{
-			if ((castle != null) && (castle.getSiege() != null) && castle.getSiege().isInProgress())
-			{
-				return false;
-			}
-		}
-		
-		if (!checkOptionalEventStartJoinOk())
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Check start join team info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinTeamInfo()
-	{
-		return (_teams.size() >= 2) && !_teamsX.contains(0) && !_teamsY.contains(0) && !_teamsZ.contains(0);
-	}
-	
-	/**
-	 * Check start join player info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinPlayerInfo()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Check auto event start join ok.
-	 * @return true, if successful
-	 */
-	protected static boolean checkAutoEventStartJoinOk()
-	{
-		return (_joinTime != 0) && (_eventTime != 0);
-	}
-	
-	/**
-	 * Check optional event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkOptionalEventStartJoinOk()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Sets the npc pos.
-	 * @param player the new npc pos
-	 */
-	public static void setNpcPos(PlayerInstance player)
-	{
-		_npcX = player.getX();
-		_npcY = player.getY();
-		_npcZ = player.getZ();
-		_npcHeading = player.getHeading();
-	}
-	
-	/**
-	 * Spawn event npc.
-	 */
-	private static void spawnEventNpc()
-	{
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_npcId);
-		
-		try
-		{
-			_npcSpawn = new Spawn(tmpl);
-			_npcSpawn.setX(_npcX);
-			_npcSpawn.setY(_npcY);
-			_npcSpawn.setZ(_npcZ);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(_npcHeading);
-			_npcSpawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_npcSpawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			_npcSpawn.getLastSpawn().setTitle(_eventName);
-			_npcSpawn.getLastSpawn()._isEventMobTvT = true;
-			_npcSpawn.getLastSpawn().isAggressive();
-			_npcSpawn.getLastSpawn().decayMe();
-			_npcSpawn.getLastSpawn().spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_npcSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_npcSpawn.getLastSpawn(), _npcSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[spawnEventNpc(exception: " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Unspawn event npc.
-	 */
-	private static void unspawnEventNpc()
-	{
-		if ((_npcSpawn == null) || (_npcSpawn.getLastSpawn() == null))
-		{
-			return;
-		}
-		
-		_npcSpawn.getLastSpawn().deleteMe();
-		_npcSpawn.stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_npcSpawn, true);
-	}
-	
-	/**
-	 * Start join.
-	 * @return true, if successful
-	 */
-	public static boolean startJoin()
-	{
-		if (!checkStartJoinOk())
-		{
-			return false;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		spawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Event " + _eventName + "!");
-		if (Config.TVT_ANNOUNCE_REWARD && (ItemTable.getInstance().getTemplate(_rewardId) != null))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
-		}
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + ".");
-		if (Config.TVT_COMMAND)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Commands .tvtjoin .tvtleave .tvtinfo");
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Start teleport.
-	 * @return true, if successful
-	 */
-	public static boolean startTeleport()
-	{
-		if (!_joining || _started || _teleport)
-		{
-			return false;
-		}
-		
-		removeOfflinePlayers();
-		
-		if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && checkMinPlayers(_playersShuffle.size()))
-		{
-			shuffleTeams();
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && !checkMinPlayers(_playersShuffle.size()))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-			if (Config.CTF_STATS_LOGGER)
-			{
-				LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-			}
-			
-			return false;
-		}
-		
-		_joining = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport to team spot in 20 seconds!");
-		setUserData();
-		ThreadPool.schedule(() ->
-		{
-			sit();
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// Remove Summon's buffs
-						if (Config.TVT_ON_START_UNSUMMON_PET && (player.getPet() != null))
-						{
-							final Summon summon = player.getPet();
-							summon.stopAllEffects();
-							
-							if (summon instanceof PetInstance)
-							{
-								summon.unSummon(player);
-							}
-						}
-						
-						if (Config.TVT_ON_START_REMOVE_ALL_EFFECTS)
-						{
-							player.stopAllEffects();
-						}
-						
-						// Remove player from his party
-						if (player.getParty() != null)
-						{
-							final Party party = player.getParty();
-							party.removePartyMember(player);
-						}
-						
-						player.teleToLocation((_teamsX.get(_teams.indexOf(player._teamNameTvT)) + Rnd.get(201)) - 100, (_teamsY.get(_teams.indexOf(player._teamNameTvT)) + Rnd.get(201)) - 100, _teamsZ.get(_teams.indexOf(player._teamNameTvT)));
-					}
-				}
-			}
-		}, 20000);
-		_teleport = true;
-		return true;
-	}
-	
-	/**
-	 * Start event.
-	 * @return true, if successful
-	 */
-	public static boolean startEvent()
-	{
-		if (!startEventOk())
-		{
-			return false;
-		}
-		
-		_teleport = false;
-		sit();
-		
-		if (Config.TVT_CLOSE_FORT_DOORS)
-		{
-			closeFortDoors();
-		}
-		
-		if (Config.TVT_CLOSE_ADEN_COLOSSEUM_DOORS)
-		{
-			closeAdenColosseumDoors();
-		}
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Started. Go to kill your enemies!");
-		_started = true;
-		return true;
-	}
-	
-	/**
-	 * Restarts Event checks if event was aborted. and if true cancels restart task
-	 */
-	public static synchronized void restartEvent()
-	{
-		LOGGER.info(_eventName + ": Event has been restarted...");
-		_joining = false;
-		_started = false;
-		_inProgress = false;
-		_aborted = false;
-		final long delay = _intervalBetweenMatches;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": joining period will be avaible again in " + _intervalBetweenMatches + " minute(s)!");
-		waiter(delay);
-		
-		try
-		{
-			if (!_aborted)
-			{
-				autoEvent(); // start a new event
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": next event aborted!");
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + ": Error While Trying to restart Event... " + e);
-		}
-	}
-	
-	/**
-	 * Finish event.
-	 */
-	public static void finishEvent()
-	{
-		if (!finishEventOk())
-		{
-			return;
-		}
-		
-		_started = false;
-		_aborted = false;
-		unspawnEventNpc();
-		
-		afterFinishOperations();
-		
-		if (_teamEvent)
-		{
-			processTopTeam();
-			synchronized (_players)
-			{
-				final PlayerInstance bestKiller = findBestKiller(_players);
-				final PlayerInstance looser = findLooser(_players);
-				if (_topKills != 0)
-				{
-					playKneelAnimation(_topTeam);
-					
-					if (Config.TVT_ANNOUNCE_TEAM_STATS)
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + " Team Statistics:");
-						for (String team : _teams)
-						{
-							final int _kills = teamKillsCount(team);
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Team: " + team + " - Kills: " + _kills);
-						}
-						
-						if (bestKiller != null)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Top killer: " + bestKiller.getName() + " - Kills: " + bestKiller._countTvTkills);
-						}
-						if ((looser != null) && (!looser.equals(bestKiller)))
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Top looser: " + looser.getName() + " - Dies: " + looser._countTvTdies);
-						}
-					}
-					
-					if (_topTeam != null)
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + _topTeam + "'s win the match! " + _topKills + " kills.");
-					}
-					else
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: " + _topKills + " kills by each team!");
-					}
-					rewardTeam(_topTeam, bestKiller, looser);
-					if (Config.TVT_STATS_LOGGER)
-					{
-						LOGGER.info("**** " + _eventName + " ****");
-						LOGGER.info(_eventName + " Team Statistics:");
-						for (String team : _teams)
-						{
-							final int _kills = teamKillsCount(team);
-							LOGGER.info("Team: " + team + " - Kills: " + _kills);
-						}
-						
-						if (bestKiller != null)
-						{
-							LOGGER.info("Top killer: " + bestKiller.getName() + " - Kills: " + bestKiller._countTvTkills);
-						}
-						if ((looser != null) && (!looser.equals(bestKiller)))
-						{
-							LOGGER.info("Top looser: " + looser.getName() + " - Dies: " + looser._countTvTdies);
-						}
-						
-						LOGGER.info(_eventName + ": " + _topTeam + "'s win the match! " + _topKills + " kills.");
-					}
-				}
-				else
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: No team wins the match(nobody killed)!");
-					if (Config.TVT_STATS_LOGGER)
-					{
-						LOGGER.info(_eventName + ": No team win the match(nobody killed).");
-					}
-					
-					rewardTeam(_topTeam, bestKiller, looser);
-				}
-			}
-		}
-		else
-		{
-			processTopPlayer();
-		}
-		
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish operations.
-	 */
-	private static void afterFinishOperations()
-	{
-		if (Config.TVT_OPEN_FORT_DOORS)
-		{
-			openFortDoors();
-		}
-		
-		if (Config.TVT_OPEN_ADEN_COLOSSEUM_DOORS)
-		{
-			openAdenColosseumDoors();
-		}
-	}
-	
-	/**
-	 * Abort event.
-	 */
-	public static void abortEvent()
-	{
-		if (!_joining && !_teleport && !_started)
-		{
-			return;
-		}
-		
-		if (_joining && !_teleport && !_started)
-		{
-			unspawnEventNpc();
-			cleanTvT();
-			_joining = false;
-			_inProgress = false;
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-			return;
-		}
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_aborted = true;
-		unspawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-		teleportFinish();
-	}
-	
-	/**
-	 * Teleport finish.
-	 */
-	public static void teleportFinish()
-	{
-		sit();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport back to participation NPC in 20 seconds!");
-		ThreadPool.schedule(() ->
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						if (player.isOnline())
-						{
-							player.teleToLocation(_npcX, _npcY, _npcZ);
-						}
-						else
-						{
-							try (Connection con = DatabaseFactory.getConnection())
-							{
-								final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=? WHERE char_name=?");
-								statement.setInt(1, _npcX);
-								statement.setInt(2, _npcY);
-								statement.setInt(3, _npcZ);
-								statement.setString(4, player.getName());
-								statement.execute();
-								statement.close();
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning(e.getMessage());
-							}
-						}
-					}
-				}
-			}
-			
-			sit();
-			cleanTvT();
-		}, 20000);
-	}
-	
-	protected static class AutoEventTask implements Runnable
-	{
-		@Override
-		public void run()
-		{
-			LOGGER.info("Starting " + _eventName + "!");
-			LOGGER.info("Matchs Are Restarted At Every: " + getIntervalBetweenMatchs() + " Minutes.");
-			if (checkAutoEventStartJoinOk() && startJoin() && !_aborted)
-			{
-				if (_joinTime > 0)
-				{
-					waiter(_joinTime * 60 * 1000); // minutes for join event
-				}
-				else if (_joinTime <= 0)
-				{
-					LOGGER.info(_eventName + ": join time <=0 aborting event.");
-					abortEvent();
-					return;
-				}
-				if (startTeleport() && !_aborted)
-				{
-					waiter(30 * 1000); // 30 sec wait time until start fight after teleported
-					if (startEvent() && !_aborted)
-					{
-						LOGGER.warning(_eventName + ": waiting.....minutes for event time " + _eventTime);
-						waiter(_eventTime * 60 * 1000); // minutes for event time
-						finishEvent();
-						
-						LOGGER.info(_eventName + ": waiting... delay for final messages ");
-						waiter(60000); // just a give a delay delay for final messages
-						sendFinalMessages();
-						
-						if (!_started && !_aborted) // if is not already started and it's not aborted
-						{
-							LOGGER.info(_eventName + ": waiting.....delay for restart event  " + _intervalBetweenMatches + " minutes.");
-							waiter(60000); // just a give a delay to next restart
-							
-							try
-							{
-								if (!_aborted)
-								{
-									restartEvent();
-								}
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning("Error while tying to Restart Event " + e);
-							}
-						}
-					}
-				}
-				else if (!_aborted)
-				{
-					abortEvent();
-					restartEvent();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Auto event.
-	 */
-	public static void autoEvent()
-	{
-		ThreadPool.execute(new AutoEventTask());
-	}
-	
-	/**
-	 * Event once start.
-	 */
-	public static void eventOnceStart()
-	{
-		if (startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(1 * 60 * 1000); // 1 min wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Waiter.
-	 * @param interval the interval
-	 */
-	protected static void waiter(long interval)
-	{
-		final long startWaiterTime = Chronos.currentTimeMillis();
-		int seconds = (int) (interval / 1000);
-		
-		while (((startWaiterTime + interval) > Chronos.currentTimeMillis()) && !_aborted)
-		{
-			seconds--; // Here because we don't want to see two time announce at the same time
-			if (_joining || _started || _teleport)
-			{
-				switch (seconds)
-				{
-					case 3600: // 1 hour left
-					{
-						removeOfflinePlayers();
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till event finish!");
-						}
-						break;
-					}
-					case 1800: // 30 minutes left
-					case 900: // 15 minutes left
-					case 600: // 10 minutes left
-					case 300: // 5 minutes left
-					case 240: // 4 minutes left
-					case 180: // 3 minutes left
-					case 120: // 2 minutes left
-					case 60: // 1 minute left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till event finish!");
-						}
-						break;
-					}
-					case 30: // 30 seconds left
-					case 15: // 15 seconds left
-					case 10: // 10 seconds left
-					{
-						removeOfflinePlayers();
-						// fallthrough?
-					}
-					case 3: // 3 seconds left
-					case 2: // 2 seconds left
-					case 1: // 1 seconds left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till registration close!");
-						}
-						else if (_teleport)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " seconds(s) till start fight!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till event finish!");
-						}
-						break;
-					}
-				}
-			}
-			
-			final long startOneSecondWaiterStartTime = Chronos.currentTimeMillis();
-			
-			// Only the try catch with Thread.sleep(1000) give bad countdown on high wait times
-			while ((startOneSecondWaiterStartTime + 1000) > Chronos.currentTimeMillis())
-			{
-				try
-				{
-					Thread.sleep(1);
-				}
-				catch (InterruptedException e)
-				{
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Sit.
-	 */
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (_sitForced)
-					{
-						player.stopMove(null, false);
-						player.abortAttack();
-						player.abortCast();
-						
-						if (!player.isSitting())
-						{
-							player.sitDown();
-						}
-					}
-					else if (player.isSitting())
-					{
-						player.standUp();
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Removes the offline players.
-	 */
-	public static void removeOfflinePlayers()
-	{
-		try
-		{
-			if ((_playersShuffle == null) || _playersShuffle.isEmpty())
-			{
-				return;
-			}
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player == null)
-				{
-					_playersShuffle.remove(player);
-				}
-				else if (!player.isOnline() || player.isInJail() || player.isInOfflineMode())
-				{
-					removePlayer(player);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-	}
-	
-	/**
-	 * Start event ok.
-	 * @return true, if successful
-	 */
-	private static boolean startEventOk()
-	{
-		if (_joining || !_teleport || _started)
-		{
-			return false;
-		}
-		
-		if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-		{
-			if (_teamPlayersCount.contains(0))
-			{
-				return false;
-			}
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			final List<PlayerInstance> playersShuffleTemp = new ArrayList<>();
-			int loopCount = 0;
-			loopCount = _playersShuffle.size();
-			for (int i = 0; i < loopCount; i++)
-			{
-				playersShuffleTemp.add(_playersShuffle.get(i));
-			}
-			
-			_playersShuffle = playersShuffleTemp;
-			playersShuffleTemp.clear();
-		}
-		return true;
-	}
-	
-	/**
-	 * Finish event ok.
-	 * @return true, if successful
-	 */
-	private static boolean finishEventOk()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Adds the player ok.
-	 * @param teamName the team name
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	private static boolean addPlayerOk(String teamName, PlayerInstance eventPlayer)
-	{
-		if (eventPlayer.isAio() && !Config.ALLOW_AIO_IN_EVENTS)
-		{
-			eventPlayer.sendMessage("AIO charactes are not allowed to participate in events :/");
-		}
-		if (checkShufflePlayers(eventPlayer) || eventPlayer._inEventTvT)
-		{
-			eventPlayer.sendMessage("You already participated in the event!");
-			return false;
-		}
-		
-		if (eventPlayer._inEventCTF || eventPlayer._inEventDM)
-		{
-			eventPlayer.sendMessage("You already participated in another event!");
-			return false;
-		}
-		
-		if (Olympiad.getInstance().isRegistered(eventPlayer) || eventPlayer.isInOlympiadMode())
-		{
-			eventPlayer.sendMessage("You already participated in Olympiad!");
-			return false;
-		}
-		
-		if ((eventPlayer._activeBoxes > 1) && !Config.ALLOW_DUALBOX_EVENT)
-		{
-			final List<String> playerBoxes = eventPlayer._activeBoxCharacters;
-			if ((playerBoxes != null) && (playerBoxes.size() > 1))
-			{
-				for (String character_name : playerBoxes)
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(character_name);
-					if ((player != null) && player._inEventTvT)
-					{
-						eventPlayer.sendMessage("You already participated in event with another char!");
-						return false;
-					}
-				}
-			}
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-				else if (player.getName().equalsIgnoreCase(eventPlayer.getName()))
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-			}
-			
-			if (_players.contains(eventPlayer))
-			{
-				eventPlayer.sendMessage("You already participated in the event!");
-				return false;
-			}
-		}
-		
-		if (Config.TVT_EVEN_TEAMS.equals("NO"))
-		{
-			return true;
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-		{
-			boolean allTeamsEqual = true;
-			int countBefore = -1;
-			for (int playersCount : _teamPlayersCount)
-			{
-				if (countBefore == -1)
-				{
-					countBefore = playersCount;
-				}
-				
-				if (countBefore != playersCount)
-				{
-					allTeamsEqual = false;
-					break;
-				}
-				
-				countBefore = playersCount;
-			}
-			
-			if (allTeamsEqual)
-			{
-				return true;
-			}
-			
-			countBefore = Integer.MAX_VALUE;
-			for (int teamPlayerCount : _teamPlayersCount)
-			{
-				if (teamPlayerCount < countBefore)
-				{
-					countBefore = teamPlayerCount;
-				}
-			}
-			
-			final List<String> joinableTeams = new ArrayList<>();
-			for (String team : _teams)
-			{
-				if (teamPlayersCount(team) == countBefore)
-				{
-					joinableTeams.add(team);
-				}
-			}
-			
-			if (joinableTeams.contains(teamName))
-			{
-				return true;
-			}
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			return true;
-		}
-		
-		eventPlayer.sendMessage("Too many players in team \"" + teamName + "\"");
-		return false;
-	}
-	
-	/**
-	 * Sets the user data.
-	 */
-	public static void setUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player._originalNameColorTvT = player.getAppearance().getNameColor();
-				player._originalKarmaTvT = player.getKarma();
-				player._originalTitleTvT = player.getTitle();
-				player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameTvT)));
-				player.setKarma(0);
-				player.setTitle("Kills: " + player._countTvTkills);
-				if (Config.TVT_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(_teams.indexOf(player._teamNameTvT) + 1);
-				}
-				
-				if (player.isMounted() && player.setMountType(0))
-				{
-					if (player.isFlying())
-					{
-						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
-					}
-					
-					player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
-					player.setMountObjectID(0);
-				}
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * Dump data.
-	 */
-	public static void dumpData()
-	{
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		if (!_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (INACTIVE) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (JOINING) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		else if (!_joining && _teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (TELEPORT) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (!_joining && !_teleport && _started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (STARTED) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		
-		LOGGER.info("Name: " + _eventName);
-		LOGGER.info("Desc: " + _eventDesc);
-		LOGGER.info("Join location: " + _joiningLocationName);
-		LOGGER.info("Min lvl: " + _minLevel);
-		LOGGER.info("Max lvl: " + _maxLevel);
-		LOGGER.info("");
-		LOGGER.info("##########################");
-		LOGGER.info("# _teams(List<String>) #");
-		LOGGER.info("##########################");
-		
-		for (String team : _teams)
-		{
-			LOGGER.info(team + " Kills Done :" + _teamPointsCount.get(_teams.indexOf(team)));
-		}
-		
-		if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			LOGGER.info("");
-			LOGGER.info("#########################################");
-			LOGGER.info("# _playersShuffle(List<PlayerInstance>) #");
-			LOGGER.info("#########################################");
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName());
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("##################################");
-		LOGGER.info("# _players(List<PlayerInstance>) #");
-		LOGGER.info("##################################");
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName() + "   Team: " + player._teamNameTvT + "  Kills Done:" + player._countTvTkills);
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("#####################################################################");
-		LOGGER.info("# _savePlayers(List<String>) and _savePlayerTeams(List<String>) #");
-		LOGGER.info("#####################################################################");
-		
-		for (String player : _savePlayers)
-		{
-			LOGGER.info("Name: " + player + "	Team: " + _savePlayerTeams.get(_savePlayers.indexOf(player)));
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		dumpLocalEventInfo();
-	}
-	
-	/**
-	 * Dump local event info.
-	 */
-	private static void dumpLocalEventInfo()
-	{
-	}
-	
-	/**
-	 * Load data.
-	 */
-	public static void loadData()
-	{
-		_eventName = "";
-		_eventDesc = "";
-		_joiningLocationName = "";
-		_savePlayers = new ArrayList<>();
-		_players = new ArrayList<>();
-		_topTeam = "";
-		_teams = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_playersShuffle = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamColors = new ArrayList<>();
-		_teamsX = new ArrayList<>();
-		_teamsY = new ArrayList<>();
-		_teamsZ = new ArrayList<>();
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_sitForced = false;
-		_aborted = false;
-		_inProgress = false;
-		_npcId = 0;
-		_npcX = 0;
-		_npcY = 0;
-		_npcZ = 0;
-		_npcHeading = 0;
-		_rewardId = 0;
-		_rewardAmount = 0;
-		_topKills = 0;
-		_minLevel = 0;
-		_maxLevel = 0;
-		_joinTime = 0;
-		_eventTime = 0;
-		_minPlayers = 0;
-		_maxPlayers = 0;
-		_intervalBetweenMatches = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			ResultSet rs;
-			statement = con.prepareStatement("Select * from tvt");
-			rs = statement.executeQuery();
-			int teams = 0;
-			
-			while (rs.next())
-			{
-				_eventName = rs.getString("eventName");
-				_eventDesc = rs.getString("eventDesc");
-				_joiningLocationName = rs.getString("joiningLocation");
-				_minLevel = rs.getInt("minLevel");
-				_maxLevel = rs.getInt("maxLevel");
-				_npcId = rs.getInt("npcId");
-				_npcX = rs.getInt("npcX");
-				_npcY = rs.getInt("npcY");
-				_npcZ = rs.getInt("npcZ");
-				_npcHeading = rs.getInt("npcHeading");
-				_rewardId = rs.getInt("rewardId");
-				_rewardAmount = rs.getInt("rewardAmount");
-				teams = rs.getInt("teamsCount");
-				_joinTime = rs.getInt("joinTime");
-				_eventTime = rs.getInt("eventTime");
-				_minPlayers = rs.getInt("minPlayers");
-				_maxPlayers = rs.getInt("maxPlayers");
-				_intervalBetweenMatches = rs.getLong("delayForNextEvent");
-			}
-			statement.close();
-			
-			int index = -1;
-			if (teams > 0)
-			{
-				index = 0;
-			}
-			while ((index < teams) && (index > -1))
-			{
-				statement = con.prepareStatement("Select * from tvt_teams where teamId = ?");
-				statement.setInt(1, index);
-				rs = statement.executeQuery();
-				while (rs.next())
-				{
-					_teams.add(rs.getString("teamName"));
-					_teamPlayersCount.add(0);
-					_teamPointsCount.add(0);
-					_teamColors.add(0);
-					_teamsX.add(0);
-					_teamsY.add(0);
-					_teamsZ.add(0);
-					_teamsX.set(index, rs.getInt("teamX"));
-					_teamsY.set(index, rs.getInt("teamY"));
-					_teamsZ.set(index, rs.getInt("teamZ"));
-					_teamColors.set(index, rs.getInt("teamColor"));
-				}
-				index++;
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: loadData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Save data.
-	 */
-	public static void saveData()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			statement = con.prepareStatement("Delete from tvt");
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("INSERT INTO tvt (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)");
-			statement.setString(1, _eventName);
-			statement.setString(2, _eventDesc);
-			statement.setString(3, _joiningLocationName);
-			statement.setInt(4, _minLevel);
-			statement.setInt(5, _maxLevel);
-			statement.setInt(6, _npcId);
-			statement.setInt(7, _npcX);
-			statement.setInt(8, _npcY);
-			statement.setInt(9, _npcZ);
-			statement.setInt(10, _npcHeading);
-			statement.setInt(11, _rewardId);
-			statement.setInt(12, _rewardAmount);
-			statement.setInt(13, _teams.size());
-			statement.setInt(14, _joinTime);
-			statement.setInt(15, _eventTime);
-			statement.setInt(16, _minPlayers);
-			statement.setInt(17, _maxPlayers);
-			statement.setLong(18, _intervalBetweenMatches);
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("Delete from tvt_teams");
-			statement.execute();
-			statement.close();
-			
-			for (String teamName : _teams)
-			{
-				final int index = _teams.indexOf(teamName);
-				if (index == -1)
-				{
-					con.close();
-					return;
-				}
-				statement = con.prepareStatement("INSERT INTO tvt_teams (teamId ,teamName, teamX, teamY, teamZ, teamColor) VALUES (?, ?, ?, ?, ?, ?)");
-				statement.setInt(1, index);
-				statement.setString(2, teamName);
-				statement.setInt(3, _teamsX.get(index));
-				statement.setInt(4, _teamsY.get(index));
-				statement.setInt(5, _teamsZ.get(index));
-				statement.setInt(6, _teamColors.get(index));
-				statement.execute();
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: saveData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Show event html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 */
-	public static void showEventHtml(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><title>" + _eventName + "</title><body>");
-			replyMSG.append("<center><img src=\"L2UI_CH3.herotower_deco\" width=256 height=32></center><br1>");
-			replyMSG.append("<center><font color=\"3366CC\">Current event:</font></center><br1>");
-			replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
-			replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
-			if (!_started && !_joining)
-			{
-				replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
-			}
-			else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && !checkMaxPlayers(_playersShuffle.size()))
-			{
-				if (!_started)
-				{
-					replyMSG.append("Currently participated: <font color=\"00FF00\">" + _playersShuffle.size() + ".</font><br>");
-					replyMSG.append("Max players: <font color=\"00FF00\">" + _maxPlayers + "</font><br><br>");
-					replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-				}
-			}
-			else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
-			{
-				synchronized (_players)
-				{
-					if (_players.contains(eventPlayer) || _playersShuffle.contains(eventPlayer) || checkShufflePlayers(eventPlayer))
-					{
-						if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("You participated already in team <font color=\"LEVEL\">" + eventPlayer._teamNameTvT + "</font><br><br>");
-						}
-						else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center><font color=\"3366CC\">You participated already!</font></center><br><br>");
-						}
-						
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _playersShuffle.size() + "</font></center><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Wait till event start or remove your participation!</font><center>");
-						replyMSG.append("<center><button value=\"Remove\" action=\"bypass -h npc_" + objectId + "_tvt_player_leave\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-					}
-					else
-					{
-						replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
-						replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
-						replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Teams:</font></center><br>");
-						if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("<center><table border=\"0\">");
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font>&nbsp;(" + teamPlayersCount(team) + " joined)</td>");
-								replyMSG.append("<center><td width=\"60\"><button value=\"Join\" action=\"bypass -h npc_" + objectId + "_tvt_player_join " + team + "\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center></td></tr>");
-							}
-							replyMSG.append("</table></center>");
-						}
-						else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center>");
-							
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font> &nbsp;</td>");
-							}
-							
-							replyMSG.append("</center><br>");
-							
-							replyMSG.append("<center><button value=\"Join Event\" action=\"bypass -h npc_" + objectId + "_tvt_player_join eventShuffle\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-							replyMSG.append("<center><font color=\"3366CC\">Teams will be reandomly generated!</font></center><br>");
-							replyMSG.append("<center>Joined Players:</font> <font color=\"LEVEL\">" + _playersShuffle.size() + "</center></font><br>");
-							replyMSG.append("<center>Reward: <font color=\"LEVEL\">" + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName() + "</center></font>");
-						}
-					}
-				}
-			}
-			else if (_started && !_joining)
-			{
-				replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
-			}
-			else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
-			{
-				replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
-				replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
-				replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
-				replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			eventPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Adds the player.
-	 * @param player the player
-	 * @param teamName the team name
-	 */
-	public static void addPlayer(PlayerInstance player, String teamName)
-	{
-		if (!addPlayerOk(teamName, player))
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-			{
-				player._teamNameTvT = teamName;
-				_players.add(player);
-				setTeamPlayersCount(teamName, teamPlayersCount(teamName) + 1);
-			}
-			else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				_playersShuffle.add(player);
-			}
-		}
-		
-		player._inEventTvT = true;
-		player._countTvTkills = 0;
-		player.sendMessage(_eventName + ": You successfully registered for the event.");
-	}
-	
-	/**
-	 * Removes the player.
-	 * @param player the player
-	 */
-	public static void removePlayer(PlayerInstance player)
-	{
-		if (player._inEventTvT)
-		{
-			if (!_joining)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorTvT);
-				player.setTitle(player._originalTitleTvT);
-				player.setKarma(player._originalKarmaTvT);
-				if (Config.TVT_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(0); // clear aura :P
-				}
-				player.broadcastUserInfo();
-			}
-			
-			// after remove, all event data must be cleaned in player
-			player._originalNameColorTvT = 0;
-			player._originalTitleTvT = null;
-			player._originalKarmaTvT = 0;
-			player._teamNameTvT = "";
-			player._countTvTkills = 0;
-			player._inEventTvT = false;
-			
-			synchronized (_players)
-			{
-				if ((Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE")) && _players.contains(player))
-				{
-					setTeamPlayersCount(player._teamNameTvT, teamPlayersCount(player._teamNameTvT) - 1);
-					_players.remove(player);
-				}
-				else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && (!_playersShuffle.isEmpty() && _playersShuffle.contains(player)))
-				{
-					_playersShuffle.remove(player);
-				}
-			}
-			
-			player.sendMessage("Your participation in the TvT event has been removed.");
-		}
-	}
-	
-	/**
-	 * Clean tvt.
-	 */
-	public static void cleanTvT()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					cleanEventPlayer(player);
-					
-					removePlayer(player);
-					if (_savePlayers.contains(player.getName()))
-					{
-						_savePlayers.remove(player.getName());
-					}
-					player._inEventTvT = false;
-				}
-			}
-		}
-		
-		if ((_playersShuffle != null) && !_playersShuffle.isEmpty())
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					player._inEventTvT = false;
-				}
-			}
-		}
-		
-		_topKills = 0;
-		_topTeam = "";
-		_players = new ArrayList<>();
-		_playersShuffle = new ArrayList<>();
-		_savePlayers = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		cleanLocalEventInfo();
-		
-		_inProgress = false;
-		loadData();
-	}
-	
-	/**
-	 * Clean local event info.
-	 */
-	private static void cleanLocalEventInfo()
-	{
-		// nothing
-	}
-	
-	/**
-	 * Clean event player.
-	 * @param player the player
-	 */
-	private static void cleanEventPlayer(PlayerInstance player)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Adds the disconnected player.
-	 * @param player the player
-	 */
-	public static synchronized void addDisconnectedPlayer(PlayerInstance player)
-	{
-		if ((Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && (_teleport || _started)) || (Config.TVT_EVEN_TEAMS.equals("NO") || (Config.TVT_EVEN_TEAMS.equals("BALANCE") && (_teleport || _started))))
-		{
-			if (Config.TVT_ON_START_REMOVE_ALL_EFFECTS)
-			{
-				player.stopAllEffects();
-			}
-			
-			player._teamNameTvT = _savePlayerTeams.get(_savePlayers.indexOf(player.getName()));
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance p : _players)
-				{
-					if (p == null)
-					{
-						continue;
-					}
-					
-					// check by name incase player got new objectId
-					if (p.getName().equals(player.getName()))
-					{
-						player._originalNameColorTvT = player.getAppearance().getNameColor();
-						player._originalTitleTvT = player.getTitle();
-						player._originalKarmaTvT = player.getKarma();
-						player._inEventTvT = true;
-						player._countTvTkills = p._countTvTkills;
-						_players.remove(p); // removing old object id from vector
-						_players.add(player); // adding new objectId to vector
-						break;
-					}
-				}
-			}
-			
-			player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameTvT)));
-			player.setKarma(0);
-			if (Config.TVT_AURA && (_teams.size() >= 2))
-			{
-				player.setTeam(_teams.indexOf(player._teamNameTvT) + 1);
-			}
-			player.broadcastUserInfo();
-			
-			player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameTvT)), _teamsY.get(_teams.indexOf(player._teamNameTvT)), _teamsZ.get(_teams.indexOf(player._teamNameTvT)));
-			afterAddDisconnectedPlayerOperations(player);
-		}
-	}
-	
-	/**
-	 * After add disconnected player operations.
-	 * @param player the player
-	 */
-	private static void afterAddDisconnectedPlayerOperations(PlayerInstance player)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Shuffle teams.
-	 */
-	public static void shuffleTeams()
-	{
-		int teamCount = 0;
-		int playersCount = 0;
-		
-		synchronized (_players)
-		{
-			for (;;)
-			{
-				if (_playersShuffle.isEmpty())
-				{
-					break;
-				}
-				
-				final int playerToAddIndex = Rnd.get(_playersShuffle.size());
-				PlayerInstance player = null;
-				player = _playersShuffle.get(playerToAddIndex);
-				_players.add(player);
-				_players.get(playersCount)._teamNameTvT = _teams.get(teamCount);
-				_savePlayers.add(_players.get(playersCount).getName());
-				_savePlayerTeams.add(_teams.get(teamCount));
-				playersCount++;
-				
-				if (teamCount == (_teams.size() - 1))
-				{
-					teamCount = 0;
-				}
-				else
-				{
-					teamCount++;
-				}
-				
-				_playersShuffle.remove(playerToAddIndex);
-			}
-		}
-	}
-	
-	/**
-	 * Play kneel animation.
-	 * @param teamName the team name
-	 */
-	public static void playKneelAnimation(String teamName)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (!player._teamNameTvT.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 7));
-					}
-					else if (player._teamNameTvT.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 3));
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Reward team.
-	 * @param teamName the team name
-	 * @param bestKiller the best killer
-	 * @param looser the looser
-	 */
-	public static void rewardTeam(String teamName, PlayerInstance bestKiller, PlayerInstance looser)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if ((player != null) && player.isOnline() && (player._inEventTvT) && (!player.equals(looser)) && ((player._countTvTkills > 0) || Config.TVT_PRICE_NO_KILLS))
-				{
-					if ((bestKiller != null) && (bestKiller.equals(player)))
-					{
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, _rewardAmount, player, true);
-						player.addItem(_eventName + " Event: " + _eventName, Config.TVT_TOP_KILLER_REWARD, Config.TVT_TOP_KILLER_QTY, player, true);
-					}
-					else if ((teamName != null) && (player._teamNameTvT.equals(teamName)))
-					{
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, _rewardAmount, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team wins the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-					else if (teamName == null)
-					{
-						int minusReward = 0;
-						if (_topKills != 0)
-						{
-							minusReward = _rewardAmount / 2;
-						}
-						else
-						{
-							// nobody killed
-							minusReward = _rewardAmount / 4;
-						}
-						
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, minusReward, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team had a tie in the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Process top player.
-	 */
-	private static void processTopPlayer()
-	{
-		// nothing
-	}
-	
-	/**
-	 * Process top team.
-	 */
-	private static void processTopTeam()
-	{
-		_topTeam = null;
-		for (String team : _teams)
-		{
-			if ((teamKillsCount(team) == _topKills) && (_topKills > 0))
-			{
-				_topTeam = null;
-			}
-			
-			if (teamKillsCount(team) > _topKills)
-			{
-				_topTeam = team;
-				_topKills = teamKillsCount(team);
-			}
-		}
-	}
-	
-	/**
-	 * Adds the team.
-	 * @param teamName the team name
-	 */
-	public static void addTeam(String teamName)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		if (teamName.equals(" "))
-		{
-			return;
-		}
-		
-		_teams.add(teamName);
-		_teamPlayersCount.add(0);
-		_teamPointsCount.add(0);
-		_teamColors.add(0);
-		_teamsX.add(0);
-		_teamsY.add(0);
-		_teamsZ.add(0);
-		
-		addTeamEventOperations(teamName);
-	}
-	
-	/**
-	 * Adds the team event operations.
-	 * @param teamName the team name
-	 */
-	private static void addTeamEventOperations(String teamName)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Removes the team.
-	 * @param teamName the team name
-	 */
-	public static void removeTeam(String teamName)
-	{
-		if (_inProgress || _teams.isEmpty())
-		{
-			return;
-		}
-		
-		if (teamPlayersCount(teamName) > 0)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsZ.remove(index);
-		_teamsY.remove(index);
-		_teamsX.remove(index);
-		_teamColors.remove(index);
-		_teamPointsCount.remove(index);
-		_teamPlayersCount.remove(index);
-		_teams.remove(index);
-		
-		removeTeamEventItems(teamName);
-	}
-	
-	/**
-	 * Removes the team event items.
-	 * @param teamName the team name
-	 */
-	private static void removeTeamEventItems(String teamName)
-	{
-		_teams.indexOf(teamName);
-		
-		//
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param player the player
-	 */
-	public static void setTeamPos(String teamName, PlayerInstance player)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, player.getX());
-		_teamsY.set(index, player.getY());
-		_teamsZ.set(index, player.getZ());
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param x the x
-	 * @param y the y
-	 * @param z the z
-	 */
-	public static void setTeamPos(String teamName, int x, int y, int z)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, x);
-		_teamsY.set(index, y);
-		_teamsZ.set(index, z);
-	}
-	
-	/**
-	 * Sets the team color.
-	 * @param teamName the team name
-	 * @param color the color
-	 */
-	public static void setTeamColor(String teamName, int color)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamColors.set(index, color);
-	}
-	
-	/**
-	 * Team players count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamPlayersCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPlayersCount.get(index);
-	}
-	
-	/**
-	 * Sets the team players count.
-	 * @param teamName the team name
-	 * @param teamPlayersCount the team players count
-	 */
-	public static void setTeamPlayersCount(String teamName, int teamPlayersCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPlayersCount.set(index, teamPlayersCount);
-	}
-	
-	/**
-	 * Check shuffle players.
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	public static boolean checkShufflePlayers(PlayerInstance eventPlayer)
-	{
-		try
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if ((player == null) || !player.isOnline())
-				{
-					_playersShuffle.remove(player);
-					eventPlayer._inEventTvT = false;
-				}
-				else if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer._inEventTvT = true;
-					eventPlayer._countTvTkills = 0;
-					return true;
-				}
-				// This 1 is incase player got new objectid after DC or reconnect
-				else if (player.getName().equals(eventPlayer.getName()))
-				{
-					_playersShuffle.remove(player);
-					_playersShuffle.add(eventPlayer);
-					eventPlayer._inEventTvT = true;
-					eventPlayer._countTvTkills = 0;
-					return true;
-				}
-			}
-		}
-		catch (Exception e)
-		{
-		}
-		return false;
-	}
-	
-	/**
-	 * just an announcer to send termination messages.
-	 */
-	public static void sendFinalMessages()
-	{
-		if (!_started && !_aborted)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Thank you For Participating At, " + _eventName + " Event.");
-		}
-	}
-	
-	/**
-	 * returns the interval between each event.
-	 * @return the interval between matchs
-	 */
-	public static int getIntervalBetweenMatchs()
-	{
-		final long actualTime = Chronos.currentTimeMillis();
-		final long totalTime = actualTime + _intervalBetweenMatches;
-		final long interval = totalTime - actualTime;
-		final int seconds = (int) (interval / 1000);
-		return seconds / 60;
-	}
-	
-	@Override
-	public void run()
-	{
-		LOGGER.info(_eventName + ": Event notification start");
-		eventOnceStart();
-	}
-	
-	@Override
-	public String getEventIdentifier()
-	{
-		return _eventName;
-	}
-	
-	@Override
-	public String getEventStartTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the event start time.
-	 * @param newTime the new event start time
-	 */
-	public void setEventStartTime(String newTime)
-	{
-		startEventTime = newTime;
-	}
-	
-	/**
-	 * On disconnect.
-	 * @param player the player
-	 */
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventTvT)
-		{
-			removePlayer(player);
-			player.teleToLocation(_npcX, _npcY, _npcZ);
-		}
-	}
-	
-	/**
-	 * Team kills count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamKillsCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPointsCount.get(index);
-	}
-	
-	/**
-	 * Sets the team kills count.
-	 * @param teamName the team name
-	 * @param teamKillsCount the team kills count
-	 */
-	public static void setTeamKillsCount(String teamName, int teamKillsCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPointsCount.set(index, teamKillsCount);
-	}
-	
-	/**
-	 * Kick player from tvt.
-	 * @param playerToKick the player to kick
-	 */
-	public static void kickPlayerFromTvt(PlayerInstance playerToKick)
-	{
-		if (playerToKick == null)
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			if (_joining)
-			{
-				_playersShuffle.remove(playerToKick);
-				_players.remove(playerToKick);
-				playerToKick._inEventTvT = false;
-				playerToKick._teamNameTvT = "";
-				playerToKick._countTvTkills = 0;
-			}
-		}
-		
-		if (_started || _teleport)
-		{
-			_playersShuffle.remove(playerToKick);
-			removePlayer(playerToKick);
-			if (playerToKick.isOnline())
-			{
-				playerToKick.getAppearance().setNameColor(playerToKick._originalNameColorTvT);
-				playerToKick.setKarma(playerToKick._originalKarmaTvT);
-				playerToKick.setTitle(playerToKick._originalTitleTvT);
-				playerToKick.broadcastUserInfo();
-				playerToKick.sendMessage("You have been kicked from the TvT.");
-				playerToKick.teleToLocation(_npcX, _npcY, _npcZ);
-				playerToKick.teleToLocation((_npcX + Rnd.get(201)) - 100, (_npcY + Rnd.get(201)) - 100, _npcZ);
-			}
-		}
-	}
-	
-	/**
-	 * Find best killer.
-	 * @param players the players
-	 * @return the pc instance
-	 */
-	public static PlayerInstance findBestKiller(List<PlayerInstance> players)
-	{
-		if (players == null)
-		{
-			return null;
-		}
-		PlayerInstance bestKiller = null;
-		for (PlayerInstance player : players)
-		{
-			if ((bestKiller == null) || (bestKiller._countTvTkills < player._countTvTkills))
-			{
-				bestKiller = player;
-			}
-		}
-		return bestKiller;
-	}
-	
-	/**
-	 * Find looser.
-	 * @param players the players
-	 * @return the pc instance
-	 */
-	public static PlayerInstance findLooser(List<PlayerInstance> players)
-	{
-		if (players == null)
-		{
-			return null;
-		}
-		PlayerInstance looser = null;
-		for (PlayerInstance player : players)
-		{
-			if ((looser == null) || (looser._countTvTdies < player._countTvTdies))
-			{
-				looser = player;
-			}
-		}
-		return looser;
-	}
-	
-	/**
-	 * The Class TvTTeam.
-	 */
-	public static class TvTTeam
-	{
-		/** The kill count. */
-		private int killCount = -1;
-		
-		/** The name. */
-		private String name = null;
-		
-		/**
-		 * Instantiates a new tvt team.
-		 * @param name the name
-		 * @param killCount the kill count
-		 */
-		TvTTeam(String name, int killCount)
-		{
-			this.killCount = killCount;
-			this.name = name;
-		}
-		
-		/**
-		 * Gets the kill count.
-		 * @return the kill count
-		 */
-		public int getKillCount()
-		{
-			return killCount;
-		}
-		
-		/**
-		 * Sets the kill count.
-		 * @param killCount the new kill count
-		 */
-		public void setKillCount(int killCount)
-		{
-			this.killCount = killCount;
-		}
-		
-		/**
-		 * Gets the name.
-		 * @return the name
-		 */
-		public String getName()
-		{
-			return name;
-		}
-		
-		/**
-		 * Sets the name.
-		 * @param name the new name
-		 */
-		public void setName(String name)
-		{
-			this.name = name;
-		}
-	}
-	
-	/**
-	 * Close fort doors.
-	 */
-	private static void closeFortDoors()
-	{
-		DoorData.getInstance().getDoor(23170004).closeMe();
-		DoorData.getInstance().getDoor(23170005).closeMe();
-		DoorData.getInstance().getDoor(23170002).closeMe();
-		DoorData.getInstance().getDoor(23170003).closeMe();
-		DoorData.getInstance().getDoor(23170006).closeMe();
-		DoorData.getInstance().getDoor(23170007).closeMe();
-		DoorData.getInstance().getDoor(23170008).closeMe();
-		DoorData.getInstance().getDoor(23170009).closeMe();
-		DoorData.getInstance().getDoor(23170010).closeMe();
-		DoorData.getInstance().getDoor(23170011).closeMe();
-		
-		try
-		{
-			Thread.sleep(20);
-		}
-		catch (InterruptedException ie)
-		{
-			LOGGER.warning("Error, " + ie.getMessage());
-		}
-	}
-	
-	/**
-	 * Open fort doors.
-	 */
-	private static void openFortDoors()
-	{
-		DoorData.getInstance().getDoor(23170004).openMe();
-		DoorData.getInstance().getDoor(23170005).openMe();
-		DoorData.getInstance().getDoor(23170002).openMe();
-		DoorData.getInstance().getDoor(23170003).openMe();
-		DoorData.getInstance().getDoor(23170006).openMe();
-		DoorData.getInstance().getDoor(23170007).openMe();
-		DoorData.getInstance().getDoor(23170008).openMe();
-		DoorData.getInstance().getDoor(23170009).openMe();
-		DoorData.getInstance().getDoor(23170010).openMe();
-		DoorData.getInstance().getDoor(23170011).openMe();
-	}
-	
-	/**
-	 * Close aden colosseum doors.
-	 */
-	private static void closeAdenColosseumDoors()
-	{
-		DoorData.getInstance().getDoor(24190002).closeMe();
-		DoorData.getInstance().getDoor(24190003).closeMe();
-		
-		try
-		{
-			Thread.sleep(20);
-		}
-		catch (InterruptedException ie)
-		{
-			LOGGER.warning("Error, " + ie.getMessage());
-		}
-	}
-	
-	/**
-	 * Open aden colosseum doors.
-	 */
-	private static void openAdenColosseumDoors()
-	{
-		DoorData.getInstance().getDoor(24190002).openMe();
-		DoorData.getInstance().getDoor(24190003).openMe();
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/VIP.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/VIP.java
deleted file mode 100644
index c4560704ed..0000000000
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/VIP.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.Race;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
-import org.l2jmobius.gameserver.model.items.Item;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-
-public class VIP
-{
-	private static final Logger LOGGER = Logger.getLogger(VIP.class.getName());
-	
-	public static String _teamName = "";
-	public static String _joinArea = "";
-	public static int _time = 0;
-	public static int _winners = 0;
-	public static int _vipReward = 0;
-	public static int _vipRewardAmount = 0;
-	public static int _notVipReward = 0;
-	public static int _notVipRewardAmount = 0;
-	public static int _theVipReward = 0;
-	public static int _theVipRewardAmount = 0;
-	public static int _endNPC = 0;
-	public static int _joinNPC = 0;
-	public static int _delay = 0;
-	public static int _endX = 0;
-	public static int _endY = 0;
-	public static int _endZ = 0;
-	public static int _startX = 0;
-	public static int _startY = 0;
-	public static int _startZ = 0;
-	public static int _joinX = 0;
-	public static int _joinY = 0;
-	public static int _joinZ = 0;
-	public static int _team = 0;
-	public static boolean _started = false;
-	public static boolean _joining = false;
-	public static boolean _inProgress = true;
-	public static boolean _sitForced = false;
-	public static Spawn _endSpawn;
-	public static Spawn _joinSpawn;
-	public static List<PlayerInstance> _playersVIP = new ArrayList<>();
-	public static List<PlayerInstance> _playersNotVIP = new ArrayList<>();
-	
-	public static void setTeam(String team, PlayerInstance player)
-	{
-		if (team.equalsIgnoreCase("Human"))
-		{
-			_team = 1;
-			_teamName = "Human";
-		}
-		else if (team.equalsIgnoreCase("Elf"))
-		{
-			_team = 2;
-			_teamName = "Elf";
-		}
-		else if (team.equalsIgnoreCase("Dark"))
-		{
-			_team = 3;
-			_teamName = "Dark Elf";
-		}
-		else if (team.equalsIgnoreCase("Orc"))
-		{
-			_team = 4;
-			_teamName = "Orc";
-		}
-		else if (team.equalsIgnoreCase("Dwarf"))
-		{
-			_team = 5;
-			_teamName = "Dwarf";
-		}
-		else
-		{
-			player.sendMessage("Invalid Team Name: //vip_setteam <human/elf/dark/orc/dwarf>");
-			return;
-		}
-		setLoc();
-	}
-	
-	public static void setRandomTeam(PlayerInstance player)
-	{
-		final int random = Rnd.get(5) + 1; // (0 - 4) + 1
-		LOGGER.info("Random number generated in setRandomTeam(): " + random);
-		
-		switch (random)
-		{
-			case 1:
-			{
-				_team = 1;
-				_teamName = "Human";
-				setLoc();
-				break;
-			}
-			case 2:
-			{
-				_team = 2;
-				_teamName = "Elf";
-				setLoc();
-				break;
-			}
-			case 3:
-			{
-				_team = 3;
-				_teamName = "Dark";
-				setLoc();
-				break;
-			}
-			case 4:
-			{
-				_team = 4;
-				_teamName = "Orc";
-				setLoc();
-				break;
-			}
-			case 5:
-			{
-				_team = 5;
-				_teamName = "Dwarf";
-				setLoc();
-				break;
-			}
-			default:
-			{
-				break;
-			}
-		}
-	}
-	
-	public static void setLoc()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement statement = con.prepareStatement("SELECT endx,endy,endz FROM VIPinfo WHERE teamID = " + _team);
-			final ResultSet rset = statement.executeQuery();
-			rset.next();
-			
-			_endX = rset.getInt("endx");
-			_endY = rset.getInt("endy");
-			_endZ = rset.getInt("endz");
-			rset.close();
-			statement.close();
-		}
-		catch (SQLException e)
-		{
-			LOGGER.info("Could not check End LOC for team" + _team + " got: " + e.getMessage());
-		}
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement statement = con.prepareStatement("SELECT startx,starty,startz FROM VIPinfo WHERE teamID = " + _team);
-			final ResultSet rset = statement.executeQuery();
-			rset.next();
-			
-			_startX = rset.getInt("startx");
-			_startY = rset.getInt("starty");
-			_startZ = rset.getInt("startz");
-			rset.close();
-			statement.close();
-		}
-		catch (SQLException e)
-		{
-			LOGGER.info("Could not check Start LOC for team" + _team + " got: " + e.getMessage());
-		}
-	}
-	
-	public static void endNPC(int npcId, PlayerInstance player)
-	{
-		if (_team == 0)
-		{
-			player.sendMessage("Please select a team first");
-			return;
-		}
-		
-		final NpcTemplate npctmp = NpcTable.getInstance().getTemplate(npcId);
-		_endNPC = npcId;
-		
-		try
-		{
-			_endSpawn = new Spawn(npctmp);
-			_endSpawn.setX(_endX);
-			_endSpawn.setY(_endY);
-			_endSpawn.setZ(_endZ);
-			_endSpawn.setAmount(1);
-			_endSpawn.setHeading(player.getHeading());
-			_endSpawn.setRespawnDelay(1);
-		}
-		catch (Exception e)
-		{
-			player.sendMessage("VIP Engine[endNPC(" + player.getName() + ")]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static void joinNPC(int npcId, PlayerInstance player)
-	{
-		if (_joinX == 0)
-		{
-			player.sendMessage("Please set a join x,y,z first");
-			return;
-		}
-		
-		final NpcTemplate npctmp = NpcTable.getInstance().getTemplate(npcId);
-		_joinNPC = npcId;
-		
-		try
-		{
-			_joinSpawn = new Spawn(npctmp);
-			_joinSpawn.setX(_joinX);
-			_joinSpawn.setY(_joinY);
-			_joinSpawn.setZ(_joinZ);
-			_joinSpawn.setAmount(1);
-			_joinSpawn.setHeading(player.getHeading());
-			_joinSpawn.setRespawnDelay(1);
-		}
-		catch (Exception e)
-		{
-			player.sendMessage("VIP Engine[joinNPC(" + player.getName() + ")]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static void spawnEndNPC()
-	{
-		try
-		{
-			SpawnTable.getInstance().addNewSpawn(_endSpawn, false);
-			_endSpawn.init();
-			_endSpawn.getLastSpawn().setCurrentHp(999999999);
-			_endSpawn.getLastSpawn().setTitle("VIP Event Manager");
-			_endSpawn.getLastSpawn().isAggressive();
-			_endSpawn.getLastSpawn().decayMe();
-			_endSpawn.getLastSpawn().spawnMe(_endSpawn.getLastSpawn().getX(), _endSpawn.getLastSpawn().getY(), _endSpawn.getLastSpawn().getZ());
-			_endSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_endSpawn.getLastSpawn(), _endSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP Engine[spawnEndNPC()]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static void spawnJoinNPC()
-	{
-		try
-		{
-			SpawnTable.getInstance().addNewSpawn(_joinSpawn, false);
-			_joinSpawn.init();
-			_joinSpawn.getLastSpawn().setCurrentHp(999999999);
-			_joinSpawn.getLastSpawn().setTitle("VIP Event Manager");
-			_joinSpawn.getLastSpawn().isAggressive();
-			_joinSpawn.getLastSpawn().decayMe();
-			_joinSpawn.getLastSpawn().spawnMe(_joinSpawn.getLastSpawn().getX(), _joinSpawn.getLastSpawn().getY(), _joinSpawn.getLastSpawn().getZ());
-			_joinSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_joinSpawn.getLastSpawn(), _joinSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP Engine[spawnJoinNPC()]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static String getNPCName(int id, PlayerInstance player)
-	{
-		if (id == 0)
-		{
-			return "";
-		}
-		
-		final NpcTemplate npctmp = NpcTable.getInstance().getTemplate(id);
-		return npctmp.getName();
-	}
-	
-	public static String getItemName(int id, PlayerInstance player)
-	{
-		if (id == 0)
-		{
-			return "";
-		}
-		final Item itemtmp = ItemTable.getInstance().getTemplate(id);
-		return itemtmp.getName();
-	}
-	
-	public static void setJoinLOC(String x, String y, String z)
-	{
-		_joinX = Integer.parseInt(x);
-		_joinY = Integer.parseInt(y);
-		_joinZ = Integer.parseInt(z);
-	}
-	
-	public static void startJoin(PlayerInstance player)
-	{
-		if ((_time == 0) || (_team == 0) || (_endNPC == 0) || (_delay == 0))
-		{
-			player.sendMessage("Cannot initiate join status of event, not all the values are filled in");
-			return;
-		}
-		
-		if (_joining)
-		{
-			player.sendMessage("Players are already allowed to join the event");
-			return;
-		}
-		
-		if (_started)
-		{
-			player.sendMessage("Event already started. Please wait for it to finish or finish it manually");
-			return;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Vip event has started.Use .vipjoin to join or .vipleave to leave.");
-		spawnJoinNPC();
-		
-		ThreadPool.schedule(() ->
-		{
-			_joining = false;
-			_started = true;
-			startEvent();
-		}, _delay);
-	}
-	
-	public static void startEvent()
-	{
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Registration for the VIP event involving " + _teamName + " has ended.");
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Players will be teleported to their locations in 20 seconds.");
-		ThreadPool.schedule(() ->
-		{
-			teleportPlayers();
-			chooseVIP();
-			setUserData();
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("Players have been teleported for the VIP event.");
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("VIP event will start in 20 seconds.");
-			spawnEndNPC();
-			
-			ThreadPool.schedule(() ->
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll("VIP event has started. " + _teamName + "'s VIP must get to the starter city and talk with " + getNPCName(_endNPC, null) + ". The opposing team must kill the VIP. All players except the VIP will respawn at their current locations.");
-				AnnouncementsTable.getInstance().criticalAnnounceToAll("VIP event will end if the " + _teamName + " team makes it to their town or when " + (_time / 1000 / 60) + " mins have elapsed.");
-				VIP.sit();
-				
-				ThreadPool.schedule(VIP::endEventTime, _time);
-			}, 20000);
-		}, 20000);
-	}
-	
-	public static void vipDied()
-	{
-		if (!_started)
-		{
-			LOGGER.info("Could not finish the event. Event not started or event ended prematurly.");
-			return;
-		}
-		
-		_started = false;
-		unspawnEventNpcs();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("The VIP has died. The opposing team has won.");
-		rewardNotVIP();
-		teleportFinish();
-	}
-	
-	public static void endEventTime()
-	{
-		if (!_started)
-		{
-			LOGGER.info("Could not finish the event. Event not started or event ended prematurly (VIP died)");
-			return;
-		}
-		
-		_started = false;
-		unspawnEventNpcs();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("The time has run out and the " + _teamName + "'s have not made it to their goal. Everybody on the opposing team wins.");
-		rewardNotVIP();
-		teleportFinish();
-	}
-	
-	public static void unspawnEventNpcs()
-	{
-		if (_endSpawn != null)
-		{
-			_endSpawn.getLastSpawn().deleteMe();
-			_endSpawn.stopRespawn();
-			SpawnTable.getInstance().deleteSpawn(_endSpawn, true);
-		}
-		
-		if (_joinSpawn != null)
-		{
-			_joinSpawn.getLastSpawn().deleteMe();
-			_joinSpawn.stopRespawn();
-			SpawnTable.getInstance().deleteSpawn(_joinSpawn, true);
-		}
-	}
-	
-	public static void showEndHTML(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("VIP (End NPC)<br><br>");
-			replyMSG.append("Current event...<br1>");
-			replyMSG.append("Team:&nbsp;<font color=\"FFFFFF\">" + _teamName + "</font><br><br>");
-			if (!_started)
-			{
-				replyMSG.append("<center>Please wait until the admin/gm starts the joining period.</center>");
-			}
-			else if (eventPlayer._isTheVIP)
-			{
-				replyMSG.append("You have made it to the end. All you have to do is hit the finish button to reward yourself and your team. Congrats!<br>");
-				replyMSG.append("<center>");
-				replyMSG.append("<button value=\"Finish\" action=\"bypass -h npc_" + objectId + "_vip_finishVIP\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-				replyMSG.append("</center>");
-			}
-			else
-			{
-				replyMSG.append("I am the character the VIP has to reach in order to win the event.<br>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP(showJoinHTML(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	public static void vipWin(PlayerInstance player)
-	{
-		if (!_started)
-		{
-			LOGGER.info("Could not finish the event. Event not started or event ended prematurly");
-			return;
-		}
-		
-		_started = false;
-		unspawnEventNpcs();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("The VIP has made it to the goal. " + _teamName + " has won. Everybody on that team wins.");
-		rewardVIP();
-		teleportFinish();
-	}
-	
-	public static void rewardNotVIP()
-	{
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			if (player != null)
-			{
-				final PlayerInventory inv = player.getInventory();
-				if (ItemTable.getInstance().createDummyItem(_notVipReward).isStackable())
-				{
-					inv.addItem("VIP Event: ", _notVipReward, _notVipRewardAmount, player, null);
-				}
-				else
-				{
-					for (int i = 0; i <= (_notVipRewardAmount - 1); i++)
-					{
-						inv.addItem("VIP Event: ", _notVipReward, 1, player, null);
-					}
-				}
-				
-				SystemMessage sm;
-				if (_notVipRewardAmount > 1)
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-					sm.addItemName(_notVipReward);
-					sm.addNumber(_notVipRewardAmount);
-					player.sendPacket(sm);
-				}
-				else
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-					sm.addItemName(_notVipReward);
-					player.sendPacket(sm);
-				}
-				
-				final StatusUpdate su = new StatusUpdate(player.getObjectId());
-				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
-				player.sendPacket(su);
-				
-				final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-				final StringBuilder replyMSG = new StringBuilder("");
-				replyMSG.append("<html><body>Your team has won the event. Your inventory now contains your reward.</body></html>");
-				nhm.setHtml(replyMSG.toString());
-				player.sendPacket(nhm);
-			}
-		}
-	}
-	
-	public static void rewardVIP()
-	{
-		for (PlayerInstance player : _playersVIP)
-		{
-			if ((player != null) && !player._isTheVIP)
-			{
-				final PlayerInventory inv = player.getInventory();
-				if (ItemTable.getInstance().createDummyItem(_vipReward).isStackable())
-				{
-					inv.addItem("VIP Event: ", _vipReward, _vipRewardAmount, player, null);
-				}
-				else
-				{
-					for (int i = 0; i <= (_vipRewardAmount - 1); i++)
-					{
-						inv.addItem("VIP Event: ", _vipReward, 1, player, null);
-					}
-				}
-				
-				SystemMessage sm;
-				if (_vipRewardAmount > 1)
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-					sm.addItemName(_vipReward);
-					sm.addNumber(_vipRewardAmount);
-					player.sendPacket(sm);
-				}
-				else
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-					sm.addItemName(_vipReward);
-					player.sendPacket(sm);
-				}
-				
-				final StatusUpdate su = new StatusUpdate(player.getObjectId());
-				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
-				player.sendPacket(su);
-				
-				final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-				final StringBuilder replyMSG = new StringBuilder("");
-				replyMSG.append("<html><body>Your team has won the event. Your inventory now contains your reward.</body></html>");
-				nhm.setHtml(replyMSG.toString());
-				player.sendPacket(nhm);
-			}
-			else if ((player != null) && player._isTheVIP)
-			{
-				final PlayerInventory inv = player.getInventory();
-				if (ItemTable.getInstance().createDummyItem(_theVipReward).isStackable())
-				{
-					inv.addItem("VIP Event: ", _theVipReward, _theVipRewardAmount, player, null);
-				}
-				else
-				{
-					for (int i = 0; i <= (_theVipRewardAmount - 1); i++)
-					{
-						inv.addItem("VIP Event: ", _theVipReward, 1, player, null);
-					}
-				}
-				
-				SystemMessage sm;
-				if (_theVipRewardAmount > 1)
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-					sm.addItemName(_theVipReward);
-					sm.addNumber(_theVipRewardAmount);
-					player.sendPacket(sm);
-				}
-				else
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-					sm.addItemName(_theVipReward);
-					player.sendPacket(sm);
-				}
-				
-				final StatusUpdate su = new StatusUpdate(player.getObjectId());
-				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
-				player.sendPacket(su);
-				
-				final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-				final StringBuilder replyMSG = new StringBuilder("");
-				replyMSG.append("<html><body>You team have won the event. Your inventory now contains your reward.</body></html>");
-				nhm.setHtml(replyMSG.toString());
-				player.sendPacket(nhm);
-			}
-		}
-	}
-	
-	public static void teleportFinish()
-	{
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Teleporting VIP players back to the Registration area in 20 seconds.");
-		ThreadPool.schedule(() ->
-		{
-			for (PlayerInstance player1 : _playersVIP)
-			{
-				if (player1 != null)
-				{
-					player1.teleToLocation(_joinX, _joinY, _joinZ);
-				}
-			}
-			
-			for (PlayerInstance player2 : _playersNotVIP)
-			{
-				if (player2 != null)
-				{
-					player2.teleToLocation(_joinX, _joinY, _joinZ);
-				}
-			}
-			
-			VIP.clean();
-		}, 20000);
-	}
-	
-	public static void clean()
-	{
-		_time = _winners = _endNPC = _joinNPC = _delay = _endX = _endY = _endZ = _startX = _startY = _startZ = _joinX = _joinY = _joinZ = _team = 0;
-		_vipReward = _vipRewardAmount = _notVipReward = _notVipRewardAmount = _theVipReward = _theVipRewardAmount = 0;
-		_started = _joining = _sitForced = false;
-		_inProgress = false;
-		_teamName = _joinArea = "";
-		for (PlayerInstance player : _playersVIP)
-		{
-			player.getAppearance().setNameColor(player._originalNameColourVIP);
-			player.setKarma(player._originalKarmaVIP);
-			player.broadcastUserInfo();
-			player._inEventVIP = false;
-			player._isTheVIP = false;
-			player._isNotVIP = false;
-			player._isVIP = false;
-		}
-		
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			player.getAppearance().setNameColor(player._originalNameColourVIP);
-			player.setKarma(player._originalKarmaVIP);
-			player.broadcastUserInfo();
-			player._inEventVIP = false;
-			player._isTheVIP = false;
-			player._isNotVIP = false;
-			player._isVIP = false;
-		}
-		
-		_playersVIP = new ArrayList<>();
-		_playersNotVIP = new ArrayList<>();
-	}
-	
-	public static void chooseVIP()
-	{
-		final int size = _playersVIP.size();
-		LOGGER.info("Size of players on VIP: " + size);
-		
-		final int random = Rnd.get(size);
-		LOGGER.info("Random number chosen in VIP: " + random);
-		
-		final PlayerInstance vip = _playersVIP.get(random);
-		vip._isTheVIP = true;
-	}
-	
-	public static void teleportPlayers()
-	{
-		sit();
-		
-		for (PlayerInstance player : _playersVIP)
-		{
-			if (player != null)
-			{
-				player.teleToLocation(_startX, _startY, _startZ);
-			}
-		}
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			if (player != null)
-			{
-				player.teleToLocation(_endX, _endY, _endZ);
-			}
-		}
-	}
-	
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		for (PlayerInstance player : _playersVIP)
-		{
-			if (player != null)
-			{
-				if (_sitForced)
-				{
-					player.stopMove(null, false);
-					player.abortAttack();
-					player.abortCast();
-					
-					if (!player.isSitting())
-					{
-						player.sitDown();
-					}
-				}
-				else if (player.isSitting())
-				{
-					player.standUp();
-				}
-			}
-		}
-		
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			if (player != null)
-			{
-				if (_sitForced)
-				{
-					player.stopMove(null, false);
-					player.abortAttack();
-					player.abortCast();
-					
-					if (!player.isSitting())
-					{
-						player.sitDown();
-					}
-				}
-				else if (player.isSitting())
-				{
-					player.standUp();
-				}
-			}
-		}
-	}
-	
-	public static void setUserData()
-	{
-		for (PlayerInstance player : _playersVIP)
-		{
-			if (player._isTheVIP)
-			{
-				player.getAppearance().setNameColor(255, 255, 0);
-			}
-			else
-			{
-				player.getAppearance().setNameColor(255, 0, 0);
-			}
-			
-			player.setKarma(0);
-			player.broadcastUserInfo();
-		}
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			player.getAppearance().setNameColor(0, 255, 0);
-			player.setKarma(0);
-			player.broadcastUserInfo();
-		}
-	}
-	
-	public static void showJoinHTML(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("VIP (Join NPC)<br><br>");
-			replyMSG.append("Current event...<br1>");
-			replyMSG.append("	... Team:&nbsp;<font color=\"FFFFFF\">" + _teamName + "</font><br><br>");
-			if (!_joining && !_started)
-			{
-				replyMSG.append("<center>Please wait until the admin/gm starts the joining period.</center>");
-			}
-			else if (_joining && !_started)
-			{
-				// Joining period
-				if (_playersVIP.contains(eventPlayer) || _playersNotVIP.contains(eventPlayer))
-				{
-					replyMSG.append("You are already on a team<br><br>");
-				}
-				else
-				{
-					replyMSG.append("You want to participate in the event?<br><br>");
-					if ((eventPlayer.getRace() == Race.HUMAN) && (_team == 1))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.ELF) && (_team == 2))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.DARK_ELF) && (_team == 3))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.ORC) && (_team == 4))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.DWARF) && (_team == 5))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else
-					{
-						replyMSG.append("It seems you are not on the part of the VIP race.<br>");
-						replyMSG.append("When the event starts you will be teleported to the " + _teamName + " town<br1>");
-						replyMSG.append("Be sure to cooperate with your team to destroy the VIP.<br1>");
-						replyMSG.append("The VIP will be announced when the event starts.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinNotVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-				}
-			}
-			else if (_started)
-			{
-				replyMSG.append("<center>The event is already taking place. Please sign up for the next event.</center>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP(showJoinHTML(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	public static void addPlayerVIP(PlayerInstance player)
-	{
-		player._isVIP = true;
-		_playersVIP.add(player);
-		player._originalNameColourVIP = player.getAppearance().getNameColor();
-		player._originalKarmaVIP = player.getKarma();
-		player._inEventVIP = true;
-	}
-	
-	public static void addPlayerNotVIP(PlayerInstance player)
-	{
-		player._isNotVIP = true;
-		_playersNotVIP.add(player);
-		player._originalNameColourVIP = player.getAppearance().getNameColor();
-		player._originalKarmaVIP = player.getKarma();
-		player._inEventVIP = true;
-	}
-	
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventTvT)
-		{
-			player.getAppearance().setNameColor(player._originalNameColourVIP);
-			player.setKarma(player._originalKarmaVIP);
-			player.broadcastUserInfo();
-			player._inEventVIP = false;
-			player._isTheVIP = false;
-			player._isNotVIP = false;
-			player._isVIP = false;
-			player.teleToLocation(_startX, _startY, _startZ);
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Radar.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Radar.java
index 34152f520f..00cd2d259f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Radar.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Radar.java
@@ -122,7 +122,7 @@ public class Radar
 					return;
 				}
 				_me.sendPacket(new RadarControl(1, 1, _me.getX(), _me.getY(), _me.getZ()));
-				if ((_myTarget == null) || !_myTarget.isOnline() || !_myTarget._haveFlagCTF)
+				if ((_myTarget == null) || !_myTarget.isOnline())
 				{
 					return;
 				}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java
index 0a8ecd6548..2ec933ceaa 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java
@@ -24,15 +24,11 @@ import java.util.List;
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.SkillTreeTable;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Playable;
@@ -1767,9 +1763,8 @@ public abstract class Skill
 								{
 									continue;
 								}
-								// if src is in event and trg not OR viceversa:
-								// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-								if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+								// if src is in event and trg not or viceversa
+								if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 								{
 									continue;
 								}
@@ -1781,9 +1776,8 @@ public abstract class Skill
 								{
 									continue;
 								}
-								// if src is in event and trg not OR viceversa:
-								// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-								if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+								// if src is in event and trg not or viceversa
+								if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 								{
 									continue;
 								}
@@ -1912,9 +1906,8 @@ public abstract class Skill
 							{
 								continue;
 							}
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+							// if src is in event and trg not or viceversa
+							if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 							{
 								continue;
 							}
@@ -1926,9 +1919,8 @@ public abstract class Skill
 							{
 								continue;
 							}
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+							// if src is in event and trg not or viceversa
+							if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 							{
 								continue;
 							}
@@ -1979,30 +1971,11 @@ public abstract class Skill
 					final List<PlayerInstance> partyList = creature.getParty().getPartyMembers();
 					for (PlayerInstance partyMember : partyList)
 					{
-						if (partyMember == null)
+						if ((partyMember == null) || (partyMember == player))
 						{
 							continue;
 						}
-						if (partyMember == player)
-						{
-							continue;
-						}
-						// check if allow interference is allowed if player is not on event but target is on event
-						if (((TvT.isStarted() && !Config.TVT_ALLOW_INTERFERENCE) || (CTF.isStarted() && !Config.CTF_ALLOW_INTERFERENCE) || (DM.hasStarted() && !Config.DM_ALLOW_INTERFERENCE))/* && !player.isGM() */)
-						{
-							if ((partyMember._inEventTvT && !player._inEventTvT) || (!partyMember._inEventTvT && player._inEventTvT))
-							{
-								continue;
-							}
-							if ((partyMember._inEventCTF && !player._inEventCTF) || (!partyMember._inEventCTF && player._inEventCTF))
-							{
-								continue;
-							}
-							if ((partyMember._inEventDM && !player._inEventDM) || (!partyMember._inEventDM && player._inEventDM))
-							{
-								continue;
-							}
-						}
+						
 						if (!partyMember.isDead() && Util.checkIfInRange(_skillRadius, creature, partyMember, true))
 						{
 							PlayerInstance src = null;
@@ -2015,12 +1988,12 @@ public abstract class Skill
 								src = ((Summon) creature).getOwner();
 							}
 							final PlayerInstance trg = partyMember;
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if ((src != null) && (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP))))
+							// if src is in event and trg not or viceversa
+							if ((src != null) && ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent())))
 							{
 								continue;
 							}
+							
 							targetList.add(partyMember);
 							if ((partyMember.getPet() != null) && !partyMember.getPet().isDead())
 							{
@@ -2140,12 +2113,12 @@ public abstract class Skill
 							
 							final PlayerInstance trg = newTarget;
 							final PlayerInstance src = player;
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+							// if src is in event and trg not or viceversa
+							if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 							{
 								continue;
 							}
+							
 							final Summon pet = newTarget.getPet();
 							if ((pet != null) && Util.checkIfInRange(radius, creature, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.TARGET_CORPSE_CLAN) && pet.isDead()) || ((_targetType == SkillTargetType.TARGET_CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this))
 							{
@@ -2384,17 +2357,18 @@ public abstract class Skill
 								}
 							}
 						}
-						// check for Events
+						
 						if (trg == src)
 						{
 							continue;
 						}
-						// if src is in event and trg not OR viceversa:
-						// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-						if ((src != null) && (trg != null) && (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP))))
+						
+						// if src is in event and trg not or viceversa
+						if ((src != null) && (trg != null) && ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent())))
 						{
 							continue;
 						}
+						
 						targetList.add((Creature) obj);
 					}
 				}
@@ -2862,24 +2836,24 @@ public abstract class Skill
 			}
 			
 			// if src is in event and trg not OR viceversa, the target must be not attackable
-			// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-			if (((activeCh._inEvent || activeCh._inEventCTF || activeCh._inEventDM || activeCh._inEventTvT || activeCh._inEventVIP) && (!targetChar._inEvent && !targetChar._inEventCTF && !targetChar._inEventDM && !targetChar._inEventTvT && !targetChar._inEventVIP)) || ((targetChar._inEvent || targetChar._inEventCTF || targetChar._inEventDM || targetChar._inEventTvT || targetChar._inEventVIP) && (!activeCh._inEvent && !activeCh._inEventCTF && !activeCh._inEventDM && !activeCh._inEventTvT && !activeCh._inEventVIP)))
+			if ((activeCh.isOnCustomEvent() && !targetChar.isOnCustomEvent()) || (targetChar.isOnCustomEvent() && !activeCh.isOnCustomEvent()))
 			{
 				return true;
 			}
 			
-			if ((activeCh._inEvent && targetChar._inEvent) || (activeCh._inEventDM && targetChar._inEventDM) || (activeCh._inEventTvT && targetChar._inEventTvT) || (activeCh._inEventCTF && targetChar._inEventCTF) || (activeCh._inEventVIP && targetChar._inEventVIP))
+			if (activeCh.isOnCustomEvent() && targetChar.isOnCustomEvent())
 			{
 				return false;
 			}
 			
-			if ((activeCh.getParty() != null) && (targetChar.getParty() != null) && // Is in the same party???
-				(activeCh.getParty().getPartyLeaderOID() == targetChar.getParty().getPartyLeaderOID()))
+			// Is in the same party?
+			if ((activeCh.getParty() != null) && (targetChar.getParty() != null) && (activeCh.getParty().getPartyLeaderOID() == targetChar.getParty().getPartyLeaderOID()))
 			{
 				return true;
 			}
-			if ((activeCh.getClan() != null) && (targetChar.getClan() != null) && // Is in the same clan???
-				(activeCh.getClan().getClanId() == targetChar.getClan().getClanId()))
+			
+			// Is in the same clan?
+			if ((activeCh.getClan() != null) && (targetChar.getClan() != null) && (activeCh.getClan().getClanId() == targetChar.getClan().getClanId()))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 003e53b9ed..fc918f5a6b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -447,11 +447,6 @@ public class Attackable extends NpcInstance
 			}
 		}
 		
-		if (isEventMob)
-		{
-			return;
-		}
-		
 		// Add damage and hate to the attacker AggroInfo of the Attackable _aggroList
 		if (attacker != null)
 		{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 307f549fd7..92870b58f3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -40,7 +40,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.NpcTable;
 import org.l2jmobius.gameserver.data.xml.MapRegionData;
-import org.l2jmobius.gameserver.data.xml.ZoneData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.ISkillHandler;
@@ -49,11 +48,6 @@ import org.l2jmobius.gameserver.handler.itemhandlers.Potions;
 import org.l2jmobius.gameserver.instancemanager.DimensionalRiftManager;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.ChanceSkillList;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.ForceBuff;
@@ -104,7 +98,6 @@ import org.l2jmobius.gameserver.model.skills.funcs.Func;
 import org.l2jmobius.gameserver.model.skills.holders.ISkillsHolder;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.model.zone.type.BossZone;
-import org.l2jmobius.gameserver.model.zone.type.TownZone;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.Attack;
@@ -521,27 +514,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		// default implementation
 	}
 	
-	/** The _in town war. */
-	private boolean _inTownWar;
-	
-	/**
-	 * Checks if is in town war.
-	 * @return true, if is in town war
-	 */
-	public boolean isinTownWar()
-	{
-		return _inTownWar;
-	}
-	
-	/**
-	 * Sets the in town war.
-	 * @param value the new in town war
-	 */
-	public void setInTownWar(boolean value)
-	{
-		_inTownWar = value;
-	}
-	
 	/**
 	 * Teleport a Creature and its pet if necessary.<br>
 	 * <br>
@@ -557,22 +529,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 */
 	public void teleToLocation(int xValue, int yValue, int zValue, boolean allowRandomOffset)
 	{
-		if (Config.TW_DISABLE_GK)
-		{
-			final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-			if ((town != null) && _inTownWar)
-			{
-				if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-				{
-					return;
-				}
-				else if (Config.TW_ALL_TOWNS)
-				{
-					return;
-				}
-			}
-		}
-		
 		// Abort any client actions, casting and remove target.
 		stopMove(null, false);
 		abortAttack();
@@ -1818,31 +1774,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		}
 		else if (this instanceof PlayerInstance)
 		{
-			final PlayerInstance player = (PlayerInstance) this;
-			
-			// to avoid Event Remove buffs on die
-			if (player._inEventDM && DM.hasStarted())
-			{
-				if (Config.DM_REMOVE_BUFFS_ON_DIE)
-				{
-					stopAllEffects();
-				}
-			}
-			else if (player._inEventTvT && TvT.isStarted())
-			{
-				if (Config.TVT_REMOVE_BUFFS_ON_DIE)
-				{
-					stopAllEffects();
-				}
-			}
-			else if (player._inEventCTF && CTF.isStarted())
-			{
-				if (Config.CTF_REMOVE_BUFFS_ON_DIE)
-				{
-					stopAllEffects();
-				}
-			}
-			else if (Config.LEAVE_BUFFS_ON_DIE) // this means that the player is not in event
+			if (Config.LEAVE_BUFFS_ON_DIE)
 			{
 				stopAllEffects();
 			}
@@ -5283,29 +5215,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 */
 	protected void moveToLocation(WorldObject target, int xValue, int yValue, int zValue, int offsetValue)
 	{
-		// Block movement during Event start
-		if (isPlayer())
-		{
-			if (GameEvent.active && getActingPlayer().eventSitForced)
-			{
-				getActingPlayer().sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-				getActingPlayer().getClient().sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if ((TvT.isSitForced() && getActingPlayer()._inEventTvT) || (CTF.isSitForced() && getActingPlayer()._inEventCTF) || (DM.isSitForced() && getActingPlayer()._inEventDM))
-			{
-				getActingPlayer().sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-				getActingPlayer().getClient().sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if (VIP._sitForced && getActingPlayer()._inEventVIP)
-			{
-				getActingPlayer().sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-				getActingPlayer().sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-		}
-		
 		// Get the Move Speed of the Creature
 		final float speed = getStat().getMoveSpeed();
 		if ((speed <= 0) || isMovementDisabled())
@@ -5865,7 +5774,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a PlayerInstance)
-		if ((target == null) || isAlikeDead() || ((this instanceof NpcInstance) && ((NpcInstance) this).isEventMob))
+		if ((target == null) || isAlikeDead())
 		{
 			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
 			return;
@@ -6384,24 +6293,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 				return false;
 			}
 			
-			if (dst.isInFunEvent() && src.isInFunEvent())
+			if (dst.isOnCustomEvent() && src.isOnCustomEvent())
 			{
-				if (src.isInStartedTVTEvent() && dst.isInStartedTVTEvent())
-				{
-					return false;
-				}
-				else if (src.isInStartedDMEvent() && dst.isInStartedDMEvent())
-				{
-					return false;
-				}
-				else if (src.isInStartedCTFEvent() && dst.isInStartedCTFEvent())
-				{
-					return false;
-				}
-				else if (src.isInStartedVIPEvent() && dst.isInStartedVIPEvent())
-				{
-					return false;
-				}
+				return false;
 			}
 		}
 		
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Playable.java
index 2a32f6ff7a..1fb084b738 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Playable.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Playable.java
@@ -445,14 +445,9 @@ public abstract class Playable extends Creature
 		_lastCharmOfLuckEffect = null;
 	}
 	
-	/**
-	 * Checks if is in fun event.
-	 * @return true, if is in fun event
-	 */
-	public boolean isInFunEvent()
+	public boolean isOnCustomEvent()
 	{
-		final PlayerInstance player = getActingPlayer();
-		return (player != null) && player.isInFunEvent();
+		return false;
 	}
 	
 	/**
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 1606d96cc4..c9acf398df 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -818,6 +818,12 @@ public abstract class Summon extends Playable
 		}
 	}
 	
+	@Override
+	public boolean isOnCustomEvent()
+	{
+		return (_owner != null) && _owner.isOnCustomEvent();
+	}
+	
 	@Override
 	public PlayerInstance getActingPlayer()
 	{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index b4f332a294..bf1a1c3bb7 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -88,11 +88,7 @@ public class MonsterInstance extends Attackable
 	@Override
 	public boolean isAutoAttackable(Creature attacker)
 	{
-		if (attacker instanceof MonsterInstance)
-		{
-			return false;
-		}
-		return !isEventMob;
+		return !(attacker instanceof MonsterInstance);
 	}
 	
 	/**
@@ -102,7 +98,7 @@ public class MonsterInstance extends Attackable
 	@Override
 	public boolean isAggressive()
 	{
-		return (getTemplate().getAggroRange() > 0) && !isEventMob;
+		return getTemplate().getAggroRange() > 0;
 	}
 	
 	@Override
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index 35fcc4f266..569286f33d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -42,11 +42,6 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.instancemanager.games.Lottery;
 import org.l2jmobius.gameserver.model.DropCategory;
 import org.l2jmobius.gameserver.model.DropData;
@@ -116,17 +111,8 @@ public class NpcInstance extends Creature
 	private boolean _isSpoil = false;
 	private int _castleIndex = -2;
 	private int _fortIndex = -2;
-	public boolean isEventMob = false;
-	public boolean _isEventMobTvT = false;
-	public boolean _isEventVIPNPC = false;
-	public boolean _isEventVIPNPCEnd = false;
-	public boolean _isEventMobDM = false;
-	public boolean _isEventMobCTF = false;
-	public boolean _isCTF_throneSpawn = false;
-	public boolean _isCTF_Flag = false;
 	private boolean _isInTown = false;
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
-	public String _CTF_FlagTeamName;
 	private int _isSpoiledBy = 0;
 	private long _lastSocialBroadcast = 0;
 	private static final int MINIMUM_SOCIAL_INTERVAL = 6000;
@@ -704,51 +690,17 @@ public class NpcInstance extends Creature
 					
 					// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance to display a social action of the NpcInstance on their client
 					broadcastSocialAction(Rnd.get(8));
-					// Open a chat window on client with the text of the NpcInstance
-					if (isEventMob)
+					
+					final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
+					if (questList.size() == 1)
 					{
-						GameEvent.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventMobTvT)
-					{
-						TvT.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventMobDM)
-					{
-						DM.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventMobCTF)
-					{
-						CTF.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isCTF_Flag && player._inEventCTF)
-					{
-						CTF.showFlagHtml(player, String.valueOf(getObjectId()), _CTF_FlagTeamName);
-					}
-					else if (_isCTF_throneSpawn)
-					{
-						CTF.checkRestoreFlags();
-					}
-					else if (_isEventVIPNPC)
-					{
-						VIP.showJoinHTML(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventVIPNPCEnd)
-					{
-						VIP.showEndHTML(player, String.valueOf(getObjectId()));
+						questList.get(0).notifyFirstTalk(this, player);
 					}
 					else
 					{
-						final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
-						if (questList.size() == 1)
-						{
-							questList.get(0).notifyFirstTalk(this, player);
-						}
-						else
-						{
-							showChatWindow(player, 0);
-						}
+						showChatWindow(player, 0);
 					}
+					
 					// Like L2OFF player must rotate to the Npc
 					player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, this);
 				}
@@ -993,50 +945,15 @@ public class NpcInstance extends Creature
 						
 						// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance to display a social action of the NpcInstance on their client
 						broadcastSocialAction(Rnd.get(8));
-						// Open a chat window on client with the text of the NpcInstance
-						if (isEventMob)
+						
+						final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
+						if (questList.size() == 1)
 						{
-							GameEvent.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventMobTvT)
-						{
-							TvT.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventMobDM)
-						{
-							DM.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventMobCTF)
-						{
-							CTF.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isCTF_Flag && player._inEventCTF)
-						{
-							CTF.showFlagHtml(player, String.valueOf(getObjectId()), _CTF_FlagTeamName);
-						}
-						else if (_isCTF_throneSpawn)
-						{
-							CTF.checkRestoreFlags();
-						}
-						else if (_isEventVIPNPC)
-						{
-							VIP.showJoinHTML(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventVIPNPCEnd)
-						{
-							VIP.showEndHTML(player, String.valueOf(getObjectId()));
+							questList.get(0).notifyFirstTalk(this, player);
 						}
 						else
 						{
-							final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
-							if (questList.size() == 1)
-							{
-								questList.get(0).notifyFirstTalk(this, player);
-							}
-							else
-							{
-								showChatWindow(player, 0);
-							}
+							showChatWindow(player, 0);
 						}
 					}
 					
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
index ce00abde6d..07ada4c532 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
@@ -52,9 +52,9 @@ public class ObservationInstance extends FolkInstance
 			return;
 		}
 		
-		if (player._inEventTvT || player._inEventDM || player._inEventCTF)
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("You already participated in Event!");
+			player.sendMessage("You already participate in an event!");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
index cb461bd6d1..5caeab9b0c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
@@ -107,9 +107,9 @@ public class OlympiadManagerInstance extends FolkInstance
 				}
 				case 4:
 				{
-					if (player.isRegisteredInFunEvent())
+					if (player.isRegisteredOnCustomEvent())
 					{
-						player.sendMessage("You are already registered to another Event");
+						player.sendMessage("You are already registered in an event.");
 						return;
 					}
 					Olympiad.getInstance().registerNoble(player, false);
@@ -117,9 +117,9 @@ public class OlympiadManagerInstance extends FolkInstance
 				}
 				case 5:
 				{
-					if (player.isRegisteredInFunEvent())
+					if (player.isRegisteredOnCustomEvent())
 					{
-						player.sendMessage("You are already registered to another Event");
+						player.sendMessage("You are already registered in an event.");
 						return;
 					}
 					Olympiad.getInstance().registerNoble(player, true);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index ab88fde2d6..5538fed51f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -19,13 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -83,11 +81,6 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.RebirthManager;
 import org.l2jmobius.gameserver.instancemanager.RecipeManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.AccessLevel;
 import org.l2jmobius.gameserver.model.BlockList;
 import org.l2jmobius.gameserver.model.Effect;
@@ -164,7 +157,6 @@ import org.l2jmobius.gameserver.model.skills.handlers.SkillSummon;
 import org.l2jmobius.gameserver.model.variables.AccountVariables;
 import org.l2jmobius.gameserver.model.variables.PlayerVariables;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.type.TownZone;
 import org.l2jmobius.gameserver.model.zone.type.WaterZone;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -193,7 +185,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ObservationMode;
 import org.l2jmobius.gameserver.network.serverpackets.ObservationReturn;
 import org.l2jmobius.gameserver.network.serverpackets.PartySmallWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetInventoryUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
 import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete;
 import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
@@ -268,12 +259,6 @@ public class PlayerInstance extends Playable
 	public static final int STORE_PRIVATE_MANUFACTURE = 5;
 	public static final int STORE_PRIVATE_PACKAGE_SELL = 8;
 	
-	public boolean _isVIP = false;
-	public boolean _inEventVIP = false;
-	public boolean _isNotVIP = false;
-	public boolean _isTheVIP = false;
-	public int _originalNameColourVIP;
-	public int _originalKarmaVIP;
 	private PlayerStatsHolder savedStatus = null;
 	private final long _instanceLoginTime;
 	protected long _toggleUse = 0;
@@ -312,43 +297,6 @@ public class PlayerInstance extends Playable
 	private boolean _isAio = false;
 	private long _aioEndTime = 0;
 	private boolean _expGain = true;
-	
-	public int eventX;
-	public int eventY;
-	public int eventZ;
-	public int eventKarma;
-	public int eventPvpKills;
-	public int eventPkKills;
-	public String eventTitle;
-	public List<String> kills = new LinkedList<>();
-	public boolean eventSitForced = false;
-	public boolean atEvent = false;
-	public String _teamNameTvT;
-	public String _originalTitleTvT;
-	public int _originalNameColorTvT = 0;
-	public int _countTvTkills;
-	public int _countTvTdies;
-	public int _originalKarmaTvT;
-	public boolean _inEventTvT = false;
-	public String _teamNameCTF;
-	public String _teamNameHaveFlagCTF;
-	public String _originalTitleCTF;
-	public int _originalNameColorCTF = 0;
-	public int _originalKarmaCTF;
-	public int _countCTFflags;
-	public boolean _inEventCTF = false;
-	public boolean _haveFlagCTF = false;
-	public Future<?> _posCheckerCTF = null;
-	public String _originalTitleDM;
-	public int _originalNameColorDM = 0;
-	public int _countDMkills;
-	public int _originalKarmaDM;
-	public boolean _inEventDM = false;
-	public int _originalNameColor;
-	public int _countKills;
-	public int _originalKarma;
-	public int _eventKills;
-	public boolean _inEvent = false;
 	private boolean _inOlympiadMode = false;
 	private boolean _olympiadStart = false;
 	private int[] _olympiadPosition;
@@ -450,6 +398,8 @@ public class PlayerInstance extends Playable
 	private final int[] _loto = new int[5];
 	private final int[] _race = new int[2];
 	private final BlockList _blockList = new BlockList(this);
+	private boolean _isRegisteredOnCustomEvent = false;
+	private boolean _isOnCustomEvent = false;
 	private int _team = 0;
 	private int _alliedVarkaKetra = 0;
 	private int _hasCoupon = 0;
@@ -494,7 +444,6 @@ public class PlayerInstance extends Playable
 	private int _engageid = 0;
 	private boolean _marryrequest = false;
 	private boolean _marryaccepted = false;
-	private int quakeSystem = 0;
 	private boolean _isLocked = false;
 	private boolean _isStored = false;
 	private int _masteryWeapPenalty = 0;
@@ -649,13 +598,6 @@ public class PlayerInstance extends Playable
 				return;
 			}
 			
-			// during teleport phase, players cant do any attack
-			if ((TvT.isTeleport() && _inEventTvT) || (CTF.isTeleport() && _inEventCTF) || (DM.isTeleport() && _inEventDM))
-			{
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
 			// Pk protection config
 			if (Config.ALLOW_CHAR_KILL_PROTECT && !isGM() && target.isPlayer() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getKarma() == 0))
 			{
@@ -703,13 +645,6 @@ public class PlayerInstance extends Playable
 				return;
 			}
 			
-			// during teleport phase, players cant do any attack
-			if ((TvT.isTeleport() && _inEventTvT) || (CTF.isTeleport() && _inEventCTF) || (DM.isTeleport() && _inEventDM))
-			{
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
 			super.doCast(skill);
 			
 			if (!skill.isOffensive())
@@ -1177,13 +1112,6 @@ public class PlayerInstance extends Playable
 	 */
 	public void logout(boolean kicked)
 	{
-		// prevent from player disconnect when in Event
-		if (atEvent)
-		{
-			sendMessage("A superior power doesn't allow you to leave the event.");
-			sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		
 		_kicked = kicked;
 		closeNetConnection();
 	}
@@ -3142,19 +3070,7 @@ public class PlayerInstance extends Playable
 			stopFakeDeath(null);
 		}
 		
-		if (GameEvent.active && eventSitForced)
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up ...");
-		}
-		else if ((TvT.isSitForced() && _inEventTvT) || (CTF.isSitForced() && _inEventCTF) || (DM.isSitForced() && _inEventDM))
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-		}
-		else if (VIP._sitForced && _inEventVIP)
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-		}
-		else if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
+		if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
 		{
 			if (_relax)
 			{
@@ -4336,25 +4252,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public void onAction(PlayerInstance player)
 	{
-		// no Interaction with not participant to events
-		if (((TvT.isStarted() || TvT.isTeleport()) && !Config.TVT_ALLOW_INTERFERENCE) || ((CTF.isStarted() || CTF.isTeleport()) && !Config.CTF_ALLOW_INTERFERENCE) || ((DM.hasStarted() || DM.isTeleport()) && !Config.DM_ALLOW_INTERFERENCE))
-		{
-			if ((_inEventTvT && !player._inEventTvT) || (!_inEventTvT && player._inEventTvT))
-			{
-				player.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if ((_inEventCTF && !player._inEventCTF) || (!_inEventCTF && player._inEventCTF))
-			{
-				player.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if ((_inEventDM && !player._inEventDM) || (!_inEventDM && player._inEventDM))
-			{
-				player.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-		}
 		// Check if the PlayerInstance is confused
 		if (player.isOutOfControl())
 		{
@@ -4448,25 +4345,6 @@ public class PlayerInstance extends Playable
 		}
 		else // Like L2OFF set the target of the PlayerInstance player
 		{
-			if (((TvT.isStarted() || TvT.isTeleport()) && !Config.TVT_ALLOW_INTERFERENCE) || ((CTF.isStarted() || CTF.isTeleport()) && !Config.CTF_ALLOW_INTERFERENCE) || ((DM.hasStarted() || DM.isTeleport()) && !Config.DM_ALLOW_INTERFERENCE))
-			{
-				if ((_inEventTvT && !player._inEventTvT) || (!_inEventTvT && player._inEventTvT))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-				else if ((_inEventCTF && !player._inEventCTF) || (!_inEventCTF && player._inEventCTF))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-				else if ((_inEventDM && !player._inEventDM) || (!_inEventDM && player._inEventDM))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-			}
-			
 			// Check if the PlayerInstance is confused
 			if (player.isOutOfControl())
 			{
@@ -4583,61 +4461,6 @@ public class PlayerInstance extends Playable
 		}
 	}
 	
-	@Override
-	public boolean isInFunEvent()
-	{
-		return (atEvent || isInStartedTVTEvent() || isInStartedDMEvent() || isInStartedCTFEvent() || isInStartedVIPEvent());
-	}
-	
-	public boolean isInStartedTVTEvent()
-	{
-		return (TvT.isStarted() && _inEventTvT);
-	}
-	
-	public boolean isRegisteredInTVTEvent()
-	{
-		return _inEventTvT;
-	}
-	
-	public boolean isInStartedDMEvent()
-	{
-		return (DM.hasStarted() && _inEventDM);
-	}
-	
-	public boolean isRegisteredInDMEvent()
-	{
-		return _inEventDM;
-	}
-	
-	public boolean isInStartedCTFEvent()
-	{
-		return (CTF.isStarted() && _inEventCTF);
-	}
-	
-	public boolean isRegisteredInCTFEvent()
-	{
-		return _inEventCTF;
-	}
-	
-	public boolean isInStartedVIPEvent()
-	{
-		return (VIP._started && _inEventVIP);
-	}
-	
-	public boolean isRegisteredInVIPEvent()
-	{
-		return _inEventVIP;
-	}
-	
-	/**
-	 * Checks if is registered in fun event.
-	 * @return true, if is registered in fun event
-	 */
-	public boolean isRegisteredInFunEvent()
-	{
-		return (atEvent || (_inEventTvT) || (_inEventDM) || (_inEventCTF) || (_inEventVIP) || Olympiad.getInstance().isRegistered(this));
-	}
-	
 	/**
 	 * Are player offensive skills locked.
 	 * @return true, if successful
@@ -5685,21 +5508,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean doDie(Creature killer)
 	{
-		if (Config.TW_RESS_ON_DIE)
-		{
-			final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-			if ((town != null) && isinTownWar())
-			{
-				if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-				{
-					reviveRequest(this, null, false);
-				}
-				else if (Config.TW_ALL_TOWNS)
-				{
-					reviveRequest(this, null, false);
-				}
-			}
-		}
 		// Kill the PlayerInstance
 		if (!super.doDie(killer))
 		{
@@ -5719,142 +5527,6 @@ public class PlayerInstance extends Playable
 		if (killer != null)
 		{
 			final PlayerInstance pk = killer.getActingPlayer();
-			if (pk != null)
-			{
-				if (Config.ENABLE_PK_INFO)
-				{
-					doPkInfo(pk);
-				}
-				
-				if (atEvent)
-				{
-					pk.kills.add(getName());
-				}
-				
-				if (_inEventTvT && pk._inEventTvT)
-				{
-					if (TvT.isTeleport() || TvT.isStarted())
-					{
-						if (!(pk._teamNameTvT.equals(_teamNameTvT)))
-						{
-							_countTvTdies++;
-							pk._countTvTkills++;
-							pk.setTitle("Kills: " + pk._countTvTkills);
-							pk.sendPacket(new PlaySound(0, "ItemSound.quest_itemget", this));
-							pk.broadcastUserInfo();
-							TvT.setTeamKillsCount(pk._teamNameTvT, TvT.teamKillsCount(pk._teamNameTvT) + 1);
-							pk.broadcastUserInfo();
-						}
-						else
-						{
-							pk.sendMessage("You are a teamkiller !!! Teamkills not counting.");
-						}
-						sendMessage("You will be revived and teleported to team spot in " + (Config.TVT_REVIVE_DELAY / 1000) + " seconds!");
-						ThreadPool.schedule(() ->
-						{
-							teleToLocation((TvT._teamsX.get(TvT._teams.indexOf(_teamNameTvT)) + Rnd.get(201)) - 100, (TvT._teamsY.get(TvT._teams.indexOf(_teamNameTvT)) + Rnd.get(201)) - 100, TvT._teamsZ.get(TvT._teams.indexOf(_teamNameTvT)));
-							doRevive();
-						}, Config.TVT_REVIVE_DELAY);
-					}
-				}
-				else if (_inEventTvT)
-				{
-					if (TvT.isTeleport() || TvT.isStarted())
-					{
-						sendMessage("You will be revived and teleported to team spot in " + (Config.TVT_REVIVE_DELAY / 1000) + " seconds!");
-						ThreadPool.schedule(() ->
-						{
-							teleToLocation(TvT._teamsX.get(TvT._teams.indexOf(_teamNameTvT)), TvT._teamsY.get(TvT._teams.indexOf(_teamNameTvT)), TvT._teamsZ.get(TvT._teams.indexOf(_teamNameTvT)));
-							doRevive();
-							broadcastPacket(new SocialAction(getObjectId(), 15));
-						}, Config.TVT_REVIVE_DELAY);
-					}
-				}
-				else if (_inEventCTF)
-				{
-					if (CTF.isTeleport() || CTF.isStarted())
-					{
-						sendMessage("You will be revived and teleported to team flag in 20 seconds!");
-						if (_haveFlagCTF)
-						{
-							removeCTFFlagOnDie();
-						}
-						ThreadPool.schedule(() ->
-						{
-							teleToLocation(CTF._teamsX.get(CTF._teams.indexOf(_teamNameCTF)), CTF._teamsY.get(CTF._teams.indexOf(_teamNameCTF)), CTF._teamsZ.get(CTF._teams.indexOf(_teamNameCTF)));
-							doRevive();
-						}, 20000);
-					}
-				}
-				else if (_inEventDM && pk._inEventDM)
-				{
-					if (DM.isTeleport() || DM.hasStarted())
-					{
-						pk._countDMkills++;
-						pk.setTitle("Kills: " + pk._countDMkills);
-						pk.sendPacket(new PlaySound(0, "ItemSound.quest_itemget", this));
-						pk.broadcastUserInfo();
-						
-						if (Config.DM_ENABLE_KILL_REWARD)
-						{
-							final Item reward = ItemTable.getInstance().getTemplate(Config.DM_KILL_REWARD_ID);
-							pk.getInventory().addItem("DM Kill Reward", Config.DM_KILL_REWARD_ID, Config.DM_KILL_REWARD_AMOUNT, this, null);
-							pk.sendMessage("You have earned " + Config.DM_KILL_REWARD_AMOUNT + " item(s) of ID " + reward.getName() + ".");
-						}
-						
-						sendMessage("You will be revived and teleported to spot in 20 seconds!");
-						ThreadPool.schedule(() ->
-						{
-							final Location ploc = DM.getPlayersSpawnLocation();
-							teleToLocation(ploc.getX(), ploc.getY(), ploc.getZ());
-							doRevive();
-						}, Config.DM_REVIVE_DELAY);
-					}
-				}
-				else if (_inEventDM)
-				{
-					if (DM.isTeleport() || DM.hasStarted())
-					{
-						sendMessage("You will be revived and teleported to spot in 20 seconds!");
-						ThreadPool.schedule(() ->
-						{
-							final Location ploc = DM.getPlayersSpawnLocation();
-							teleToLocation(ploc.getX(), ploc.getY(), ploc.getZ());
-							doRevive();
-						}, 20000);
-					}
-				}
-				else if (_inEventVIP && VIP._started)
-				{
-					if (_isTheVIP && !pk._inEventVIP)
-					{
-						AnnouncementsTable.getInstance().announceToAll("VIP Killed by non-event character. VIP going back to initial spawn.");
-						doRevive();
-						teleToLocation(VIP._startX, VIP._startY, VIP._startZ);
-					}
-					else if (_isTheVIP && pk._inEventVIP)
-					{
-						VIP.vipDied();
-					}
-					else
-					{
-						sendMessage("You will be revived and teleported to team spot in 20 seconds!");
-						ThreadPool.schedule(() ->
-						{
-							doRevive();
-							if (_isVIP)
-							{
-								teleToLocation(VIP._startX, VIP._startY, VIP._startZ);
-							}
-							else
-							{
-								teleToLocation(VIP._endX, VIP._endY, VIP._endZ);
-							}
-						}, 20000);
-					}
-					broadcastUserInfo();
-				}
-			}
 			
 			// Clear resurrect xp calculation
 			setExpBeforeDeath(0);
@@ -5917,39 +5589,25 @@ public class PlayerInstance extends Playable
 		
 		stopRentPet();
 		stopWaterTask();
-		quakeSystem = 0;
 		
 		// leave war legend aura if enabled
 		_heroConsecutiveKillCount = 0;
 		if (Config.WAR_LEGEND_AURA && !_hero && _isPvpHero)
 		{
 			setHeroAura(false);
-			sendMessage("You leaved War Legend State");
+			sendMessage("War Legend state removed.");
 		}
 		
 		return true;
 	}
 	
-	/**
-	 * Removes the ctf flag on die.
-	 */
-	public void removeCTFFlagOnDie()
-	{
-		CTF._flagsTaken.set(CTF._teams.indexOf(_teamNameHaveFlagCTF), false);
-		CTF.spawnFlag(_teamNameHaveFlagCTF);
-		CTF.removeFlagFromPlayer(this);
-		broadcastUserInfo();
-		_haveFlagCTF = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(CTF.getEventName() + "(CTF): " + _teamNameHaveFlagCTF + "'s flag returned.");
-	}
-	
 	/**
 	 * On die drop item.
 	 * @param killer the killer
 	 */
 	private void onDieDropItem(Creature killer)
 	{
-		if (atEvent || (TvT.isStarted() && _inEventTvT) || (DM.hasStarted() && _inEventDM) || (CTF.isStarted() && _inEventCTF) || (VIP._started && _inEventVIP) || (killer == null))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6070,7 +5728,7 @@ public class PlayerInstance extends Playable
 			return;
 		}
 		
-		if ((_inEventCTF && CTF.isStarted()) || (_inEventTvT && TvT.isStarted()) || (_inEventVIP && VIP._started) || (_inEventDM && DM.hasStarted()))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6137,7 +5795,7 @@ public class PlayerInstance extends Playable
 			}
 			
 			// 'No war' or 'One way war' -> 'Normal PK'
-			if ((!_inEventTvT || !TvT.isStarted()) || (!_inEventCTF || !CTF.isStarted()) || (!_inEventVIP || !VIP._started) || (!_inEventDM || !DM.hasStarted()))
+			if (!isOnCustomEvent())
 			{
 				if (targetPlayer.getKarma() > 0) // Target player has karma
 				{
@@ -6166,7 +5824,7 @@ public class PlayerInstance extends Playable
 			AnnouncementsTable.getInstance().announceToAll("Player " + getName() + " killed Player " + target.getName());
 		}
 		
-		if (_inEventDM && DM.hasStarted())
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6314,22 +5972,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void increasePvpKills()
 	{
-		final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-		if ((town != null) && isinTownWar())
-		{
-			if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-			else if (Config.TW_ALL_TOWNS)
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-		}
-		
-		if ((TvT.isStarted() && _inEventTvT) || (DM.hasStarted() && _inEventDM) || (CTF.isStarted() && _inEventCTF) || (VIP._started && _inEventVIP))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6364,230 +6007,17 @@ public class PlayerInstance extends Playable
 		updatePvPColor(getPvpKills());
 		broadcastUserInfo();
 		
-		if (Config.ALLOW_QUAKE_SYSTEM)
-		{
-			QuakeSystem();
-		}
-		
 		// Send a Server->Client UserInfo packet to attacker with its Karma and PK Counter
 		sendPacket(new UserInfo(this));
 	}
 	
-	public void QuakeSystem()
-	{
-		quakeSystem++;
-		switch (quakeSystem)
-		{
-			case 5:
-			{
-				if (Config.ENABLE_ANTI_PVP_FARM_MSG)
-				{
-					final CreatureSay cs12 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " 5 consecutive kill! Only Gm."); // 8D
-					for (PlayerInstance player : World.getInstance().getAllPlayers())
-					{
-						if ((player != null) && player.isOnline() && player.isGM())
-						{
-							player.sendPacket(cs12);
-						}
-					}
-				}
-				break;
-			}
-			case 6:
-			{
-				final CreatureSay cs = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is Dominating!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs);
-					}
-				}
-				break;
-			}
-			case 9:
-			{
-				final CreatureSay cs2 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Rampage!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs2);
-					}
-				}
-				break;
-			}
-			case 14:
-			{
-				final CreatureSay cs3 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Killing Spree!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs3);
-					}
-				}
-				break;
-			}
-			case 18:
-			{
-				final CreatureSay cs4 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Monster Kill!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs4);
-					}
-				}
-				break;
-			}
-			case 22:
-			{
-				final CreatureSay cs5 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is Unstoppable!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs5);
-					}
-				}
-				break;
-			}
-			case 25:
-			{
-				final CreatureSay cs6 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on an Ultra Kill!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs6);
-					}
-				}
-				break;
-			}
-			case 28:
-			{
-				final CreatureSay cs7 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " God Blessed!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs7);
-					}
-				}
-				break;
-			}
-			case 32:
-			{
-				final CreatureSay cs8 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is Wicked Sick!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs8);
-					}
-				}
-				break;
-			}
-			case 35:
-			{
-				final CreatureSay cs9 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Ludricrous Kill!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs9);
-					}
-				}
-				break;
-			}
-			case 40:
-			{
-				final CreatureSay cs10 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is GodLike!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs10);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Get info on pk's from pk table.
-	 * @param playerWhoKilled the player who killed
-	 */
-	public void doPkInfo(PlayerInstance playerWhoKilled)
-	{
-		final String killer = playerWhoKilled.getName();
-		final String killed = getName();
-		int killCount = 0;
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement statement = con.prepareStatement("SELECT kills FROM pkkills WHERE killerId=? AND killedId=?");
-			statement.setString(1, killer);
-			statement.setString(2, killed);
-			final ResultSet rset = statement.executeQuery();
-			if (rset.next())
-			{
-				killCount = rset.getInt("kills");
-			}
-			rset.close();
-			statement.close();
-		}
-		catch (SQLException e)
-		{
-			LOGGER.warning(e.toString());
-		}
-		
-		if (killCount >= 1)
-		{
-			killCount++;
-			try (Connection con = DatabaseFactory.getConnection())
-			{
-				final PreparedStatement statement = con.prepareStatement("UPDATE pkkills SET kills=? WHERE killerId=? AND killedId=?");
-				statement.setInt(1, killCount);
-				statement.setString(2, killer);
-				statement.setString(3, killed);
-				statement.execute();
-				statement.close();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.info("Could not update pkKills, got: " + e.getMessage());
-			}
-			sendMessage("You have been killed " + kills + " times by " + playerWhoKilled.getName() + ".");
-			playerWhoKilled.sendMessage("You have killed " + getName() + " " + kills + " times.");
-		}
-		else
-		{
-			try (Connection con = DatabaseFactory.getConnection())
-			{
-				final PreparedStatement statement = con.prepareStatement("INSERT INTO pkkills (killerId,killedId,kills) VALUES (?,?,?)");
-				statement.setString(1, killer);
-				statement.setString(2, killed);
-				statement.setInt(3, 1);
-				statement.execute();
-				statement.close();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.info("Could not add pkKills, got: " + e.getMessage());
-			}
-			sendMessage("This is the first time you have been killed by " + playerWhoKilled.getName() + ".");
-			playerWhoKilled.sendMessage("You have killed " + getName() + " for the first time.");
-		}
-	}
-	
 	/**
 	 * Increase pk count, karma and send the info to the player.
 	 * @param targLVL : level of the killed player
 	 */
 	public void increasePkKillsAndKarma(int targLVL)
 	{
-		if ((TvT.isStarted() && _inEventTvT) || (DM.hasStarted() && _inEventDM) || (CTF.isStarted() && _inEventCTF) || (VIP._started && _inEventVIP))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6654,26 +6084,6 @@ public class PlayerInstance extends Playable
 		// Add karma to attacker and increase its PK counter
 		setPkKills(getPkKills() + 1);
 		
-		final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-		if ((town == null) || (isinTownWar() && Config.TW_ALLOW_KARMA))
-		{
-			setKarma(getKarma() + newKarma);
-		}
-		
-		if ((town != null) && isinTownWar())
-		{
-			if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-			else if (Config.TW_ALL_TOWNS && (town.getTownId() != 0))
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-		}
-		
 		if (Config.PVP_PK_TITLE)
 		{
 			updateTitle();
@@ -6728,7 +6138,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void updatePvPStatus()
 	{
-		if ((TvT.isStarted() && _inEventTvT) || (CTF.isStarted() && _inEventCTF) || (DM.hasStarted() && _inEventDM) || (VIP._started && _inEventVIP))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6766,7 +6176,7 @@ public class PlayerInstance extends Playable
 			return;
 		}
 		
-		if ((TvT.isStarted() && _inEventTvT && targetPlayer._inEventTvT) || (DM.hasStarted() && _inEventDM && targetPlayer._inEventDM) || (CTF.isStarted() && _inEventCTF && targetPlayer._inEventCTF) || (VIP._started && _inEventVIP && targetPlayer._inEventVIP))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6848,7 +6258,7 @@ public class PlayerInstance extends Playable
 		
 		// Calculate the Experience loss
 		long lostExp = 0;
-		if (!atEvent && (!_inEventTvT || !TvT.isStarted()) && (!_inEventDM || !DM.hasStarted()) && (!_inEventCTF || !CTF.isStarted()) && (!_inEventVIP || !VIP._started))
+		if (!isOnCustomEvent())
 		{
 			final byte maxLevel = ExperienceData.getInstance().getMaxLevel();
 			if (lvl < maxLevel)
@@ -6909,7 +6319,6 @@ public class PlayerInstance extends Playable
 		stopRentPet();
 		stopPvpRegTask();
 		stopPunishTask(true);
-		quakeSystem = 0;
 	}
 	
 	/**
@@ -9528,7 +8937,7 @@ public class PlayerInstance extends Playable
 			}
 		}
 		
-		if ((attacker instanceof Playable) && isInFunEvent())
+		if ((attacker instanceof Playable) && isOnCustomEvent())
 		{
 			PlayerInstance player = null;
 			if (attacker instanceof PlayerInstance)
@@ -9543,9 +8952,9 @@ public class PlayerInstance extends Playable
 			if (player != null)
 			{
 				// checks for events
-				if (player.isInFunEvent())
+				if (player.isOnCustomEvent())
 				{
-					return (_inEventTvT && player._inEventTvT && TvT.isStarted() && !_teamNameTvT.equals(player._teamNameTvT)) || (_inEventCTF && player._inEventCTF && CTF.isStarted() && !_teamNameCTF.equals(player._teamNameCTF)) || (_inEventDM && player._inEventDM && DM.hasStarted()) || (_inEventVIP && player._inEventVIP && VIP._started);
+					return (isOnCustomEvent() && player.isOnCustomEvent() && (getTeam() != player.getTeam()));
 				}
 				return false;
 			}
@@ -10067,10 +9476,6 @@ public class PlayerInstance extends Playable
 			// Check if a Forced ATTACK is in progress on non-attackable target
 			if (!target.isAutoAttackable(this) //
 				&& (!forceUse && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262 /* Double Heart Shot */))) //
-				&& (!_inEventTvT || !TvT.isStarted()) //
-				&& (!_inEventDM || !DM.hasStarted()) //
-				&& (!_inEventCTF || !CTF.isStarted()) //
-				&& (!_inEventVIP || !VIP._started) //
 				&& (skillTargetType != SkillTargetType.TARGET_AURA) //
 				&& (skillTargetType != SkillTargetType.TARGET_CLAN) //
 				&& (skillTargetType != SkillTargetType.TARGET_ALLY) //
@@ -10302,16 +9707,9 @@ public class PlayerInstance extends Playable
 		WorldObject target = worldObject;
 		
 		// Check if player and target are in events and on the same team.
-		if (target instanceof PlayerInstance)
+		if ((target instanceof PlayerInstance) && isOnCustomEvent() && skill.isOffensive())
 		{
-			if ((skill.isOffensive() && (_inEventTvT && target.getActingPlayer()._inEventTvT && TvT.isStarted() && !_teamNameTvT.equals(target.getActingPlayer()._teamNameTvT))) || (_inEventCTF && target.getActingPlayer()._inEventCTF && CTF.isStarted() && !_teamNameCTF.equals(target.getActingPlayer()._teamNameCTF)) || (_inEventDM && target.getActingPlayer()._inEventDM && DM.hasStarted()) || (_inEventVIP && target.getActingPlayer()._inEventVIP && VIP._started))
-			{
-				return true;
-			}
-			else if (isInFunEvent() && skill.isOffensive()) // same team return false
-			{
-				return false;
-			}
+			return target.getActingPlayer().isOnCustomEvent() && (getTeam() != target.getActingPlayer().getTeam());
 		}
 		
 		// check for PC->PC Pvp status
@@ -11596,6 +10994,27 @@ public class PlayerInstance extends Playable
 		return _lvlJoinedAcademy > 0;
 	}
 	
+	public boolean isRegisteredOnCustomEvent()
+	{
+		return _isRegisteredOnCustomEvent || _isOnCustomEvent;
+	}
+	
+	public void setRegisteredOnCustomEvent(boolean value)
+	{
+		_isRegisteredOnCustomEvent = value;
+	}
+	
+	@Override
+	public boolean isOnCustomEvent()
+	{
+		return _isOnCustomEvent;
+	}
+	
+	public void setOnCustomEvent(boolean value)
+	{
+		_isOnCustomEvent = value;
+	}
+	
 	/**
 	 * Sets the team.
 	 * @param team the new team
@@ -12493,7 +11912,7 @@ public class PlayerInstance extends Playable
 			getParty().getDimensionalRift().memberRessurected(this);
 		}
 		
-		if ((_inEventTvT && TvT.isStarted() && Config.TVT_REVIVE_RECOVERY) || (_inEventCTF && CTF.isStarted() && Config.CTF_REVIVE_RECOVERY) || (_inEventDM && DM.hasStarted() && Config.DM_REVIVE_RECOVERY))
+		if (isOnCustomEvent())
 		{
 			getStatus().setCurrentHp(getMaxHp());
 			getStatus().setCurrentMp(getMaxMp());
@@ -14693,26 +14112,6 @@ public class PlayerInstance extends Playable
 		_saymode = say;
 	}
 	
-	/**
-	 * Save event stats.
-	 */
-	public void saveEventStats()
-	{
-		_originalNameColor = getAppearance().getNameColor();
-		_originalKarma = getKarma();
-		_eventKills = 0;
-	}
-	
-	/**
-	 * Restore event stats.
-	 */
-	public void restoreEventStats()
-	{
-		getAppearance().setNameColor(_originalNameColor);
-		setKarma(_originalKarma);
-		_eventKills = 0;
-	}
-	
 	/**
 	 * Gets the current skill world position.
 	 * @return the current skill world position
@@ -15156,7 +14555,7 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean isFalling(int z)
 	{
-		if (isDead() || isFlying() || isInFunEvent() || isInsideZone(ZoneId.WATER))
+		if (isDead() || isFlying() || isInsideZone(ZoneId.WATER))
 		{
 			return false;
 		}
@@ -15503,22 +14902,6 @@ public class PlayerInstance extends Playable
 					sendMessage("You are in jail for " + (delayInMilliseconds / 60000) + " minutes.");
 				}
 				
-				if (_inEventCTF)
-				{
-					CTF.onDisconnect(this);
-				}
-				else if (_inEventDM)
-				{
-					DM.onDisconnect(this);
-				}
-				else if (_inEventTvT)
-				{
-					TvT.onDisconnect(this);
-				}
-				else if (_inEventVIP)
-				{
-					VIP.onDisconnect(this);
-				}
 				if (Olympiad.getInstance().isRegisteredInComp(this))
 				{
 					Olympiad.getInstance().removeDisconnectedCompetitor(this);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index da3fb8b9d9..dc093b114d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -322,8 +322,10 @@ public class VillageMasterInstance extends FolkInstance
 					{
 						return;
 					}
+					
 					player.setLocked(true);
 					boolean allowAddition = true;
+					
 					// Subclass exploit fix during add subclass
 					if (!player.getFloodProtectors().getSubclass().tryPerformAction("add subclass"))
 					{
@@ -331,19 +333,22 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
-					// You can't add Subclass when you are registered in Events (TVT, CTF, DM)
-					if (player._inEventTvT || player._inEventCTF || player._inEventDM)
+					
+					// You can't add subclass when you are registered in an event.
+					if (player.isRegisteredOnCustomEvent())
 					{
 						player.sendMessage("You can't add a subclass while in an event.");
 						player.setLocked(false);
 						return;
 					}
+					
 					// Check player level
 					if (player.getLevel() < 75)
 					{
 						player.sendMessage("You may not add a new sub class before you are level 75 on your previous class.");
 						allowAddition = false;
 					}
+					
 					// You can't add Subclass when you are registered in Olympiad
 					if (Olympiad.getInstance().isRegisteredInComp(player) || (player.getOlympiadGameId() > 0))
 					{
@@ -351,6 +356,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					if (allowAddition && !player.getSubClasses().isEmpty())
 					{
 						for (Iterator<SubClass> subList = iterSubClasses(player); subList.hasNext();)
@@ -364,6 +370,7 @@ public class VillageMasterInstance extends FolkInstance
 							}
 						}
 					}
+					
 					// If quest checking is enabled, verify if the character has completed the Mimir's Elixir (Path to Subclass) and Fate's Whisper (A Grade Weapon) quests by checking for instances of their unique reward items.
 					// If they both exist, remove both unique items and continue with adding the sub-class.
 					if (!Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS)
@@ -383,6 +390,7 @@ public class VillageMasterInstance extends FolkInstance
 							return;
 						}
 					}
+					
 					if (allowAddition)
 					{
 						final String className = PlayerTemplateData.getInstance().getClassNameById(paramOne);
@@ -416,7 +424,9 @@ public class VillageMasterInstance extends FolkInstance
 					{
 						return;
 					}
+					
 					player.setLocked(true);
+					
 					// Subclass exploit fix during change subclass
 					if (!player.getFloodProtectors().getSubclass().tryPerformAction("change subclass"))
 					{
@@ -424,13 +434,15 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
-					// You can't change Subclass when you are registered in Events (TVT, CTF, DM)
-					if (player._inEventTvT || player._inEventCTF || player._inEventDM)
+					
+					// You can't change subclass when you are registered in an event.
+					if (player.isRegisteredOnCustomEvent())
 					{
 						player.sendMessage("You can't change subclass while in an event.");
 						player.setLocked(false);
 						return;
 					}
+					
 					// You can't change Subclass when you are registered in Olympiad
 					if (Olympiad.getInstance().isRegisteredInComp(player) || (player.getOlympiadGameId() > 0))
 					{
@@ -438,6 +450,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					player.setActiveClass(paramOne);
 					content.append("Change Subclass:<br>Your active sub class is now a <font color=\"LEVEL\">" + PlayerTemplateData.getInstance().getClassNameById(player.getActiveClass()) + "</font>.");
 					player.sendPacket(SystemMessageId.THE_TRANSFER_OF_SUB_CLASS_HAS_BEEN_COMPLETED); // Transfer completed.
@@ -472,7 +485,9 @@ public class VillageMasterInstance extends FolkInstance
 					{
 						return;
 					}
+					
 					player.setLocked(true);
+					
 					// Subclass exploit fix during delete subclass
 					if (!player.getFloodProtectors().getSubclass().tryPerformAction("delete subclass"))
 					{
@@ -480,13 +495,15 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
-					// You can't delete Subclass when you are registered in Events (TVT, CTF, DM)
-					if (player._inEventTvT || player._inEventCTF || player._inEventDM)
+					
+					// You can't delete subclass when you are registered in an event.
+					if (player.isRegisteredOnCustomEvent())
 					{
 						player.sendMessage("You can't delete a subclass while in an event.");
 						player.setLocked(false);
 						return;
 					}
+					
 					// You can't delete Subclass when you are registered in Olympiad
 					if (Olympiad.getInstance().isRegisteredInComp(player) || (player.getOlympiadGameId() > 0))
 					{
@@ -494,6 +511,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					if (player.modifySubClass(paramOne, paramTwo))
 					{
 						player.setActiveClass(paramOne);
@@ -514,6 +532,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					player.setLocked(false);
 					break;
 				}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index e6865e65e6..fd7260b1c9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -20,7 +20,6 @@ import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.ExperienceData;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.SubClass;
 import org.l2jmobius.gameserver.model.actor.instance.ClassMasterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
@@ -214,15 +213,6 @@ public class PlayerStat extends PlayableStat
 			getActiveChar().sendPacket(SystemMessageId.YOUR_LEVEL_HAS_INCREASED);
 		}
 		
-		if (getActiveChar().isInFunEvent())
-		{
-			if (getActiveChar()._inEventTvT && (TvT.getMaxLevel() == getLevel()) && !TvT.isStarted())
-			{
-				TvT.removePlayer(getActiveChar());
-			}
-			getActiveChar().sendMessage("Your event sign up was canceled.");
-		}
-		
 		getActiveChar().rewardSkills(); // Give Expertise skill of this level
 		if (getActiveChar().getClan() != null)
 		{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 0572db2d15..ed4950b9d8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1033,9 +1033,10 @@ public class Olympiad
 			spectator.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_GRAND_OLYMPIAD_GAMES_MATCH_WHILE_YOU_ARE_ON_THE_WAITING_LIST);
 			return;
 		}
-		if (spectator.isRegisteredInFunEvent())
+		
+		if (spectator.isRegisteredOnCustomEvent())
 		{
-			spectator.sendMessage("You are already registered to an Event");
+			spectator.sendMessage("You are already registered in an event.");
 			return;
 		}
 		
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java
index d9752b2133..78b6359a45 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -42,11 +42,6 @@ import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.data.sql.OfflineTraderTable;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -57,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
 import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.util.EventData;
 import org.l2jmobius.gameserver.util.FloodProtectors;
 
 import io.netty.channel.Channel;
@@ -596,29 +590,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 				final PlayerInstance player = _player;
 				if (player != null) // this should only happen on connection loss
 				{
-					// we store all data from players who are disconnected while in an event in order to restore it in the next login
-					if (player.atEvent)
-					{
-						final EventData data = new EventData(player.eventX, player.eventY, player.eventZ, player.eventKarma, player.eventPvpKills, player.eventPkKills, player.eventTitle, player.kills, player.eventSitForced);
-						GameEvent.connectionLossData.put(player.getName(), data);
-					}
-					else if (player._inEventCTF)
-					{
-						CTF.onDisconnect(player);
-					}
-					else if (player._inEventDM)
-					{
-						DM.onDisconnect(player);
-					}
-					else if (player._inEventTvT)
-					{
-						TvT.onDisconnect(player);
-					}
-					else if (player._inEventVIP)
-					{
-						VIP.onDisconnect(player);
-					}
-					
 					if (player.isFlying())
 					{
 						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
@@ -677,29 +648,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 				final PlayerInstance player = _player;
 				if (player != null) // this should only happen on connection loss
 				{
-					// we store all data from players who are disconnected while in an event in order to restore it in the next login
-					if (player.atEvent)
-					{
-						final EventData data = new EventData(player.eventX, player.eventY, player.eventZ, player.eventKarma, player.eventPvpKills, player.eventPkKills, player.eventTitle, player.kills, player.eventSitForced);
-						GameEvent.connectionLossData.put(player.getName(), data);
-					}
-					else if (player._inEventCTF)
-					{
-						CTF.onDisconnect(player);
-					}
-					else if (player._inEventDM)
-					{
-						DM.onDisconnect(player);
-					}
-					else if (player._inEventTvT)
-					{
-						TvT.onDisconnect(player);
-					}
-					else if (player._inEventVIP)
-					{
-						VIP.onDisconnect(player);
-					}
-					
 					if (player.isFlying())
 					{
 						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
@@ -719,7 +667,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 					if (!player.isKicked() //
 						&& !Olympiad.getInstance().isRegistered(player) //
 						&& !player.isInOlympiadMode() //
-						&& !player.isInFunEvent() //
 						&& ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) //
 							|| (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE)))
 					{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
index fcfc95e327..04afff2b36 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
@@ -18,9 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -100,19 +97,12 @@ public class AttackRequest implements IClientIncomingPacket
 			return;
 		}
 		
-		// During teleport phase, players cant do any attack
-		if ((TvT.isTeleport() && player._inEventTvT) || (CTF.isTeleport() && player._inEventCTF) || (DM.isTeleport() && player._inEventDM))
-		{
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
-		// No attacks to same team in Event
-		if (TvT.isStarted())
+		// No attacks to same team in event
+		if (player.isOnCustomEvent())
 		{
 			if (target instanceof PlayerInstance)
 			{
-				if ((player._inEventTvT && ((PlayerInstance) target)._inEventTvT) && player._teamNameTvT.equals(((PlayerInstance) target)._teamNameTvT))
+				if (player.getTeam() == ((PlayerInstance) target).getTeam())
 				{
 					player.sendPacket(ActionFailed.STATIC_PACKET);
 					return;
@@ -120,28 +110,7 @@ public class AttackRequest implements IClientIncomingPacket
 			}
 			else if (target instanceof SummonInstance)
 			{
-				if ((player._inEventTvT && ((SummonInstance) target).getOwner()._inEventTvT) && player._teamNameTvT.equals(((SummonInstance) target).getOwner()._teamNameTvT))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-			}
-		}
-		
-		// No attacks to same team in Event
-		if (CTF.isStarted())
-		{
-			if (target instanceof PlayerInstance)
-			{
-				if ((player._inEventCTF && ((PlayerInstance) target)._inEventCTF) && player._teamNameCTF.equals(((PlayerInstance) target)._teamNameCTF))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-			}
-			else if (target instanceof SummonInstance)
-			{
-				if ((player._inEventCTF && ((SummonInstance) target).getOwner()._inEventCTF) && player._teamNameCTF.equals(((SummonInstance) target).getOwner()._teamNameCTF))
+				if (player.getTeam() == ((SummonInstance) target).getOwner().getTeam())
 				{
 					player.sendPacket(ActionFailed.STATIC_PACKET);
 					return;
@@ -153,8 +122,7 @@ public class AttackRequest implements IClientIncomingPacket
 		{
 			target.onAction(player);
 		}
-		else if ((target.getObjectId() != player.getObjectId()) && (player.getPrivateStoreType() == 0)
-		/* && activeChar.getActiveRequester() ==null */)
+		else if ((target.getObjectId() != player.getObjectId()) && (player.getPrivateStoreType() == 0) /* && activeChar.getActiveRequester() ==null */)
 		{
 			target.onForcedAttack(player);
 		}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 48e15ec35a..32a2895555 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -43,10 +43,6 @@ import org.l2jmobius.gameserver.instancemanager.PetitionManager;
 import org.l2jmobius.gameserver.instancemanager.RebirthManager;
 import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Wedding;
@@ -208,15 +204,6 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply death penalty
 		player.restoreDeathPenaltyBuffLevel();
 		
-		if (GameEvent.active && GameEvent.connectionLossData.containsKey(player.getName()) && GameEvent.isOnEvent(player))
-		{
-			GameEvent.restoreChar(player);
-		}
-		else if (GameEvent.connectionLossData.containsKey(player.getName()))
-		{
-			GameEvent.restoreAndTeleChar(player);
-		}
-		
 		// SECURE FIX - Anti Overenchant Cheat!!
 		if (Config.MAX_ITEM_ENCHANT_KICK > 0)
 		{
@@ -401,21 +388,6 @@ public class EnterWorld implements IClientIncomingPacket
 			RebirthManager.getInstance().grantRebirthSkills(player);
 		}
 		
-		if (TvT._savePlayers.contains(player.getName()))
-		{
-			TvT.addDisconnectedPlayer(player);
-		}
-		
-		if (CTF._savePlayers.contains(player.getName()))
-		{
-			CTF.addDisconnectedPlayer(player);
-		}
-		
-		if (DM._savePlayers.contains(player.getName()))
-		{
-			DM.addDisconnectedPlayer(player);
-		}
-		
 		// Means that it's not ok multiBox situation, so logout.
 		if (!player.canMultiBox())
 		{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
index 452d6ee796..d4f0d1f398 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
@@ -50,9 +50,9 @@ public class Logout implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player.isInFunEvent() && !player.isGM())
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("You cannot logout while in registered in an event.");
+			player.sendMessage("You cannot logout while registered in an event.");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
@@ -87,12 +87,6 @@ public class Logout implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player.atEvent)
-		{
-			player.sendPacket(SystemMessage.sendString("A superior power doesn't allow you to leave the event."));
-			return;
-		}
-		
 		if (player.isInOlympiadMode() || Olympiad.getInstance().isRegistered(player))
 		{
 			player.sendMessage("You can't Logout in Olympiad mode.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index d947ea2b0a..3aed06cf05 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -177,17 +177,20 @@ public class RequestActionUse implements IClientIncomingPacket
 							return;
 						}
 					}
+					
 					if (player.isInOlympiadMode() && !player.isOlympiadStart())
 					{
 						// if PlayerInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
 						player.sendPacket(ActionFailed.STATIC_PACKET);
 						return;
 					}
-					if ((target instanceof PlayerInstance) && !player.getAccessLevel().allowPeaceAttack() && Creature.isInsidePeaceZone(pet, target) && (!player.isInFunEvent() || !((PlayerInstance) target).isInFunEvent()))
+					
+					if ((target instanceof PlayerInstance) && !player.getAccessLevel().allowPeaceAttack() && Creature.isInsidePeaceZone(pet, target) && (!player.isOnCustomEvent() || !((PlayerInstance) target).isOnCustomEvent()))
 					{
 						player.sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE);
 						return;
 					}
+					
 					if (target.isAutoAttackable(player) || _ctrlPressed)
 					{
 						if (target instanceof DoorInstance)
@@ -274,7 +277,7 @@ public class RequestActionUse implements IClientIncomingPacket
 						// A strider cannot be ridden while in battle
 						player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
 					}
-					else if (player.isInFunEvent())
+					else if (player.isOnCustomEvent())
 					{
 						// A strider cannot be ridden while in event
 						player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 59d94ef9e4..5813b9427e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -24,11 +24,6 @@ import org.l2jmobius.gameserver.data.xml.AdminData;
 import org.l2jmobius.gameserver.handler.AdminCommandHandler;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.RebirthManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -156,99 +151,6 @@ public class RequestBypassToServer implements IClientIncomingPacket
 				
 				try
 				{
-					if (_command.substring(endOfId + 1).startsWith("event_participate"))
-					{
-						GameEvent.inscribePlayer(player);
-					}
-					else if (_command.substring(endOfId + 1).startsWith("tvt_player_join "))
-					{
-						final String teamName = _command.substring(endOfId + 1).substring(16);
-						if (TvT.isJoining())
-						{
-							TvT.addPlayer(player, teamName);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can not join now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("tvt_player_leave"))
-					{
-						if (TvT.isJoining())
-						{
-							TvT.removePlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can not leave now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("dmevent_player_join"))
-					{
-						if (DM.isJoining())
-						{
-							DM.addPlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't join now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("dmevent_player_leave"))
-					{
-						if (DM.isJoining())
-						{
-							DM.removePlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't leave now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("ctf_player_join "))
-					{
-						final String teamName = _command.substring(endOfId + 1).substring(16);
-						if (CTF.isJoining())
-						{
-							CTF.addPlayer(player, teamName);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't join now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("ctf_player_leave"))
-					{
-						if (CTF.isJoining())
-						{
-							CTF.removePlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't leave now!");
-						}
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("vip_joinVIPTeam"))
-					{
-						VIP.addPlayerVIP(player);
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("vip_joinNotVIPTeam"))
-					{
-						VIP.addPlayerNotVIP(player);
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("vip_finishVIP"))
-					{
-						VIP.vipWin(player);
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("event_participate"))
-					{
-						GameEvent.inscribePlayer(player);
-					}
-					
 					final WorldObject object = World.getInstance().findObject(Integer.parseInt(id));
 					if ((Config.ALLOW_CLASS_MASTERS && Config.ALLOW_REMOTE_CLASS_MASTERS && (object instanceof ClassMasterInstance)) //
 						|| ((object instanceof NpcInstance) && (endOfId > 0) && player.isInsideRadius2D(object, NpcInstance.INTERACTION_DISTANCE)))
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index c3201ef5ea..109a13bf98 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
@@ -17,9 +17,6 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.BlockList;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
@@ -54,7 +51,7 @@ public class RequestJoinParty implements IClientIncomingPacket
 		
 		if (!client.getFloodProtectors().getPartyInvitation().tryPerformAction("PartyInvitation"))
 		{
-			requestor.sendMessage("You Cannot Invite into Party So Fast!");
+			requestor.sendMessage("You cannot invite into party so fast!");
 			return;
 		}
 		
@@ -64,18 +61,6 @@ public class RequestJoinParty implements IClientIncomingPacket
 			return;
 		}
 		
-		if ((requestor._inEventDM && (DM.isTeleport() || DM.hasStarted())) || (target._inEventDM && (DM.isTeleport() || DM.hasStarted())))
-		{
-			requestor.sendMessage("You can't invite that player in party!");
-			return;
-		}
-		
-		if ((requestor._inEventTvT && !target._inEventTvT && (TvT.isStarted() || TvT.isTeleport())) || (!requestor._inEventTvT && target._inEventTvT && (TvT.isStarted() || TvT.isTeleport())) || (requestor._inEventCTF && !target._inEventCTF && (CTF.isStarted() || CTF.isTeleport())) || (!requestor._inEventCTF && target._inEventCTF && (CTF.isStarted() || CTF.isTeleport())))
-		{
-			requestor.sendMessage("You can't invite that player in party: you or your target are in Event");
-			return;
-		}
-		
 		if (target.isInParty())
 		{
 			final SystemMessage msg = new SystemMessage(SystemMessageId.S1_IS_A_MEMBER_OF_ANOTHER_PARTY_AND_CANNOT_BE_INVITED);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index b4c5d36db1..7958abb824 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -116,10 +116,10 @@ public class RequestRestart implements IClientIncomingPacket
 			}
 		}
 		
-		// Check if player is in Event
-		if (player._inEventCTF || player._inEventDM || player._inEventTvT || player._inEventVIP)
+		// Check if player is in an event.
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("You can't restart during Event.");
+			player.sendMessage("You can't restart while registered in an event.");
 			player.sendPacket(RestartResponse.valueOf(false));
 			return;
 		}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
index a4246e2bff..5ef9b69037 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
@@ -24,12 +24,11 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
+import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.residences.ClanHall;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
@@ -74,6 +73,19 @@ public class RequestRestartPoint implements IClientIncomingPacket
 			return;
 		}
 		
+		// Custom event resurrection management.
+		if (player.isOnCustomEvent())
+		{
+			// This is an example, replace EventScriptName with proper event script name.
+			final Quest eventScript = QuestManager.getInstance().getQuest("EventScriptName");
+			if (eventScript != null)
+			{
+				// Notify onAdvEvent ResurrectPlayer event.
+				eventScript.notifyEvent("ResurrectPlayer", null, player);
+				return;
+			}
+		}
+		
 		final Castle castle = CastleManager.getInstance().getCastle(player.getX(), player.getY(), player.getZ());
 		if ((castle != null) && castle.getSiege().isInProgress() && (player.getClan() != null) && castle.getSiege().checkIsAttacker(player.getClan()))
 		{
@@ -99,9 +111,9 @@ public class RequestRestartPoint implements IClientIncomingPacket
 		@Override
 		public void run()
 		{
-			if ((_player._inEventTvT && TvT.isStarted()) || (_player._inEventDM && DM.hasStarted()) || (_player._inEventCTF && CTF.isStarted()))
+			if (_player.isOnCustomEvent())
 			{
-				_player.sendMessage("You cannot restart while participating in an event!");
+				_player.sendMessage("You cannot do that while participating in an event!");
 				return;
 			}
 			
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index 6839fcd147..95cc1e2e15 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -52,12 +52,6 @@ public class RequestUnEquipItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player._haveFlagCTF)
-		{
-			player.sendMessage("You can't unequip a CTF flag.");
-			return;
-		}
-		
 		final ItemInstance item = player.getInventory().getPaperdollItemByItemId(_slot);
 		if ((item != null) && item.isWear())
 		{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 03d0278f1a..d355008fd9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -99,13 +99,6 @@ public class TradeRequest implements IClientIncomingPacket
 			return;
 		}
 		
-		if (partner.isInFunEvent())
-		{
-			player.sendMessage("You can't request a trade when partner in event.");
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
 		if (partner.getActiveEnchantItem() != null)
 		{
 			player.sendMessage("You can't request a trade when partner is enchanting.");
@@ -162,13 +155,6 @@ public class TradeRequest implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player.isInFunEvent())
-		{
-			player.sendMessage("You can't request a trade when you are in event.");
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
 		if (player.getActiveEnchantItem() != null)
 		{
 			player.sendMessage("You can't request a trade when you enchanting.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 83fa36b444..39b0dea3e7 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -307,16 +307,9 @@ public class UseItem implements IClientIncomingPacket
 			int bodyPart = item.getItem().getBodyPart();
 			
 			// Like L2OFF you can't use equips while you are casting
-			if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted() || (player._inEventCTF && player._haveFlagCTF)))
+			if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted()))
 			{
-				if (player._inEventCTF && player._haveFlagCTF)
-				{
-					player.sendMessage("This item can not be equipped when you have the flag.");
-				}
-				else
-				{
-					player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_EQUIP_ITEMS_WHILE_CASTING_OR_PERFORMING_A_SKILL));
-				}
+				player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_EQUIP_ITEMS_WHILE_CASTING_OR_PERFORMING_A_SKILL));
 				return;
 			}
 			
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
index f80fab7d58..5885c22337 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -19,9 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -49,7 +46,7 @@ public class Die implements IClientOutgoingPacket
 			final PlayerInstance player = creature.getActingPlayer();
 			_allowFixedRes = player.getAccessLevel().allowFixedRes();
 			_clan = player.getClan();
-			_canTeleport = ((!TvT.isStarted() || !player._inEventTvT) && (!DM.hasStarted() || !player._inEventDM) && (!CTF.isStarted() || !player._inEventCTF) && !player.isInFunEvent() && !player.isPendingRevive());
+			_canTeleport = !player.isPendingRevive();
 		}
 		_objectId = creature.getObjectId();
 		_fake = !creature.isDead();
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/ctf.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/ctf.sql
deleted file mode 100644
index 1af2299a2f..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/ctf.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- --------------------------------
--- Table structure for table `ctf`
--- Created by SqueezeD & Serpent for l2jfree
--- --------------------------------
-DROP TABLE IF EXISTS `ctf`;
-CREATE TABLE `ctf` (
-  `eventName` varchar(255) NOT NULL default '',
-  `eventDesc` varchar(255) NOT NULL default '',
-  `joiningLocation` varchar(255) NOT NULL default '',
-  `minLevel` int(4) NOT NULL default '0',
-  `maxLevel` int(4) NOT NULL default '0',
-  `npcId` int(8) NOT NULL default '0',
-  `npcX` int(11) NOT NULL default '0',
-  `npcY` int(11) NOT NULL default '0',
-  `npcZ` int(11) NOT NULL default '0',
-  `npcHeading` int(11) NOT NULL default '0',
-  `rewardId` int(11) NOT NULL default '0',
-  `rewardAmount` int(11) NOT NULL default '0',
-  `teamsCount` int(4) NOT NULL default '0',
-  `joinTime` int(11) NOT NULL default '0',
-  `eventTime` int(11) NOT NULL default '0',
-  `minPlayers` int(4) NOT NULL default '0',
-  `maxPlayers` int(4) NOT NULL default '0',
-  `delayForNextEvent` BIGINT NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `ctf` (`eventName`, `eventDesc`, `joiningLocation`, `minLevel`, `maxLevel`, `npcId`, `npcX`, `npcY`, `npcZ`, `npcHeading`, `rewardId`, `rewardAmount`, `teamsCount`, `joinTime`, `eventTime`, `minPlayers`, `maxPlayers`, `delayForNextEvent`) VALUES
-('Capture the flag', 'CTF', 'Giran', 1, 80, 70011, 82580, 148552, -3468, 16972, 8752, 1, 2, 5, 5, 2, 50, 300000);
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/ctf_teams.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/ctf_teams.sql
deleted file mode 100644
index 8bdd8c4022..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/ctf_teams.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- --------------------------------
--- Table structure for ctf_teams
--- Created by SqueezeD & Serpent for l2jfree
--- --------------------------------
-DROP TABLE IF EXISTS `ctf_teams`;
-CREATE TABLE `ctf_teams` (
-  `teamId` int(4) NOT NULL default '0',
-  `teamName` varchar(255) NOT NULL default '',
-  `teamX` int(11) NOT NULL default '0',
-  `teamY` int(11) NOT NULL default '0',
-  `teamZ` int(11) NOT NULL default '0',
-  `teamColor` int(11) NOT NULL default '0',
-  `flagX` int(11) NOT NULL default '0',
-  `flagY` int(11) NOT NULL default '0',
-  `flagZ` int(11) NOT NULL default '0',
-  PRIMARY KEY (`teamId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `ctf_teams` (`teamId`, `teamName`, `teamX`, `teamY`, `teamZ`, `teamColor`, `flagX`, `flagY`, `flagZ`) VALUES
-(0, 'Blue', 87357, -145722, -1288, 16711680, 87358, -145979, -1291),
-(1, 'Red', 87351, -139984, -1536, 255, 87359, -139584, -1536);
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql
index d047c623f3..54a354432b 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql
@@ -53,9 +53,4 @@ INSERT ignore INTO custom_npc values
 ('50000', '31228', 'Dom the Cat', '1', 'Merchant', '1', 'Monster.cat_the_cat', '9.00', '16.00', '70', 'male', 'Merchant', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '490', '10', '1335', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT'),
 ('50007', '31324', 'Andromeda', '1', 'Wedding Manager', '1', 'NPC.a_casino_FDarkElf', '8.00', '23.00', '70', 'female', 'WeddingManager', '40', '3862', '1493', '500', '500', '40', '43', '30', '21', '20', '10', '0', '0', '9999', '9999', '999', '999', '278', '0', '333', '316', '0', '0', '55', '132', null, '0', '1', '0', 'LAST_HIT'),
 ('50008', '31228', 'Rex the Cat', '1', 'Buffer', '1', 'Monster.cat_the_cat', '9.00', '16.00', '70', 'male', 'SchemeBuffer', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '490', '10', '1335', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT'),
-('55555', '22124', 'Totor', '1', 'Rebirth Manager', '1', 'NPC.a_fighterguild_master_FHuman', '11.00', '27.00', '83', 'male', 'Merchant', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70010', '31606', 'Catrina', '1', 'TvT Event Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70011', '31606', 'Catretta', '1', 'CTF Event Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70012', '31606', 'Catrosa', '1', 'VIP Join Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70013', '31606', 'Catrigna', '1', 'VIP End Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT'),
-('70014', '31606', 'Catrieta', '1', 'DM Event Manager', '1', 'Monster2.queen_of_cat', '8.00', '15.00', '70', 'female', 'Npc', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '28', '132', null, '0', '0', '0', 'LAST_HIT');
+('55555', '22124', 'Totor', '1', 'Rebirth Manager', '1', 'NPC.a_fighterguild_master_FHuman', '11.00', '27.00', '83', 'male', 'Merchant', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '88', '132', null, '0', '0', '0', 'LAST_HIT');
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/dm.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/dm.sql
deleted file mode 100644
index f0ebdd4275..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/dm.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- --------------------------------
--- Table structure for table `dm`
--- Created by SqueezeD from l2jfree
--- --------------------------------
-DROP TABLE IF EXISTS `dm`;
-CREATE TABLE `dm` (
-  `eventName` varchar(255) NOT NULL default '',
-  `eventDesc` varchar(255) NOT NULL default '',
-  `joiningLocation` varchar(255) NOT NULL default '',
-  `minLevel` int(4) NOT NULL default '0',
-  `maxLevel` int(4) NOT NULL default '0',
-  `npcId` int(8) NOT NULL default '0',
-  `npcX` int(11) NOT NULL default '0',
-  `npcY` int(11) NOT NULL default '0',
-  `npcZ` int(11) NOT NULL default '0',
-  		`npcHeading` int(11) NOT NULL DEFAULT '0',
-  `rewardId` int(11) NOT NULL default '0',
-  `rewardAmount` int(11) NOT NULL default '0',
-  		`joinTime` int(11) NOT NULL DEFAULT '0',
-  		`eventTime` int(11) NOT NULL DEFAULT '0',
-  		`minPlayers` int(11) NOT NULL DEFAULT '0',
-  		`maxPlayers` int(11) NOT NULL DEFAULT '0',
-  `color` int(11) NOT NULL default '0',
-  `playerX` int(11) NOT NULL default '0',
-  `playerY` int(11) NOT NULL default '0',
-  `playerZ` int(11) NOT NULL default '0',
-  		`delayForNextEvent` BIGINT NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-INSERT INTO `dm` values 
-('DM', 'A PvP Event', 'Giran', 1, 81, 70014, 82580, 148552, -3468, 1, 8752, 1, 2, 5, 2, 50, 2552550, 116615, 76200, -2729, 300000);
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pkkills.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pkkills.sql
deleted file mode 100644
index b8a707ed6b..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pkkills.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-#----------------------------
-# Table structure for pkkills
-#----------------------------
-CREATE TABLE IF NOT EXISTS `pkkills` (
-  `killerId` varchar(45) NOT NULL,
-  `killedId` varchar(45) NOT NULL,
-  `kills` decimal(11,0) NOT NULL,
-  PRIMARY KEY  (`killerId` ,`killedId` )
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/tvt.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/tvt.sql
deleted file mode 100644
index 517049c009..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/tvt.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- -----------------------
--- Table structure for tvt
--- -----------------------
-DROP TABLE IF EXISTS `tvt`;
-CREATE TABLE `tvt` (
-  `eventName` varchar(255) NOT NULL DEFAULT '',
-  `eventDesc` varchar(255) NOT NULL DEFAULT '',
-  `joiningLocation` varchar(255) NOT NULL DEFAULT '',
-  `minLevel` int(4) NOT NULL DEFAULT '0',
-  `maxLevel` int(4) NOT NULL DEFAULT '0',
-  `npcId` int(8) NOT NULL DEFAULT '0',
-  `npcX` int(11) NOT NULL DEFAULT '0',
-  `npcY` int(11) NOT NULL DEFAULT '0',
-  `npcZ` int(11) NOT NULL DEFAULT '0',
-  `npcHeading` int(11) NOT NULL DEFAULT '0',
-  `rewardId` int(11) NOT NULL DEFAULT '0',
-  `rewardAmount` int(11) NOT NULL DEFAULT '0',
-  `teamsCount` int(4) NOT NULL DEFAULT '0',
-  `joinTime` int(11) NOT NULL DEFAULT '0',
-  `eventTime` int(11) NOT NULL DEFAULT '0',
-  `minPlayers` int(4) NOT NULL DEFAULT '0',
-  `maxPlayers` int(4) NOT NULL DEFAULT '0',
-  `delayForNextEvent` BIGINT NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- ---------------------
--- Records for table tvt
--- ---------------------
-INSERT INTO `tvt` values 
-('TVT', 'A PvP Event', 'Giran', 1, 81, 70010, 82688, 148677, -3469, 0, 8752, 1, 2, 5, 5, 2, 50, 300000);
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/tvt_teams.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/tvt_teams.sql
deleted file mode 100644
index 6b75685944..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/tvt_teams.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- -----------------------------
--- Table structure for tvt_teams
--- -----------------------------
-DROP TABLE IF EXISTS `tvt_teams`;
-CREATE TABLE `tvt_teams` (
-  `teamId` int(4) NOT NULL DEFAULT '0',
-  `teamName` varchar(255) NOT NULL DEFAULT '',
-  `teamX` int(11) NOT NULL DEFAULT '0',
-  `teamY` int(11) NOT NULL DEFAULT '0',
-  `teamZ` int(11) NOT NULL DEFAULT '0',
-  `teamColor` int(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`teamId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- ---------------------------
--- Records for table tvt_teams
--- ---------------------------
-INSERT INTO `tvt_teams` VALUES 
-('0', 'Blue', '148179', '45841', '-3413', '16711680'),
-('1', 'Red', '150787', '45822', '-3413', '255'),
-('2', 'Green', '149496', '47826', '-3413', '26367');
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/vip.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/vip.sql
deleted file mode 100644
index 21e61a4276..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/vip.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE `VIPinfo` (
-  `teamID` int(11) NOT NULL,
-  `endx` int(11) NOT NULL,
-  `endy` int(11) NOT NULL,
-  `endz` int(11) NOT NULL,
-  `startx` int(11) NOT NULL,
-  `starty` int(11) NOT NULL,
-  `startz` int(11) NOT NULL,
-  PRIMARY KEY  (`teamID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-
--- 
--- Dumping data for table `VIPinfo`
--- 
-
-INSERT INTO `VIPinfo` VALUES (1, -84583, 242788, -3735, -101319, 213272, -3100);
-INSERT INTO `VIPinfo` VALUES (2, 45714, 49703, -3065, 55782, 81597, -3610);
-INSERT INTO `VIPinfo` VALUES (3, 11249, 16890, -4667, -22732, 12586, -2996);
-INSERT INTO `VIPinfo` VALUES (4, -44737, -113582, -204, 27053, -88454, -3286);
-INSERT INTO `VIPinfo` VALUES (5, 116047, -179059, -1026, 121145, -215673, -3571);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml b/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml
index 68fd0f5328..8851199b75 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml
@@ -67,43 +67,6 @@
 	<admin command="admin_create_coin" accessLevel="80" />
 	<admin command="admin_mass_create" accessLevel="100" />
 
-	<!-- Section: CTF -->
-	<admin command="admin_ctf" accessLevel="80" />
-	<admin command="admin_ctf_name" accessLevel="80" />
-	<admin command="admin_ctf_desc" accessLevel="80" />
-	<admin command="admin_ctf_join_loc" accessLevel="80" />
-	<admin command="admin_ctf_edit" accessLevel="80" />
-	<admin command="admin_ctf_control" accessLevel="80" />
-	<admin command="admin_ctf_minlvl" accessLevel="80" />
-	<admin command="admin_ctf_maxlvl" accessLevel="80" />
-	<admin command="admin_ctf_tele_npc" accessLevel="80" />
-	<admin command="admin_ctf_tele_team" accessLevel="80" />
-	<admin command="admin_ctf_tele_flag" accessLevel="80" />
-	<admin command="admin_ctf_npc" accessLevel="80" />
-	<admin command="admin_ctf_npc_pos" accessLevel="80" />
-	<admin command="admin_ctf_reward" accessLevel="80" />
-	<admin command="admin_ctf_reward_amount" accessLevel="80" />
-	<admin command="admin_ctf_team_add" accessLevel="80" />
-	<admin command="admin_ctf_team_remove" accessLevel="80" />
-	<admin command="admin_ctf_team_pos" accessLevel="80" />
-	<admin command="admin_ctf_team_color" accessLevel="80" />
-	<admin command="admin_ctf_team_flag" accessLevel="80" />
-	<admin command="admin_ctf_join" accessLevel="80" />
-	<admin command="admin_ctf_teleport" accessLevel="80" />
-	<admin command="admin_ctf_start" accessLevel="80" />
-	<admin command="admin_ctf_abort" accessLevel="80" />
-	<admin command="admin_ctf_finish" accessLevel="80" />
-	<admin command="admin_ctf_sit" accessLevel="80" />
-	<admin command="admin_ctf_dump" accessLevel="80" />
-	<admin command="admin_ctf_save" accessLevel="80" />
-	<admin command="admin_ctf_load" accessLevel="80" />
-	<admin command="admin_ctf_jointime" accessLevel="80" />
-	<admin command="admin_ctf_eventtime" accessLevel="80" />
-	<admin command="admin_ctf_autoevent" accessLevel="80" />
-	<admin command="admin_ctf_minplayers" accessLevel="80" />
-	<admin command="admin_ctf_maxplayers" accessLevel="80" />
-	<admin command="admin_ctf_interval" accessLevel="80" />
-
 	<!-- Section: CursedWeapons -->
 	<admin command="admin_cw_info" accessLevel="90" />
 	<admin command="admin_cw_remove" accessLevel="90" />
@@ -124,29 +87,6 @@
 	<!-- Section: Disconnect -->
 	<admin command="admin_character_disconnect" accessLevel="90" />
 
-	<!-- Section: DMEngine -->
-	<admin command="admin_dmevent" accessLevel="80" />
-	<admin command="admin_dmevent_name" accessLevel="80" />
-	<admin command="admin_dmevent_desc" accessLevel="80" />
-	<admin command="admin_dmevent_join_loc" accessLevel="80" />
-	<admin command="admin_dmevent_minlvl" accessLevel="80" />
-	<admin command="admin_dmevent_maxlvl" accessLevel="80" />
-	<admin command="admin_dmevent_npc" accessLevel="80" />
-	<admin command="admin_dmevent_npc_pos" accessLevel="80" />
-	<admin command="admin_dmevent_reward" accessLevel="80" />
-	<admin command="admin_dmevent_reward_amount" accessLevel="80" />
-	<admin command="admin_dmevent_spawnpos" accessLevel="80" />
-	<admin command="admin_dmevent_color" accessLevel="80" />
-	<admin command="admin_dmevent_join" accessLevel="80" />
-	<admin command="admin_dmevent_teleport" accessLevel="80" />
-	<admin command="admin_dmevent_start" accessLevel="80" />
-	<admin command="admin_dmevent_abort" accessLevel="80" />
-	<admin command="admin_dmevent_finish" accessLevel="80" />
-	<admin command="admin_dmevent_sit" accessLevel="80" />
-	<admin command="admin_dmevent_dump" accessLevel="80" />
-	<admin command="admin_dmevent_save" accessLevel="80" />
-	<admin command="admin_dmevent_load" accessLevel="80" />
-
 	<!-- Section: Donator -->
 	<admin command="admin_setdonator" accessLevel="100" />
 
@@ -261,29 +201,6 @@
 	<admin command="admin_setba" accessLevel="90" />
 	<admin command="admin_enchant" accessLevel="90" />
 
-	<!-- Section: EventEngine -->
-	<admin command="admin_event" accessLevel="80" />
-	<admin command="admin_event_new" accessLevel="80" />
-	<admin command="admin_event_choose" accessLevel="80" />
-	<admin command="admin_event_store" accessLevel="80" />
-	<admin command="admin_event_set" accessLevel="80" />
-	<admin command="admin_event_change_teams_number" accessLevel="80" />
-	<admin command="admin_event_announce" accessLevel="80" />
-	<admin command="admin_event_panel" accessLevel="80" />
-	<admin command="admin_event_control_begin" accessLevel="80" />
-	<admin command="admin_event_control_teleport" accessLevel="80" />
-	<admin command="admin_add" accessLevel="80" />
-	<admin command="admin_event_see" accessLevel="80" />
-	<admin command="admin_event_del" accessLevel="80" />
-	<admin command="admin_delete_buffer" accessLevel="80" />
-	<admin command="admin_event_control_sit" accessLevel="80" />
-	<admin command="admin_event_name" accessLevel="80" />
-	<admin command="admin_event_control_kill" accessLevel="80" />
-	<admin command="admin_event_control_res" accessLevel="80" />
-	<admin command="admin_event_control_prize" accessLevel="80" />
-	<admin command="admin_event_control_chatban" accessLevel="80" />
-	<admin command="admin_event_control_finish" accessLevel="80" />
-
 	<!-- Section: ExpSp -->
 	<admin command="admin_add_exp_sp_to_character" accessLevel="90" />
 	<admin command="admin_add_exp_sp" accessLevel="90" />
@@ -543,59 +460,6 @@
 	<admin command="admin_st" accessLevel="80" />
 	<admin command="admin_mp" accessLevel="80" />
 
-	<!-- Section: TownWar -->
-	<admin command="admin_townwar_start" accessLevel="80" />
-	<admin command="admin_townwar_end" accessLevel="80" />
-
-	<!-- Section: TvTEngine -->
-	<admin command="admin_tvt" accessLevel="80" />
-	<admin command="admin_tvt_name" accessLevel="80" />
-	<admin command="admin_tvt_desc" accessLevel="80" />
-	<admin command="admin_tvt_join_loc" accessLevel="80" />
-	<admin command="admin_tvt_minlvl" accessLevel="80" />
-	<admin command="admin_tvt_maxlvl" accessLevel="80" />
-	<admin command="admin_tvt_npc" accessLevel="80" />
-	<admin command="admin_tvt_npc_pos" accessLevel="80" />
-	<admin command="admin_tvt_reward" accessLevel="80" />
-	<admin command="admin_tvt_reward_amount" accessLevel="80" />
-	<admin command="admin_tvt_team_add" accessLevel="80" />
-	<admin command="admin_tvt_team_remove" accessLevel="80" />
-	<admin command="admin_tvt_team_pos" accessLevel="80" />
-	<admin command="admin_tvt_team_color" accessLevel="80" />
-	<admin command="admin_tvt_join" accessLevel="80" />
-	<admin command="admin_tvt_teleport" accessLevel="80" />
-	<admin command="admin_tvt_start" accessLevel="80" />
-	<admin command="admin_tvt_abort" accessLevel="80" />
-	<admin command="admin_tvt_finish" accessLevel="80" />
-	<admin command="admin_tvt_sit" accessLevel="80" />
-	<admin command="admin_tvt_dump" accessLevel="80" />
-	<admin command="admin_tvt_save" accessLevel="80" />
-	<admin command="admin_tvt_load" accessLevel="80" />
-	<admin command="admin_tvt_jointime" accessLevel="80" />
-	<admin command="admin_tvt_eventtime" accessLevel="80" />
-	<admin command="admin_tvt_autoevent" accessLevel="80" />
-	<admin command="admin_tvt_minplayers" accessLevel="80" />
-	<admin command="admin_tvt_maxplayers" accessLevel="80" />
-	<admin command="admin_tvtkick" accessLevel="80" />
-
-	<!-- Section: VIPEngine -->
-	<admin command="admin_vip" accessLevel="80" />
-	<admin command="admin_vip_setteam" accessLevel="80" />
-	<admin command="admin_vip_randomteam" accessLevel="80" />
-	<admin command="admin_vip_settime" accessLevel="80" />
-	<admin command="admin_vip_endnpc" accessLevel="80" />
-	<admin command="admin_vip_setdelay" accessLevel="80" />
-	<admin command="admin_vip_joininit" accessLevel="80" />
-	<admin command="admin_vip_joinnpc" accessLevel="80" />
-	<admin command="admin_vip_joinlocxyz" accessLevel="80" />
-	<admin command="admin_vip_setarea" accessLevel="80" />
-	<admin command="admin_vip_vipreward" accessLevel="80" />
-	<admin command="admin_vip_viprewardamount" accessLevel="80" />
-	<admin command="admin_vip_thevipreward" accessLevel="80" />
-	<admin command="admin_vip_theviprewardamount" accessLevel="80" />
-	<admin command="admin_vip_notvipreward" accessLevel="80" />
-	<admin command="admin_vip_notviprewardamount" accessLevel="80" />
-
 	<!-- Section: Walker -->
 	<admin command="admin_walker_setmessage" accessLevel="80" />
 	<admin command="admin_walker_menu" accessLevel="80" />
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/custom/Other.ini b/L2J_Mobius_C6_Interlude/dist/game/config/custom/Other.ini
index aceb3e945d..33b8480ce3 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/custom/Other.ini
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/custom/Other.ini
@@ -223,47 +223,6 @@ DonatorDropRate = 1.5
 DonatorSpoilRate = 1.5
 
 
-# ---------------------------------------------------------------------------
-# Commands
-# ---------------------------------------------------------------------------
-
-# Allow players to use command .farm1
-AllowFarm1Command = False
-# Put your Farm1 Location ( x,y,z )
-farm1_X = 81304
-farm1_Y = 14589
-farm1_Z = -3469
-# Message after successful TP
-Farm1CustomMeesage = You have been teleported to Farm Zone 1!
-
-# Allow players to use command .farm2
-AllowFarm2Command = False
-# Put your Farm2 Location ( x,y,z )
-farm2_X = 81304
-farm2_Y = 14589
-farm2_Z = -3469
-# Message after successful TP
-Farm2CustomMeesage = You have been teleported to Farm Zone 2!
-
-# Allow players to use command .pvp1
-AllowPvP1Command = False
-# Put your Farm1 Location ( x,y,z )
-pvp1_X = 81304
-pvp1_Y = 14589
-pvp1_Z = -3469
-# Message after successful TP
-PvP1CustomMeesage = You have been teleported to PvP Zone 1!
-
-# Allow players to use command .pvp2
-AllowPvP2Command = False
-# Put your Farm2 Location ( x,y,z )
-pvp2_X = 81304
-pvp2_Y = 14589
-pvp2_Z = -3469
-# Message after successful TP
-PvP2CustomMeesage = You have been teleported to PvP Zone 2!
-
-
 # ---------------------------------------------------------------------------
 # Protector
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/events/CtF.ini b/L2J_Mobius_C6_Interlude/dist/game/config/events/CtF.ini
deleted file mode 100644
index 8eb992e711..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/config/events/CtF.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-#============================================================#
-#                       CTF Event Engine                     #
-#============================================================#
-# CTF(Capture the flag) Event: Two teams with one flag.
-
-# Setting for Capture The Flag
-# CTFEvenTeams = NO|BALANCE|SHUFFLE
-# NO means: not even teams.
-# BALANCE means: Players can only join team with lowest player count.
-# SHUFFLE means: Players can only participate to tzhe event and not
-# direct to a team. Teams will be schuffeled in teleporting teams.
-CTFEvenTeams = SHUFFLE
-
-# Players there not participated in ctf can target ctf participants?
-CTFAllowInterference = False
-
-# Ctf participants can use potions?
-CTFAllowPotions = False
-
-# Ctf participants can summon by item?
-CTFAllowSummon = False
-
-# Remove all effects of ctf participants on event start?
-CTFOnStartRemoveAllEffects = True
-
-# Unsummon pet of ctf participants on event start?
-CTFOnStartUnsummonPet = True
-
-# On revive participants regain full hp/mp/cp ?
-CTFReviveRecovery = False
-
-# Announce all team statistics
-CTFAnnounceTeamStats = False
-
-# Announce Reward
-CTFAnnounceReward = False
-
-# Players with cursed weapon are allowed to join ?
-CTFJoinWithCursedWeapon = True
-
-# Enable voice command to register on tvt/ctf events
-CTFCommand = True
-
-# Place an aura on participants team ?
-CTFAura = False
-
-# Enable event stats logger
-CTFStatsLogger = True
-
-# Spawn Team Offset to distribute players
-CTFSpawnOffset = 300
-
-# Remove Buffs on player die
-CTFRemoveBuffsOnPlayerDie = False
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/events/DM.ini b/L2J_Mobius_C6_Interlude/dist/game/config/events/DM.ini
deleted file mode 100644
index b5b65745cf..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/config/events/DM.ini
+++ /dev/null
@@ -1,55 +0,0 @@
-#============================================================#
-#                       DM Event Engine                      #
-#============================================================#
-# DM(DeathMatch) Event: All vs All.
-
-# Players there not participated in DM can target DM participants?
-DMAllowInterference = False
-
-# DM participants can use potions?
-DMAllowPotions = False
-
-# DM participants can summon by item?
-DMAllowSummon = False
-
-# Players with cursed weapon are allowed to join ?
-DMJoinWithCursedWeapon = False
-
-# Remove all effects of DM participants on event start?
-DMOnStartRemoveAllEffects = True
-
-# Unsummon pet of DM participants on event start? 
-DMOnStartUnsummonPet = True
-
-# Delay on revive when dead, NOTE: 20000 equals to 20 seconds, minimum 1000 (1 second)
-DMReviveDelay = 20000
-
-# On revive participants regain full hp/mp/cp ?
-DMReviveRecovery = False
-
-# Enable voice command to register on dm events (.dmjoin / .dmleave / .dminfo)
-DMCommand = True
-
-# Announce Reward
-DMAnnounceReward = False
-
-# Enable Kill Reward?
-DMEnableKillReward = False
-
-# Kill Reward ID
-DMKillRewardID = 6392
-
-# Kill Reward Amount
-DMKillRewardAmount = 1
-
-# Offset from center DM Spawn
-DMSpawnOffset = 100
-
-# Enable event stats logger
-DMStatsLogger = True
-
-# Enable healer classes into DM
-DMAllowedHealerClasses = True
-
-# Remove Buffs on player die
-DMRemoveBuffsOnPlayerDie = False
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/events/EventManager.ini b/L2J_Mobius_C6_Interlude/dist/game/config/events/EventManager.ini
deleted file mode 100644
index 582ce2a9a7..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/config/events/EventManager.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-#============================================================#
-#                       Event Manager                        #
-#============================================================#
-# Enable auto events and start time.
-
-# TvT auto start
-# Example TVTStartTime = 20:00;21:00;22:00;
-TVTEventEnabled = False
-TVTStartTime = 20:00;
-
-# CTF auto start
-# Example CTFStartTime = 20:00;21:00;22:00;
-CTFEventEnabled = False
-CTFStartTime = 20:30;
-
-# DM auto start
-# Example DMStartTime = 20:00;21:00;22:00;
-DMEventEnabled = False
-DMStartTime = 21:00;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/events/TW.ini b/L2J_Mobius_C6_Interlude/dist/game/config/events/TW.ini
deleted file mode 100644
index 8054bf8b22..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/config/events/TW.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-#============================================================#
-#                         Town War                           #
-#============================================================#
-# TW (Town War): Town can became PvP Zone.
-# ATTENTION:
-# GM char can't be hit during Town war.
-
-# //townwar_start - Starts town war in Giran
-# //townwar_end - Ends townwar in Giran
-# Town id
-# 2: // Talking Island
-# 3: // Elven village
-# 1: // Dark elf village
-# 4: // Orc village
-# 6: // Dwarven village
-# 7: // Gludio
-# 5: // Gludin
-# 8: // Dion
-# 9: // Giran
-# 10: // Oren
-# 12: // Aden
-# 11: // Hunters village
-# 9: // Giran Harbour
-# 15: // Heine
-# 14: // Rune
-# 13: // Goddard
-# 17: // Schuttgart
-# 16: // Floran
-# 20: //Kamael Village
-TWTownId = 9
-
-# Set all towns?
-TWAllTowns = False
-
-# Reward for each kill
-TownWarItemId = 57
-TownWarItemAmount = 5000
-
-# Give PKers karma during townwar?
-AllowKarma = False
-
-# Disable GK while in event?
-DisableGK = True
-
-# If yes it will send a ressurect ask on death.
-# If no when you die youll be there dead until the event ends.
-# Set to false if you want KOTH town.
-SendRessOnDeath = True
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/events/TvT.ini b/L2J_Mobius_C6_Interlude/dist/game/config/events/TvT.ini
deleted file mode 100644
index f4624e1006..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/config/events/TvT.ini
+++ /dev/null
@@ -1,74 +0,0 @@
-#====================================#
-#            Team vs Team            #
-#====================================#
-# TvT(Team vs Team) Event: Blue vs Red.
-
-# Setting for Team vs. Team pvp
-# TvTEvenTeams = NO|BALANCE|SHUFFLE
-# NO means: not even teams.
-# BALANCE means: Players can only join team with lowest player count.
-# SHUFFLE means: Players can only participate to tzhe event and not direct to a team. Teams will be schuffeled in teleporting teams.
-TvTEvenTeams = SHUFFLE
-
-# players there not participated in tvt can target tvt participants?
-TvTAllowInterference = False
-
-# tvt participants can use potions?
-TvTAllowPotions = True
-
-# tvt participants can summon by item?
-TvTAllowSummon = True
-
-# remove all effects of tvt participants on event start?
-TvTOnStartRemoveAllEffects = True
-
-# unsummon pet of tvt participants on event start?
-TvTOnStartUnsummonPet = True
-
-# on revive participants regain full hp/mp/cp ?
-TvTReviveRecovery = True
-
-# announce all team statistics
-TvTAnnounceTeamStats = True
-
-# announce reward
-TvTAnnounceReward = True
-
-# give price with 0 kills
-TvTPriceNoKills = True
-
-# players with cursed weapon are allowed to join ?
-TvTJoinWithCursedWeapon = False
-
-# Enable voice command to register on tvt event
-TvTCommand = True
-
-# Delay on revive when dead, NOTE: 20000 equals to 20 seconds, minimum 1000 (1 second)
-TvTReviveDelay = 10000
-
-# Open Western Fortress doors on tvt finish
-TvTOpenFortDoors = False
-
-# Close Western Fortress doors on tvt start
-TvTCloseFortDoors = False
-
-# Open Aden Colosseum doors on tvt finish
-TvTOpenAdenColosseumDoors = True
-
-# Close Aden Colosseum doors on tvt start
-TvTCloseAdenColosseumDoors = True
-
-# TvT Top Killer reward id
-TvTTopKillerRewardId = 5575
-
-# TvT Top Killer reward quantity
-TvTTopKillerRewardQty = 5000000
-
-# Place an aura on participants team ?
-TvTAura = False
-
-# Enable event stats logger
-TvTStatsLogger = True
-
-# Remove Buffs on player die
-TvTRemoveBuffsOnPlayerDie = False
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/General.ini b/L2J_Mobius_C6_Interlude/dist/game/config/main/General.ini
index 11f072cdd8..11c1e165d8 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/main/General.ini
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/main/General.ini
@@ -374,18 +374,6 @@ TimeOfWarmUp = 2
 NumberOfNecessaryPartyMembers = 4
 
 
-# ---------------------------------------------------------------------------
-#  Quake / Killing Spree System
-# ---------------------------------------------------------------------------
-# Enable The Killing Spree System
-# When a Player Hits an Amount of pvp's an announcement appears
-AllowQuakeSystem = False
-
-# Enable Messages to GMs on 4-5 consecutive pvp of a player
-# Why? to see if a char are farming!
-EnableAntiPvpFarmMsg = True
-
-
 # ---------------------------------------------------------------------------
 #  Aio System                           
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/PvP.ini b/L2J_Mobius_C6_Interlude/dist/game/config/main/PvP.ini
index dbb2445932..24f1af5e9e 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/main/PvP.ini
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/main/PvP.ini
@@ -126,16 +126,6 @@ TitleForAmount4 = 00FF00
 PkAmount5 = 5000
 TitleForAmount5 = 00FF00
 
-# -----------------------------
-#  PK Info Settings
-# -----------------------------
-# If it is enabled then it shows pk info to the players everytime
-# A pk or pvp is done. Messages are:
-# "You have killed PlayerX y times".
-# OR
-# "You have been killed y times by PlayerX.
-EnablePkInfo = False
-
 # ----------------------------
 #  Custom Reward
 # ----------------------------
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/mods_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/mods_menu.htm
index db8bc5b6f4..2e35b3ac5c 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/mods_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/mods_menu.htm
@@ -46,19 +46,5 @@
 <td><button value="ItmQty" action="bypass -h admin_set_mod ChampionRewardQty=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
 <td><button value="AtkSpd" action="bypass -h admin_set_mod ChampionSpdHp=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
 </tr></table><br>
-<br><font color="aadd77">Team Vs. Team</font>
-<font color="LEVEL"><a action="bypass -h admin_help help/l2jmod/tvt.htm">Help</a></font>
-<table width=240><tr>
-<td><button value="Enable" action="bypass -h admin_set_mod TvTEventEnabled=true" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="Interval" action="bypass -h admin_set_mod TvTEventInterval=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="PartTime" action="bypass -h admin_set_mod TvTEventParticipationTime=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="RunnTime" action="bypass -h admin_set_mod TvTEventRunningTime=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-</tr><tr>
-<td><button value="Disable" action="bypass -h admin_set_mod TvTEventEnabled=false" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="EventNpc" action="bypass -h admin_set_mod TvTEventParticipationNpcId=$menu_command" width=55 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr></table>
-<br>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/custom/21042.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/custom/21042.htm
deleted file mode 100644
index 0182ec9c5c..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/custom/21042.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><body>Treasure Chest:<br>
-<table width=100% border=1><tr><td>top left<br>
-<a action="bypass -h npc_%objectId%_Deposit top-left">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw top-left">Withdraw</a></td>
-<td align="right">top right<br>
-<a action="bypass -h npc_%objectId%_Deposit top-right">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw top-right">Withdraw</a></td></tr>
-<tr><td>mid left<br>
-<a action="bypass -h npc_%objectId%_Deposit mid-left">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw mid-left">Withdraw</a></td>
-<td align="right">mid right<br>
-<a action="bypass -h npc_%objectId%_Deposit mid-right">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw mid-right">Withdraw</a></td></tr>
-<tr><td>bottom left<br>
-<a action="bypass -h npc_%objectId%_Deposit bottom-left">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw bottom-left">Withdraw</a></td>
-<td align="right">bottom right<br>
-<a action="bypass -h npc_%objectId%_Deposit bottom-right">Deposit</a><br>
-<a action="bypass -h npc_%objectId%_Withdraw bottom-right">Withdraw</a></td></tr>
-</table></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/custom/bot.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/custom/bot.htm
deleted file mode 100644
index 360a83a9aa..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/custom/bot.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>
-Welcome in our server :)! I'm the Ancient World Master and I don't like if you leave the game for a long time or if you use bot... So, you have <font color="LEVEL">%Time%</font> seconds to demonstrate you are really here,
-selecting the correct world I'm saying: <font color="LEVEL">%Word%</font>. Now Select the correct answer .<br>
-<a action="link 100001">%Word1%</a><br>
-<a action="link 100002">%Word2%</a><br>
-<a action="link 100003">%Word3%</a><br>
-<a action="link 100004">%Word4%</a><br>
-<a action="link 100005">%Word5%</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventParticipation.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventParticipation.htm
deleted file mode 100644
index b9d164006b..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventParticipation.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><title>TvT Event Manager</title><body>
-Registration for TvT Event:<br><br><center>
-%team1name%&nbsp;&nbsp;&nbsp;&nbsp;(%team1playercount% players in)<br1>
-%team2name%&nbsp;&nbsp;&nbsp;&nbsp;(%team2playercount% players in)<br>
-<button value="Participate" action="bypass -h npc_%objectId%_tvt_event_participation" width=50 height=15 back="sek.cbui94" fore="sek.cbui92">
-<button value="Close" action="bypass -h npc_%objectId%_Close" width=50 height=15 back="sek.cbui94" fore="sek.cbui92">
-</center></body></html>
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventRemoveParticipation.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventRemoveParticipation.htm
deleted file mode 100644
index a594a06941..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventRemoveParticipation.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><title>TvT Event</title><body>
-Cancel Registration yourself for TvT Event:<br1>
-You are already registered for this event. Do you wish to cancel your participation in this Event?<br><br><center>
-<button value="Yes" action="bypass -h npc_%objectId%_tvt_event_remove_participation" width=40 height=15 back="sek.cbui94" fore="sek.cbui92">
-<button value="No" action="bypass -h npc_%objectId%_Close" width=40 height=15 back="sek.cbui94" fore="sek.cbui92">
-</center></body></html>
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventStatus.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventStatus.htm
deleted file mode 100644
index 35813e4a51..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/mods/TvTEventStatus.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><title>TvT Event</title><body>
-TvT Status:<br><br><center>
-%team1name% with %team1playercount% players and %team1points% points.<br1>
-%team2name% with %team2playercount% players and %team2points% points.<br>
-</center></body></html>
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
index e7e120f78e..cadda9952b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
@@ -95,11 +95,7 @@ public class Config
 	private static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/Other.ini";
 	public static final String TELNET_CONFIG_FILE = "./config/protected/Telnet.ini";
 	// events
-	private static final String EVENT_CTF_CONFIG_FILE = "./config/events/CtF.ini";
-	private static final String EVENT_DM_CONFIG_FILE = "./config/events/DM.ini";
 	private static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/PcBang.ini";
-	private static final String EVENT_TVT_CONFIG_FILE = "./config/events/TvT.ini";
-	private static final String EVENT_TW_CONFIG_FILE = "./config/events/TW.ini";
 	// custom
 	private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini";
 	private static final String CANCEL_SKILL_RESTORE_BUFFS_CONFIG_FILE = "./config/custom/CancelSkillRestoreBuffs.ini";
@@ -251,8 +247,6 @@ public class Config
 	public static int FS_TIME_ENTRY;
 	public static int FS_TIME_WARMUP;
 	public static int FS_PARTY_MEMBER_COUNT;
-	public static boolean ALLOW_QUAKE_SYSTEM;
-	public static boolean ENABLE_ANTI_PVP_FARM_MSG;
 	public static float RATE_XP;
 	public static float RATE_SP;
 	public static float RATE_PARTY_XP;
@@ -520,37 +514,6 @@ public class Config
 	public static boolean GIVE_CUPID_BOW;
 	public static boolean ANNOUNCE_WEDDING;
 	
-	public static String TVT_EVEN_TEAMS;
-	public static boolean TVT_ALLOW_INTERFERENCE;
-	public static boolean TVT_ALLOW_POTIONS;
-	public static boolean TVT_ALLOW_SUMMON;
-	public static boolean TVT_ON_START_REMOVE_ALL_EFFECTS;
-	public static boolean TVT_ON_START_UNSUMMON_PET;
-	public static boolean TVT_REVIVE_RECOVERY;
-	public static boolean TVT_ANNOUNCE_TEAM_STATS;
-	public static boolean TVT_ANNOUNCE_REWARD;
-	public static boolean TVT_PRICE_NO_KILLS;
-	public static boolean TVT_JOIN_CURSED;
-	public static boolean TVT_COMMAND;
-	public static long TVT_REVIVE_DELAY;
-	public static boolean TVT_OPEN_FORT_DOORS;
-	public static boolean TVT_CLOSE_FORT_DOORS;
-	public static boolean TVT_OPEN_ADEN_COLOSSEUM_DOORS;
-	public static boolean TVT_CLOSE_ADEN_COLOSSEUM_DOORS;
-	public static int TVT_TOP_KILLER_REWARD;
-	public static int TVT_TOP_KILLER_QTY;
-	public static boolean TVT_AURA;
-	public static boolean TVT_STATS_LOGGER;
-	public static boolean TVT_REMOVE_BUFFS_ON_DIE;
-	
-	public static int TW_TOWN_ID;
-	public static boolean TW_ALL_TOWNS;
-	public static int TW_ITEM_ID;
-	public static int TW_ITEM_AMOUNT;
-	public static boolean TW_ALLOW_KARMA;
-	public static boolean TW_DISABLE_GK;
-	public static boolean TW_RESS_ON_DIE;
-	
 	public static boolean REBIRTH_ENABLE;
 	public static String[] REBIRTH_ITEM_PRICE;
 	public static String[] REBIRTH_MAGE_SKILL;
@@ -611,40 +574,6 @@ public class Config
 	public static int OFFLINE_MAX_DAYS;
 	public static boolean OFFLINE_DISCONNECT_FINISHED;
 	
-	public static boolean DM_ALLOW_INTERFERENCE;
-	public static boolean DM_ALLOW_POTIONS;
-	public static boolean DM_ALLOW_SUMMON;
-	public static boolean DM_JOIN_CURSED;
-	public static boolean DM_ON_START_REMOVE_ALL_EFFECTS;
-	public static boolean DM_ON_START_UNSUMMON_PET;
-	public static long DM_REVIVE_DELAY;
-	public static boolean DM_COMMAND;
-	public static boolean DM_ENABLE_KILL_REWARD;
-	public static int DM_KILL_REWARD_ID;
-	public static int DM_KILL_REWARD_AMOUNT;
-	public static boolean DM_ANNOUNCE_REWARD;
-	public static boolean DM_REVIVE_RECOVERY;
-	public static int DM_SPAWN_OFFSET;
-	public static boolean DM_STATS_LOGGER;
-	public static boolean DM_ALLOW_HEALER_CLASSES;
-	public static boolean DM_REMOVE_BUFFS_ON_DIE;
-	
-	public static String CTF_EVEN_TEAMS;
-	public static boolean CTF_ALLOW_INTERFERENCE;
-	public static boolean CTF_ALLOW_POTIONS;
-	public static boolean CTF_ALLOW_SUMMON;
-	public static boolean CTF_ON_START_REMOVE_ALL_EFFECTS;
-	public static boolean CTF_ON_START_UNSUMMON_PET;
-	public static boolean CTF_ANNOUNCE_TEAM_STATS;
-	public static boolean CTF_ANNOUNCE_REWARD;
-	public static boolean CTF_JOIN_CURSED;
-	public static boolean CTF_REVIVE_RECOVERY;
-	public static boolean CTF_COMMAND;
-	public static boolean CTF_AURA;
-	public static boolean CTF_STATS_LOGGER;
-	public static int CTF_SPAWN_OFFSET;
-	public static boolean CTF_REMOVE_BUFFS_ON_DIE;
-	
 	public static boolean ONLINE_PLAYERS_ON_LOGIN;
 	public static boolean SUBSTUCK_SKILLS;
 	public static boolean ALT_SERVER_NAME_ENABLED;
@@ -715,26 +644,6 @@ public class Config
 	public static int HERO_CUSTOM_ITEM_ID;
 	public static int NOOBLE_CUSTOM_ITEM_ID;
 	public static long HERO_CUSTOM_DAY;
-	public static boolean ALLOW_FARM1_COMMAND;
-	public static boolean ALLOW_FARM2_COMMAND;
-	public static boolean ALLOW_PVP1_COMMAND;
-	public static boolean ALLOW_PVP2_COMMAND;
-	public static int FARM1_X;
-	public static int FARM1_Y;
-	public static int FARM1_Z;
-	public static int PVP1_X;
-	public static int PVP1_Y;
-	public static int PVP1_Z;
-	public static int FARM2_X;
-	public static int FARM2_Y;
-	public static int FARM2_Z;
-	public static int PVP2_X;
-	public static int PVP2_Y;
-	public static int PVP2_Z;
-	public static String FARM1_CUSTOM_MESSAGE;
-	public static String FARM2_CUSTOM_MESSAGE;
-	public static String PVP1_CUSTOM_MESSAGE;
-	public static String PVP2_CUSTOM_MESSAGE;
 	public static boolean GM_TRADE_RESTRICTED_ITEMS;
 	public static boolean GM_RESTART_FIGHTING;
 	public static boolean PM_MESSAGE_ON_START;
@@ -786,7 +695,6 @@ public class Config
 	public static int PK_REWARD_ID;
 	public static int PK_REWARD_AMOUNT;
 	public static int REWARD_PROTECT;
-	public static boolean ENABLE_PK_INFO;
 	public static boolean FLAGED_PLAYER_USE_BUFFER;
 	public static boolean FLAGED_PLAYER_CAN_USE_GK;
 	public static boolean PVPEXPSP_SYSTEM;
@@ -1547,8 +1455,6 @@ public class Config
 		{
 			FS_PARTY_MEMBER_COUNT = 4;
 		}
-		ALLOW_QUAKE_SYSTEM = generalConfig.getBoolean("AllowQuakeSystem", false);
-		ENABLE_ANTI_PVP_FARM_MSG = generalConfig.getBoolean("EnableAntiPvpFarmMsg", false);
 		ANNOUNCE_CASTLE_LORDS = generalConfig.getBoolean("AnnounceCastleLords", false);
 		ANNOUNCE_MAMMON_SPAWN = generalConfig.getBoolean("AnnounceMammonSpawn", true);
 		ALLOW_GUARDS = generalConfig.getBoolean("AllowGuards", false);
@@ -1809,49 +1715,6 @@ public class Config
 		ANNOUNCE_WEDDING = weddingConfig.getBoolean("AnnounceWedding", true);
 	}
 	
-	public static void loadTVTConfig()
-	{
-		final PropertiesParser tvtConfig = new PropertiesParser(EVENT_TVT_CONFIG_FILE);
-		TVT_EVEN_TEAMS = tvtConfig.getString("TvTEvenTeams", "BALANCE");
-		TVT_ALLOW_INTERFERENCE = tvtConfig.getBoolean("TvTAllowInterference", false);
-		TVT_ALLOW_POTIONS = tvtConfig.getBoolean("TvTAllowPotions", false);
-		TVT_ALLOW_SUMMON = tvtConfig.getBoolean("TvTAllowSummon", false);
-		TVT_ON_START_REMOVE_ALL_EFFECTS = tvtConfig.getBoolean("TvTOnStartRemoveAllEffects", true);
-		TVT_ON_START_UNSUMMON_PET = tvtConfig.getBoolean("TvTOnStartUnsummonPet", true);
-		TVT_REVIVE_RECOVERY = tvtConfig.getBoolean("TvTReviveRecovery", false);
-		TVT_ANNOUNCE_TEAM_STATS = tvtConfig.getBoolean("TvTAnnounceTeamStats", false);
-		TVT_ANNOUNCE_REWARD = tvtConfig.getBoolean("TvTAnnounceReward", false);
-		TVT_PRICE_NO_KILLS = tvtConfig.getBoolean("TvTPriceNoKills", false);
-		TVT_JOIN_CURSED = tvtConfig.getBoolean("TvTJoinWithCursedWeapon", true);
-		TVT_COMMAND = tvtConfig.getBoolean("TvTCommand", true);
-		TVT_REVIVE_DELAY = tvtConfig.getLong("TvTReviveDelay", 20000);
-		if (TVT_REVIVE_DELAY < 1000)
-		{
-			TVT_REVIVE_DELAY = 1000; // can't be set less then 1 second
-		}
-		TVT_OPEN_FORT_DOORS = tvtConfig.getBoolean("TvTOpenFortDoors", false);
-		TVT_CLOSE_FORT_DOORS = tvtConfig.getBoolean("TvTCloseFortDoors", false);
-		TVT_OPEN_ADEN_COLOSSEUM_DOORS = tvtConfig.getBoolean("TvTOpenAdenColosseumDoors", false);
-		TVT_CLOSE_ADEN_COLOSSEUM_DOORS = tvtConfig.getBoolean("TvTCloseAdenColosseumDoors", false);
-		TVT_TOP_KILLER_REWARD = tvtConfig.getInt("TvTTopKillerRewardId", 5575);
-		TVT_TOP_KILLER_QTY = tvtConfig.getInt("TvTTopKillerRewardQty", 2000000);
-		TVT_AURA = tvtConfig.getBoolean("TvTAura", false);
-		TVT_STATS_LOGGER = tvtConfig.getBoolean("TvTStatsLogger", true);
-		TVT_REMOVE_BUFFS_ON_DIE = tvtConfig.getBoolean("TvTRemoveBuffsOnPlayerDie", false);
-	}
-	
-	public static void loadTWConfig()
-	{
-		final PropertiesParser twConfig = new PropertiesParser(EVENT_TW_CONFIG_FILE);
-		TW_TOWN_ID = twConfig.getInt("TWTownId", 9);
-		TW_ALL_TOWNS = twConfig.getBoolean("TWAllTowns", false);
-		TW_ITEM_ID = twConfig.getInt("TownWarItemId", 57);
-		TW_ITEM_AMOUNT = twConfig.getInt("TownWarItemAmount", 5000);
-		TW_ALLOW_KARMA = twConfig.getBoolean("AllowKarma", false);
-		TW_DISABLE_GK = twConfig.getBoolean("DisableGK", true);
-		TW_RESS_ON_DIE = twConfig.getBoolean("SendRessOnDeath", false);
-	}
-	
 	public static void loadRebirthConfig()
 	{
 		final PropertiesParser rebirthConfig = new PropertiesParser(EVENT_REBIRTH_CONFIG_FILE);
@@ -1931,52 +1794,6 @@ public class Config
 		OFFLINE_DISCONNECT_FINISHED = offlineConfig.getBoolean("OfflineDisconnectFinished", true);
 	}
 	
-	public static void loadDMConfig()
-	{
-		final PropertiesParser dmConfig = new PropertiesParser(EVENT_DM_CONFIG_FILE);
-		DM_ALLOW_INTERFERENCE = dmConfig.getBoolean("DMAllowInterference", false);
-		DM_ALLOW_POTIONS = dmConfig.getBoolean("DMAllowPotions", false);
-		DM_ALLOW_SUMMON = dmConfig.getBoolean("DMAllowSummon", false);
-		DM_JOIN_CURSED = dmConfig.getBoolean("DMJoinWithCursedWeapon", false);
-		DM_ON_START_REMOVE_ALL_EFFECTS = dmConfig.getBoolean("DMOnStartRemoveAllEffects", true);
-		DM_ON_START_UNSUMMON_PET = dmConfig.getBoolean("DMOnStartUnsummonPet", true);
-		DM_REVIVE_DELAY = dmConfig.getLong("DMReviveDelay", 20000);
-		if (DM_REVIVE_DELAY < 1000)
-		{
-			DM_REVIVE_DELAY = 1000; // can't be set less then 1 second
-		}
-		DM_REVIVE_RECOVERY = dmConfig.getBoolean("DMReviveRecovery", false);
-		DM_COMMAND = dmConfig.getBoolean("DMCommand", false);
-		DM_ENABLE_KILL_REWARD = dmConfig.getBoolean("DMEnableKillReward", false);
-		DM_KILL_REWARD_ID = dmConfig.getInt("DMKillRewardID", 6392);
-		DM_KILL_REWARD_AMOUNT = dmConfig.getInt("DMKillRewardAmount", 1);
-		DM_ANNOUNCE_REWARD = dmConfig.getBoolean("DMAnnounceReward", false);
-		DM_SPAWN_OFFSET = dmConfig.getInt("DMSpawnOffset", 100);
-		DM_STATS_LOGGER = dmConfig.getBoolean("DMStatsLogger", true);
-		DM_ALLOW_HEALER_CLASSES = dmConfig.getBoolean("DMAllowedHealerClasses", true);
-		DM_REMOVE_BUFFS_ON_DIE = dmConfig.getBoolean("DMRemoveBuffsOnPlayerDie", false);
-	}
-	
-	public static void loadCTFConfig()
-	{
-		final PropertiesParser ctfConfig = new PropertiesParser(EVENT_CTF_CONFIG_FILE);
-		CTF_EVEN_TEAMS = ctfConfig.getString("CTFEvenTeams", "BALANCE");
-		CTF_ALLOW_INTERFERENCE = ctfConfig.getBoolean("CTFAllowInterference", false);
-		CTF_ALLOW_POTIONS = ctfConfig.getBoolean("CTFAllowPotions", false);
-		CTF_ALLOW_SUMMON = ctfConfig.getBoolean("CTFAllowSummon", false);
-		CTF_ON_START_REMOVE_ALL_EFFECTS = ctfConfig.getBoolean("CTFOnStartRemoveAllEffects", true);
-		CTF_ON_START_UNSUMMON_PET = ctfConfig.getBoolean("CTFOnStartUnsummonPet", true);
-		CTF_ANNOUNCE_TEAM_STATS = ctfConfig.getBoolean("CTFAnnounceTeamStats", false);
-		CTF_ANNOUNCE_REWARD = ctfConfig.getBoolean("CTFAnnounceReward", false);
-		CTF_JOIN_CURSED = ctfConfig.getBoolean("CTFJoinWithCursedWeapon", true);
-		CTF_REVIVE_RECOVERY = ctfConfig.getBoolean("CTFReviveRecovery", false);
-		CTF_COMMAND = ctfConfig.getBoolean("CTFCommand", true);
-		CTF_AURA = ctfConfig.getBoolean("CTFAura", true);
-		CTF_STATS_LOGGER = ctfConfig.getBoolean("CTFStatsLogger", true);
-		CTF_SPAWN_OFFSET = ctfConfig.getInt("CTFSpawnOffset", 100);
-		CTF_REMOVE_BUFFS_ON_DIE = ctfConfig.getBoolean("CTFRemoveBuffsOnPlayerDie", false);
-	}
-	
 	public static void loadCustomServerConfig()
 	{
 		final PropertiesParser customServerConfig = new PropertiesParser(OTHER_CONFIG_FILE);
@@ -2048,26 +1865,6 @@ public class Config
 		CLAN_LEADER_COLOR_CLAN_LEVEL = customServerConfig.getInt("ClanLeaderColorAtClanLevel", 1);
 		SAVE_RAIDBOSS_STATUS_INTO_DB = customServerConfig.getBoolean("SaveRBStatusIntoDB", false);
 		DISABLE_WEIGHT_PENALTY = customServerConfig.getBoolean("DisableWeightPenalty", false);
-		ALLOW_FARM1_COMMAND = customServerConfig.getBoolean("AllowFarm1Command", false);
-		ALLOW_FARM2_COMMAND = customServerConfig.getBoolean("AllowFarm2Command", false);
-		ALLOW_PVP1_COMMAND = customServerConfig.getBoolean("AllowPvP1Command", false);
-		ALLOW_PVP2_COMMAND = customServerConfig.getBoolean("AllowPvP2Command", false);
-		FARM1_X = customServerConfig.getInt("farm1_X", 81304);
-		FARM1_Y = customServerConfig.getInt("farm1_Y", 14589);
-		FARM1_Z = customServerConfig.getInt("farm1_Z", -3469);
-		PVP1_X = customServerConfig.getInt("pvp1_X", 81304);
-		PVP1_Y = customServerConfig.getInt("pvp1_Y", 14589);
-		PVP1_Z = customServerConfig.getInt("pvp1_Z", -3469);
-		FARM2_X = customServerConfig.getInt("farm2_X", 81304);
-		FARM2_Y = customServerConfig.getInt("farm2_Y", 14589);
-		FARM2_Z = customServerConfig.getInt("farm2_Z", -3469);
-		PVP2_X = customServerConfig.getInt("pvp2_X", 81304);
-		PVP2_Y = customServerConfig.getInt("pvp2_Y", 14589);
-		PVP2_Z = customServerConfig.getInt("pvp2_Z", -3469);
-		FARM1_CUSTOM_MESSAGE = customServerConfig.getString("Farm1CustomMeesage", "You have been teleported to Farm Zone 1!");
-		FARM2_CUSTOM_MESSAGE = customServerConfig.getString("Farm2CustomMeesage", "You have been teleported to Farm Zone 2!");
-		PVP1_CUSTOM_MESSAGE = customServerConfig.getString("PvP1CustomMeesage", "You have been teleported to PvP Zone 1!");
-		PVP2_CUSTOM_MESSAGE = customServerConfig.getString("PvP2CustomMeesage", "You have been teleported to PvP Zone 2!");
 		GM_TRADE_RESTRICTED_ITEMS = customServerConfig.getBoolean("GMTradeRestrictedItems", false);
 		GM_RESTART_FIGHTING = customServerConfig.getBoolean("GMRestartFighting", false);
 		PM_MESSAGE_ON_START = customServerConfig.getBoolean("PMWelcomeShow", false);
@@ -2145,7 +1942,6 @@ public class Config
 		ADD_SP = pvpConfig.getInt("AddSpAtPvp", 0);
 		ALLOW_SOE_IN_PVP = pvpConfig.getBoolean("AllowSoEInPvP", true);
 		ALLOW_POTS_IN_PVP = pvpConfig.getBoolean("AllowPotsInPvP", true);
-		ENABLE_PK_INFO = pvpConfig.getBoolean("EnablePkInfo", false);
 		ANNOUNCE_ALL_KILL = pvpConfig.getBoolean("AnnounceAllKill", false);
 		ANNOUNCE_PVP_KILL = pvpConfig.getBoolean("AnnouncePvPKill", false);
 		ANNOUNCE_PK_KILL = pvpConfig.getBoolean("AnnouncePkKill", false);
@@ -3124,12 +2920,6 @@ public class Config
 			loadPvpConfig();
 			loadCraftConfig();
 			
-			// Event config
-			loadCTFConfig();
-			loadDMConfig();
-			loadTVTConfig();
-			loadTWConfig();
-			
 			// Protect
 			loadFloodConfig();
 			loadProtectedOtherConfig();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
index d24cf2e1f1..74c7082a3e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
@@ -106,7 +106,6 @@ import org.l2jmobius.gameserver.instancemanager.RecipeManager;
 import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.TradeManager;
-import org.l2jmobius.gameserver.instancemanager.events.EventManager;
 import org.l2jmobius.gameserver.instancemanager.events.PcPoint;
 import org.l2jmobius.gameserver.instancemanager.games.Lottery;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
@@ -416,29 +415,6 @@ public class GameServer
 			ThreadPool.scheduleAtFixedRate(PcPoint.getInstance(), Config.PCB_INTERVAL * 1000, Config.PCB_INTERVAL * 1000);
 		}
 		
-		printSection("EventManager");
-		EventManager.getInstance().startEventRegistration();
-		
-		if (EventManager.TVT_EVENT_ENABLED || EventManager.CTF_EVENT_ENABLED || EventManager.DM_EVENT_ENABLED)
-		{
-			if (EventManager.TVT_EVENT_ENABLED)
-			{
-				LOGGER.info("TVT Event is Enabled.");
-			}
-			if (EventManager.CTF_EVENT_ENABLED)
-			{
-				LOGGER.info("CTF Event is Enabled.");
-			}
-			if (EventManager.DM_EVENT_ENABLED)
-			{
-				LOGGER.info("DM Event is Enabled.");
-			}
-		}
-		else
-		{
-			LOGGER.info("All events are Disabled.");
-		}
-		
 		if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.RESTORE_OFFLINERS)
 		{
 			OfflineTraderTable.restoreOfflineTraders();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
index dc8b16d6f3..5ae8429ef3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -25,13 +25,11 @@ import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminAio;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminAnnouncements;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminBan;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminBuffs;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminCTFEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminCache;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminChangeAccessLevel;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminChristmas;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminCreateItem;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminCursedWeapons;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDMEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDelete;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDestroyItems;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminDonator;
@@ -40,7 +38,6 @@ import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEditChar;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEditNpc;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEffects;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEnchant;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminEventEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminExpSp;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminFence;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminFightCalculator;
@@ -83,9 +80,6 @@ import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminSuperHaste;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTarget;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTeleport;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTest;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTownWar;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminTvTEngine;
-import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminVIPEngine;
 import org.l2jmobius.gameserver.handler.admincommandhandlers.AdminZone;
 
 /**
@@ -109,18 +103,15 @@ public class AdminCommandHandler
 		registerAdminCommandHandler(new AdminChangeAccessLevel());
 		registerAdminCommandHandler(new AdminChristmas());
 		registerAdminCommandHandler(new AdminCreateItem());
-		registerAdminCommandHandler(new AdminCTFEngine());
 		registerAdminCommandHandler(new AdminCursedWeapons());
 		registerAdminCommandHandler(new AdminDelete());
 		registerAdminCommandHandler(new AdminDestroyItems());
-		registerAdminCommandHandler(new AdminDMEngine());
 		registerAdminCommandHandler(new AdminDonator());
 		registerAdminCommandHandler(new AdminDoorControl());
 		registerAdminCommandHandler(new AdminEditChar());
 		registerAdminCommandHandler(new AdminEditNpc());
 		registerAdminCommandHandler(new AdminEffects());
 		registerAdminCommandHandler(new AdminEnchant());
-		registerAdminCommandHandler(new AdminEventEngine());
 		registerAdminCommandHandler(new AdminExpSp());
 		registerAdminCommandHandler(new AdminFence());
 		registerAdminCommandHandler(new AdminFightCalculator());
@@ -163,9 +154,6 @@ public class AdminCommandHandler
 		registerAdminCommandHandler(new AdminTarget());
 		registerAdminCommandHandler(new AdminTeleport());
 		registerAdminCommandHandler(new AdminTest());
-		registerAdminCommandHandler(new AdminTownWar());
-		registerAdminCommandHandler(new AdminTvTEngine());
-		registerAdminCommandHandler(new AdminVIPEngine());
 		registerAdminCommandHandler(new AdminZone());
 		
 		LOGGER.info("AdminCommandHandler: Loaded " + _datatable.size() + " handlers.");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java
index 67787186e7..4bfc6cebe7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java
@@ -23,14 +23,10 @@ import java.util.logging.Logger;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.AutoPotion;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.BankingCmd;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.CTFCmd;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.DMCmd;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.ExperienceGain;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.FarmPvpCmd;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.OfflineShop;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Online;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.StatsCmd;
-import org.l2jmobius.gameserver.handler.voicedcommandhandlers.TvTCmd;
 import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Wedding;
 
 public class VoicedCommandHandler
@@ -47,21 +43,6 @@ public class VoicedCommandHandler
 			registerVoicedCommandHandler(new BankingCmd());
 		}
 		
-		if (Config.CTF_COMMAND)
-		{
-			registerVoicedCommandHandler(new CTFCmd());
-		}
-		
-		if (Config.TVT_COMMAND)
-		{
-			registerVoicedCommandHandler(new TvTCmd());
-		}
-		
-		if (Config.DM_COMMAND)
-		{
-			registerVoicedCommandHandler(new DMCmd());
-		}
-		
 		if (Config.ALLOW_WEDDING)
 		{
 			registerVoicedCommandHandler(new Wedding());
@@ -72,11 +53,6 @@ public class VoicedCommandHandler
 			registerVoicedCommandHandler(new StatsCmd());
 		}
 		
-		if (Config.ALLOW_FARM1_COMMAND || Config.ALLOW_FARM2_COMMAND || Config.ALLOW_PVP1_COMMAND || Config.ALLOW_PVP2_COMMAND)
-		{
-			registerVoicedCommandHandler(new FarmPvpCmd());
-		}
-		
 		if (Config.ALLOW_ONLINE_VIEW)
 		{
 			registerVoicedCommandHandler(new Online());
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java
deleted file mode 100644
index b80c382c6e..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import java.util.StringTokenizer;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminCTFEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_ctf",
-		"admin_ctf_name",
-		"admin_ctf_desc",
-		"admin_ctf_join_loc",
-		"admin_ctf_edit",
-		"admin_ctf_control",
-		"admin_ctf_minLevel",
-		"admin_ctf_maxLevel",
-		"admin_ctf_tele_npc",
-		"admin_ctf_tele_team",
-		"admin_ctf_tele_flag",
-		"admin_ctf_npc",
-		"admin_ctf_npc_pos",
-		"admin_ctf_reward",
-		"admin_ctf_reward_amount",
-		"admin_ctf_team_add",
-		"admin_ctf_team_remove",
-		"admin_ctf_team_pos",
-		"admin_ctf_team_color",
-		"admin_ctf_team_flag",
-		"admin_ctf_join",
-		"admin_ctf_teleport",
-		"admin_ctf_start",
-		"admin_ctf_startevent",
-		"admin_ctf_abort",
-		"admin_ctf_finish",
-		"admin_ctf_sit",
-		"admin_ctf_dump",
-		"admin_ctf_save",
-		"admin_ctf_load",
-		"admin_ctf_jointime",
-		"admin_ctf_eventtime",
-		"admin_ctf_autoevent",
-		"admin_ctf_minplayers",
-		"admin_ctf_maxplayers",
-		"admin_ctf_interval"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		final StringTokenizer st = new StringTokenizer(command);
-		final String comm = st.nextToken();
-		if (comm == null)
-		{
-			return false;
-		}
-		
-		switch (comm)
-		{
-			case "admin_ctf":
-			{
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_name":
-			{
-				if (st.hasMoreTokens())
-				{
-					if (CTF.setEventName(st.nextToken()))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_name <event_name>");
-				return false;
-			}
-			case "admin_ctf_desc":
-			{
-				if (st.hasMoreTokens())
-				{
-					if (CTF.setEventDesc(st.nextToken()))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_desc <event_descr>");
-				return false;
-			}
-			case "admin_ctf_join_loc":
-			{
-				if (st.hasMoreTokens())
-				{
-					if (CTF.setJoiningLocationName(st.nextToken()))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_join_loc <event_loc_name>");
-				return false;
-			}
-			case "admin_ctf_edit":
-			{
-				showEditPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_control":
-			{
-				showControlPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_minLevel":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String lvl_s = st.nextToken();
-					int lvl = 0;
-					try
-					{
-						lvl = Integer.parseInt(lvl_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minLevel <min_lvl_value>");
-						return false;
-					}
-					if (!CTF.checkMinLevel(lvl))
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Min lvl must be lower then Max");
-						return false;
-					}
-					if (CTF.setMinLevel(lvl))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minLevel <min_lvl_value>");
-				return false;
-			}
-			case "admin_ctf_maxLevel":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String lvl_s = st.nextToken();
-					int lvl = 0;
-					try
-					{
-						lvl = Integer.parseInt(lvl_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxLevel <max_lvl_value>");
-						return false;
-					}
-					if (!CTF.checkMaxLevel(lvl))
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Max lvl must be higher then Min");
-						return false;
-					}
-					if (CTF.setMaxLevel(lvl))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxLevel <min_lvl_value>");
-				return false;
-			}
-			case "admin_ctf_tele_npc":
-			{
-				activeChar.teleToLocation(CTF.getNpcLocation(), false);
-				showMainPage(activeChar);
-				return false;
-			}
-			case "admin_ctf_tele_team":
-			{
-				if (st.hasMoreTokens())
-				{
-					for (String team : CTF._teams)
-					{
-						if (team.equals(st.nextToken()))
-						{
-							final int index = CTF._teams.indexOf(team);
-							activeChar.teleToLocation(CTF._teamsX.get(index), CTF._teamsY.get(index), CTF._teamsZ.get(index));
-							return true;
-						}
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_team <team_name>");
-					showMainPage(activeChar);
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_team <team_name>");
-				return false;
-			}
-			case "admin_ctf_tele_flag":
-			{
-				if (st.hasMoreTokens())
-				{
-					for (String team : CTF._teams)
-					{
-						if (team.equals(st.nextToken()))
-						{
-							final int index = CTF._teams.indexOf(team);
-							activeChar.teleToLocation(CTF._flagsX.get(index), CTF._flagsY.get(index), CTF._flagsZ.get(index));
-							return true;
-						}
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_flag <team_name>");
-					showMainPage(activeChar);
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_tele_flag <team_name>");
-				return false;
-			}
-			case "admin_ctf_npc":
-			{
-				if (st.hasMoreTokens())
-				{
-					int id = 0;
-					try
-					{
-						id = Integer.parseInt(st.nextToken());
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_npc <npc_id>");
-						return false;
-					}
-					if (CTF.setNpcId(id))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_npc <npc_id>");
-				return false;
-			}
-			case "admin_ctf_npc_pos":
-			{
-				CTF.setNpcPos(activeChar);
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_reward":
-			{
-				if (st.hasMoreTokens())
-				{
-					int id = 0;
-					try
-					{
-						id = Integer.parseInt(st.nextToken());
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward <reward_id>");
-						return false;
-					}
-					if (CTF.setRewardId(id))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward <reward_id>");
-				return false;
-			}
-			case "admin_ctf_reward_amount":
-			{
-				if (st.hasMoreTokens())
-				{
-					int amount = 0;
-					try
-					{
-						amount = Integer.parseInt(st.nextToken());
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward_amount <reward_amount>");
-						return false;
-					}
-					if (CTF.setRewardAmount(amount))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward_amount <reward_amount>");
-				return false;
-			}
-			case "admin_ctf_team_add":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.addTeam(st.nextToken());
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_add <team_name>");
-				return false;
-			}
-			case "admin_ctf_team_remove":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.removeTeam(st.nextToken());
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_remove <team_name>");
-				return false;
-			}
-			case "admin_ctf_team_pos":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.setTeamPos(st.nextToken(), activeChar);
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_pos <team_name>");
-				return false;
-			}
-			case "admin_ctf_team_color":
-			{
-				if (st.countTokens() == 2)
-				{
-					final String color_s = st.nextToken();
-					int color = 0;
-					try
-					{
-						color = Integer.decode("0x" + color_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_color <colorHex> <teamName>");
-						return false;
-					}
-					final String team = st.nextToken();
-					CTF.setTeamColor(team, color);
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_color <colorHex> <teamName>");
-				return false;
-			}
-			case "admin_ctf_team_flag":
-			{
-				if (st.hasMoreTokens())
-				{
-					CTF.setTeamFlag(st.nextToken(), activeChar);
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_team_flag <teamName>");
-				return false;
-			}
-			case "admin_ctf_join":
-			{
-				if (CTF.startJoin())
-				{
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startJoin, check LOGGER for info..");
-				return false;
-			}
-			case "admin_ctf_teleport":
-			{
-				CTF.startTeleport();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_start":
-			{
-				if (CTF.startEvent())
-				{
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startEvent, check LOGGER for info..");
-				return false;
-			}
-			case "admin_ctf_startevent":
-			{
-				CTF.eventOnceStart();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_abort":
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Aborting event");
-				CTF.abortEvent();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_finish":
-			{
-				CTF.finishEvent();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_sit":
-			{
-				CTF.sit();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_dump":
-			{
-				CTF.dumpData();
-				return true;
-			}
-			case "admin_ctf_save":
-			{
-				CTF.saveData();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_load":
-			{
-				CTF.loadData();
-				showMainPage(activeChar);
-				return true;
-			}
-			case "admin_ctf_jointime":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String time_s = st.nextToken();
-					int time = 0;
-					try
-					{
-						time = Integer.parseInt(time_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_jointime <minutes>");
-						return false;
-					}
-					if (CTF.setJoinTime(time))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_jointime <minutes>");
-				return false;
-			}
-			case "admin_ctf_eventtime":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String time_s = st.nextToken();
-					int time = 0;
-					try
-					{
-						time = Integer.parseInt(time_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_eventtime <minutes>");
-						return false;
-					}
-					if (CTF.setEventTime(time))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_eventtime <minutes>");
-				return false;
-			}
-			case "admin_ctf_autoevent":
-			{
-				if ((CTF.getJoinTime() > 0) && (CTF.getEventTime() > 0))
-				{
-					CTF.autoEvent();
-					showMainPage(activeChar);
-					return true;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, times not defined");
-				return false;
-			}
-			case "admin_ctf_interval":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String time_s = st.nextToken();
-					int time = 0;
-					try
-					{
-						time = Integer.parseInt(time_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_interval <minutes>");
-						return false;
-					}
-					if (CTF.setIntervalBetweenMatches(time))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_interval <minutes>");
-				return false;
-			}
-			case "admin_ctf_minplayers":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String min_s = st.nextToken();
-					int min = 0;
-					try
-					{
-						min = Integer.parseInt(min_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minplayers <number>");
-						return false;
-					}
-					if (CTF.setMinPlayers(min))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minplayers <number>");
-				return false;
-			}
-			case "admin_ctf_maxplayers":
-			{
-				if (st.hasMoreTokens())
-				{
-					final String max_s = st.nextToken();
-					int max = 0;
-					try
-					{
-						max = Integer.parseInt(max_s);
-					}
-					catch (NumberFormatException e)
-					{
-						BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxplayers <number>");
-						return false;
-					}
-					if (CTF.setMaxPlayers(max))
-					{
-						showMainPage(activeChar);
-						return true;
-					}
-					BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-					return false;
-				}
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxplayers <number>");
-				return false;
-			}
-			default:
-			{
-				return false;
-			}
-		}
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showEditPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[CTF Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"125\"></td><td><edit var=\"input2\" width=\"125\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Name\" action=\"bypass -h admin_ctf_name $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Description\" action=\"bypass -h admin_ctf_desc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_ctf_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_ctf_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_ctf_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max players\" action=\"bypass -h admin_ctf_maxplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min players\" action=\"bypass -h admin_ctf_minplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC\" action=\"bypass -h admin_ctf_npc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC Pos\" action=\"bypass -h admin_ctf_npc_pos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward\" action=\"bypass -h admin_ctf_reward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward Amount\" action=\"bypass -h admin_ctf_reward_amount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Time\" action=\"bypass -h admin_ctf_jointime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Event Time\" action=\"bypass -h admin_ctf_eventtime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Interval Time\" action=\"bypass -h admin_ctf_interval $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Add\" action=\"bypass -h admin_ctf_team_add $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Color\" action=\"bypass -h admin_ctf_team_color $input1 $input2\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Pos\" action=\"bypass -h admin_ctf_team_pos $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Flag\" action=\"bypass -h admin_ctf_team_flag $input1 $input2\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Remove\" action=\"bypass -h admin_ctf_team_remove $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br>");
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_ctf\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showControlPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[CTF Engine]</font></center><br><br><br>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join\" action=\"bypass -h admin_ctf_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Teleport\" action=\"bypass -h admin_ctf_teleport\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start\" action=\"bypass -h admin_ctf_start\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"StartEventOnceTime\" action=\"bypass -h admin_ctf_startevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Abort\" action=\"bypass -h admin_ctf_abort\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Finish\" action=\"bypass -h admin_ctf_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Sit Force\" action=\"bypass -h admin_ctf_sit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Dump\" action=\"bypass -h admin_ctf_dump\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Save\" action=\"bypass -h admin_ctf_save\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Load\" action=\"bypass -h admin_ctf_load\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Auto Event\" action=\"bypass -h admin_ctf_autoevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br>");
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_ctf\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[CTF Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr>");
-		if (!CTF.isInProgress())
-		{
-			replyMSG.append("<td width=\"100\"><button value=\"Edit\" action=\"bypass -h admin_ctf_edit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		}
-		replyMSG.append("<td width=\"100\"><button value=\"Control\" action=\"bypass -h admin_ctf_control\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br>");
-		
-		replyMSG.append("<br><font color=\"LEVEL\">Current event...</font><br1>");
-		replyMSG.append("Name:&nbsp;<font color=\"00FF00\">" + CTF.getEventName() + "</font><br1>");
-		replyMSG.append("Description:&nbsp;<font color=\"00FF00\">" + CTF.getEventDesc() + "</font><br1>");
-		replyMSG.append("Joining location name:&nbsp;<font color=\"00FF00\">" + CTF.getJoiningLocationName() + "</font><br1>");
-		
-		final Location npcLoc = CTF.getNpcLocation();
-		replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + CTF.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
-		replyMSG.append("<button value=\"Tele->NPC\" action=\"bypass -h admin_ctf_tele_npc\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br>");
-		replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + CTF.getRewardId() + "</font><br1>");
-		if (ItemTable.getInstance().getTemplate(CTF.getRewardId()) != null)
-		{
-			replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">" + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + "</font><br1>");
-		}
-		else
-		{
-			replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">(unknown)</font><br1>");
-		}
-		replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + CTF.getRewardAmount() + "</font><br>");
-		replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMinLevel() + "</font><br1>");
-		replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMaxLevel() + "</font><br><br>");
-		replyMSG.append("Min Players:&nbsp;<font color=\"00FF00\">" + CTF.getMinPlayers() + "</font><br1>");
-		replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + CTF.getMaxPlayers() + "</font><br>");
-		replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + CTF.getJoinTime() + "</font><br1>");
-		replyMSG.append("Event Time:&nbsp;<font color=\"00FF00\">" + CTF.getEventTime() + "</font><br>");
-		if ((CTF._teams != null) && !CTF._teams.isEmpty())
-		{
-			replyMSG.append("<font color=\"LEVEL\">Current teams:</font><br1>");
-		}
-		replyMSG.append("<center><table border=\"0\">");
-		for (String team : CTF._teams)
-		{
-			replyMSG.append("<tr><td width=\"100\">Name: <font color=\"FF0000\">" + team + "</font>");
-			if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-			{
-				replyMSG.append("&nbsp;(" + CTF.teamPlayersCount(team) + " joined)");
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				if (CTF.isTeleport() || CTF.isStarted())
-				{
-					replyMSG.append("&nbsp;(" + CTF.teamPlayersCount(team) + " in)");
-				}
-			}
-			replyMSG.append("</td></tr><tr><td>");
-			
-			String c = Integer.toHexString(CTF._teamColors.get(CTF._teams.indexOf(team)));
-			while (c.length() < 6)
-			{
-				c = "0" + c;
-			}
-			replyMSG.append("Color: <font color=\"00FF00\">0x" + c.toUpperCase() + "</font><font color=\"" + c + "\"> =) </font>");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append("<button value=\"Tele->Team\" action=\"bypass -h admin_ctf_tele_team " + team + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(CTF._teamsX.get(CTF._teams.indexOf(team)) + ", " + CTF._teamsY.get(CTF._teams.indexOf(team)) + ", " + CTF._teamsZ.get(CTF._teams.indexOf(team)));
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append("Flag Id: <font color=\"00FF00\">" + CTF._flagIds.get(CTF._teams.indexOf(team)) + "</font>");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append("<button value=\"Tele->Flag\" action=\"bypass -h admin_ctf_tele_flag " + team + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(CTF._flagsX.get(CTF._teams.indexOf(team)) + ", " + CTF._flagsY.get(CTF._teams.indexOf(team)) + ", " + CTF._flagsZ.get(CTF._teams.indexOf(team)) + "</td></tr>");
-			if (!CTF.isInProgress())
-			{
-				replyMSG.append("<tr><td width=\"60\"><button value=\"Remove\" action=\"bypass -h admin_ctf_team_remove " + team + "\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr><tr></tr>");
-			}
-		}
-		
-		replyMSG.append("</table></center>");
-		
-		if (!CTF.isInProgress())
-		{
-			if (CTF.checkStartJoinOk())
-			{
-				replyMSG.append("<br1>");
-				replyMSG.append("Event is now set up. Press JOIN to start the registration.<br1>");
-				replyMSG.append("                           <button value=\"Join\" action=\"bypass -h admin_ctf_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br1>");
-				replyMSG.append("<br>");
-			}
-			else
-			{
-				replyMSG.append("<br1>");
-				replyMSG.append("Event is NOT set up. Press <font color=\"LEVEL\">EDIT</font> to create a new event, or <font color=\"LEVEL\">CONTROL</font> to load an existing event.<br1>");
-				replyMSG.append("<br>");
-			}
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && !CTF.isStarted())
-		{
-			replyMSG.append("<br1>");
-			replyMSG.append(CTF._playersShuffle.size() + " players participating. Waiting to shuffle in teams(done on teleport)!");
-			replyMSG.append("<br><br>");
-		}
-		
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java
deleted file mode 100644
index cc8e98612b..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminDMEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_dmevent",
-		"admin_dmevent_name",
-		"admin_dmevent_desc",
-		"admin_dmevent_join_loc",
-		"admin_dmevent_minLevel",
-		"admin_dmevent_maxLevel",
-		"admin_dmevent_npc",
-		"admin_dmevent_npc_pos",
-		"admin_dmevent_reward",
-		"admin_dmevent_reward_amount",
-		"admin_dmevent_spawnpos",
-		"admin_dmevent_color",
-		"admin_dmevent_join",
-		"admin_dmevent_teleport",
-		"admin_dmevent_start",
-		"admin_dmevent_startevent",
-		"admin_dmevent_abort",
-		"admin_dmevent_finish",
-		"admin_dmevent_sit",
-		"admin_dmevent_dump",
-		"admin_dmevent_save",
-		"admin_dmevent_load"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_dmevent"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_dmevent_name "))
-		{
-			if (DM.setEventName(command.substring(19)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_desc "))
-		{
-			if (DM.setEventDesc(command.substring(19)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_minLevel "))
-		{
-			if (!DM.checkMinLevel(Integer.parseInt(command.substring(21))))
-			{
-				return false;
-			}
-			
-			if (DM.setMinlvl(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_maxLevel "))
-		{
-			if (!DM.checkMaxLevel(Integer.parseInt(command.substring(21))))
-			{
-				return false;
-			}
-			
-			if (DM.setMaxlvl(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_join_loc "))
-		{
-			if (DM.setJoiningLocationName(command.substring(23)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_npc "))
-		{
-			if (DM.setNpcId(Integer.parseInt(command.substring(18))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_dmevent_npc_pos"))
-		{
-			DM.setNpcPos(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_dmevent_reward "))
-		{
-			if (DM.setRewardId(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_dmevent_reward_amount "))
-		{
-			if (DM.setRewardAmount(Integer.parseInt(command.substring(28))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_dmevent_spawnpos"))
-		{
-			DM.setPlayersPos(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_dmevent_color "))
-		{
-			if (DM.setPlayerColors(Integer.decode("0x" + command.substring(20))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_dmevent_join"))
-		{
-			if (DM.startJoin())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startJoin, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_dmevent_teleport"))
-		{
-			DM.startTeleport();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_start"))
-		{
-			if (DM.startEvent())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startEvent, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_dmevent_startevent"))
-		{
-			DM.startEvent();
-			showMainPage(activeChar);
-			
-		}
-		else if (command.equals("admin_dmevent_abort"))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Aborting event");
-			DM.abortEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_finish"))
-		{
-			DM.finishEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_sit"))
-		{
-			DM.sit();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_load"))
-		{
-			DM.loadData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_save"))
-		{
-			DM.saveData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_dmevent_dump"))
-		{
-			DM.dumpData();
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[DeathMatch Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"125\"></td><td><edit var=\"input2\" width=\"125\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Name\" action=\"bypass -h admin_dmevent_name $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Description\" action=\"bypass -h admin_dmevent_desc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_dmevent_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_dmevent_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_dmevent_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC\" action=\"bypass -h admin_dmevent_npc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC Pos\" action=\"bypass -h admin_dmevent_npc_pos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward\" action=\"bypass -h admin_dmevent_reward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward Amount\" action=\"bypass -h admin_dmevent_reward_amount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"DM Color\" action=\"bypass -h admin_dmevent_color $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"DM SpawnPos\" action=\"bypass -h admin_dmevent_spawnpos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><br><br><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join\" action=\"bypass -h admin_dmevent_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Teleport\" action=\"bypass -h admin_dmevent_teleport\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start\" action=\"bypass -h admin_dmevent_start\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("</tr></table><table><br><br><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"StartEventOnceTime\" action=\"bypass -h admin_dmevent_startevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Abort\" action=\"bypass -h admin_dmevent_abort\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Finish\" action=\"bypass -h admin_dmevent_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Sit Force\" action=\"bypass -h admin_dmevent_sit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Dump\" action=\"bypass -h admin_dmevent_dump\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Save\" action=\"bypass -h admin_dmevent_save\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Load\" action=\"bypass -h admin_dmevent_load\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br>");
-		replyMSG.append("Current event...<br1>");
-		replyMSG.append("Name:&nbsp;<font color=\"00FF00\">" + DM.getEventName() + "</font><br1>");
-		replyMSG.append("Description:&nbsp;<font color=\"00FF00\">" + DM.getEventDesc() + "</font><br1>");
-		replyMSG.append("Joining location name:&nbsp;<font color=\"00FF00\">" + DM.getJoiningLocationName() + "</font><br1>");
-		
-		final Location npcLoc = DM.getNpcLocation();
-		replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + DM.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
-		replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + DM.getRewardId() + "</font><br1>");
-		replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + DM.getRewardAmount() + "</font><br><br>");
-		replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + DM.getMinLevel() + "</font><br>");
-		replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + DM.getMaxLevel() + "</font><br><br>");
-		replyMSG.append("Death Match Color:&nbsp;<font color=\"00FF00\">" + DM.getPlayerColors() + "</font><br>");
-		
-		final Location playerLoc = DM.getPlayersSpawnLocation();
-		replyMSG.append("Death Match Spawn Pos:&nbsp;<font color=\"00FF00\">" + playerLoc.getX() + "," + playerLoc.getY() + "," + playerLoc.getZ() + "</font><br><br>");
-		replyMSG.append("Current players:<br1>");
-		if (!DM.hasStarted())
-		{
-			replyMSG.append("<br1>");
-			replyMSG.append(DM._players.size() + " players participating.");
-			replyMSG.append("<br><br>");
-		}
-		else if (DM.hasStarted())
-		{
-			replyMSG.append("<br1>");
-			replyMSG.append(DM._players.size() + " players in fighting event.");
-			replyMSG.append("<br><br>");
-		}
-		
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEventEngine.java
deleted file mode 100644
index fd21775322..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEventEngine.java
+++ /dev/null
@@ -1,805 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.StringTokenizer;
-
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ItemList;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import org.l2jmobius.gameserver.network.serverpackets.Revive;
-import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
-
-/**
- * This class handles following admin commands: - admin = shows menu
- * @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/04/11 10:06:06 $
- */
-public class AdminEventEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_event",
-		"admin_event_new",
-		"admin_event_choose",
-		"admin_event_store",
-		"admin_event_set",
-		"admin_event_change_teams_number",
-		"admin_event_announce",
-		"admin_event_panel",
-		"admin_event_control_begin",
-		"admin_event_control_teleport",
-		"admin_add",
-		"admin_event_see",
-		"admin_event_del",
-		"admin_delete_buffer",
-		"admin_event_control_sit",
-		"admin_event_name",
-		"admin_event_control_kill",
-		"admin_event_control_res",
-		"admin_event_control_prize",
-		"admin_event_control_chatban",
-		"admin_event_control_finish"
-	};
-	
-	private static String tempBuffer = "";
-	private static String tempName = "";
-	private static String tempName2 = "";
-	private static boolean npcsDeleted = false;
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_event"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_event_new"))
-		{
-			showNewEventPage(activeChar);
-		}
-		else if (command.startsWith("admin_add"))
-		{
-			tempBuffer += command.substring(10);
-			showNewEventPage(activeChar);
-		}
-		else if (command.startsWith("admin_event_see"))
-		{
-			final String eventName = command.substring(16);
-			FileInputStream fis = null;
-			BufferedInputStream buff = null;
-			DataInputStream in = null;
-			InputStreamReader isr = null;
-			BufferedReader inbr = null;
-			try
-			{
-				final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-				fis = new FileInputStream("data/events/" + eventName);
-				buff = new BufferedInputStream(fis);
-				in = new DataInputStream(buff);
-				isr = new InputStreamReader(in);
-				inbr = new BufferedReader(isr);
-				
-				final StringBuilder replyMSG = new StringBuilder("<html><body>");
-				replyMSG.append("<center><font color=\"LEVEL\">" + eventName + "</font><font color=\"FF0000\"> bY " + inbr.readLine() + "</font></center><br>");
-				replyMSG.append("<br>" + inbr.readLine());
-				replyMSG.append("</body></html>");
-				adminReply.setHtml(replyMSG.toString());
-				activeChar.sendPacket(adminReply);
-			}
-			catch (Exception e)
-			{
-			}
-			finally
-			{
-				if (inbr != null)
-				{
-					try
-					{
-						inbr.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (isr != null)
-				{
-					try
-					{
-						isr.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (in != null)
-				{
-					try
-					{
-						in.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (buff != null)
-				{
-					try
-					{
-						buff.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-				if (fis != null)
-				{
-					try
-					{
-						fis.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-		else if (command.startsWith("admin_event_del"))
-		{
-			final String eventName = command.substring(16);
-			final File file = new File("data/events/" + eventName);
-			file.delete();
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_event_name"))
-		{
-			tempName += command.substring(17);
-			showNewEventPage(activeChar);
-		}
-		else if (command.equalsIgnoreCase("admin_delete_buffer"))
-		{
-			try
-			{
-				tempBuffer += tempBuffer.substring(0, tempBuffer.length() - 10);
-				showNewEventPage(activeChar);
-			}
-			catch (Exception e)
-			{
-				tempBuffer = "";
-			}
-		}
-		else if (command.startsWith("admin_event_store"))
-		{
-			FileOutputStream file = null;
-			PrintStream p = null;
-			try
-			{
-				file = new FileOutputStream("data/events/" + tempName);
-				p = new PrintStream(file);
-				p.println(activeChar.getName());
-				p.println(tempBuffer);
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			finally
-			{
-				if (p != null)
-				{
-					p.close();
-				}
-				
-				if (file != null)
-				{
-					try
-					{
-						file.close();
-					}
-					catch (IOException e)
-					{
-						e.printStackTrace();
-					}
-				}
-			}
-			
-			tempBuffer = "";
-			tempName = "";
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_event_set"))
-		{
-			GameEvent.eventName = command.substring(16);
-			showEventParameters(activeChar, 2);
-		}
-		else if (command.startsWith("admin_event_change_teams_number"))
-		{
-			showEventParameters(activeChar, Integer.parseInt(command.substring(32)));
-		}
-		else if (command.startsWith("admin_event_panel"))
-		{
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_begin"))
-		{
-			try
-			{
-				GameEvent.active = true;
-				GameEvent.players.clear();
-				GameEvent.connectionLossData.clear();
-				
-				for (int j = 0; j < GameEvent.teamsNumber; j++)
-				{
-					final LinkedList<String> link = new LinkedList<>();
-					GameEvent.players.put(j + 1, link);
-				}
-				
-				int i = 0;
-				
-				while (!GameEvent.participatingPlayers.isEmpty())
-				{
-					final String target = getMaxLeveledPlayer();
-					if (!target.equals(""))
-					{
-						GameEvent.players.get(i + 1).add(target);
-						i = (i + 1) % GameEvent.teamsNumber;
-					}
-				}
-				
-				destroyEventNpcs();
-				npcsDeleted = true;
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_teleport"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(29), "-");
-			
-			while (st.hasMoreElements())
-			{
-				teleportTeam(activeChar, Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_sit"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(24), "-");
-			
-			while (st.hasMoreElements())
-			{
-				sitTeam(Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_kill"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(25), "-");
-			
-			while (st.hasMoreElements())
-			{
-				killTeam(activeChar, Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_res"))
-		{
-			final StringTokenizer st = new StringTokenizer(command.substring(24), "-");
-			
-			while (st.hasMoreElements())
-			{
-				resTeam(Integer.parseInt(st.nextToken()));
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_prize"))
-		{
-			final StringTokenizer st0 = new StringTokenizer(command.substring(26));
-			final StringTokenizer st = new StringTokenizer(st0.nextToken(), "-");
-			String n = st0.nextToken();
-			
-			final StringTokenizer st1 = new StringTokenizer(n, "*");
-			n = st1.nextToken();
-			String type = "";
-			if (st1.hasMoreElements())
-			{
-				type = st1.nextToken();
-			}
-			
-			final String id = st0.nextToken();
-			
-			while (st.hasMoreElements())
-			{
-				regardTeam(activeChar, Integer.parseInt(st.nextToken()), Integer.parseInt(n), Integer.parseInt(id), type);
-			}
-			
-			showEventControl(activeChar);
-		}
-		else if (command.startsWith("admin_event_control_finish"))
-		{
-			for (int i = 0; i < GameEvent.teamsNumber; i++)
-			{
-				telePlayersBack(i + 1);
-			}
-			
-			GameEvent.eventName = "";
-			GameEvent.teamsNumber = 0;
-			GameEvent.names.clear();
-			GameEvent.participatingPlayers.clear();
-			GameEvent.players.clear();
-			GameEvent.id = 12760;
-			GameEvent.npcs.clear();
-			GameEvent.active = false;
-			npcsDeleted = false;
-		}
-		else if (command.startsWith("admin_event_announce"))
-		{
-			StringTokenizer st = new StringTokenizer(command.substring(21));
-			GameEvent.id = Integer.parseInt(st.nextToken());
-			GameEvent.teamsNumber = Integer.parseInt(st.nextToken());
-			String temp = " ";
-			String temp2 = "";
-			
-			while (st.hasMoreElements())
-			{
-				temp += st.nextToken() + " ";
-			}
-			
-			st = new StringTokenizer(temp, "-");
-			Integer i = 1;
-			
-			while (st.hasMoreElements())
-			{
-				temp2 = st.nextToken();
-				if (!temp2.equals(" "))
-				{
-					GameEvent.names.put(i, temp2.substring(1, temp2.length() - 1));
-					i++;
-				}
-			}
-			
-			GameEvent.participatingPlayers.clear();
-			
-			muestraNpcConInfoAPlayers(activeChar, GameEvent.id);
-			
-			final PlaySound snd = new PlaySound(1, "B03_F");
-			activeChar.sendPacket(snd);
-			activeChar.broadcastPacket(snd);
-			
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE</font></center><br>");
-			replyMSG.append("<center>The event <font color=\"LEVEL\">" + GameEvent.eventName + "</font> has been announced, now you can type //event_panel to see the event panel control</center><br>");
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			activeChar.sendPacket(adminReply);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	String showStoredEvents()
-	{
-		final File dir = new File("data/events");
-		final String[] files = dir.list();
-		String result = "";
-		if (files == null)
-		{
-			result = "No 'data/events' directory!";
-			return result;
-		}
-		
-		for (String file2 : files)
-		{
-			final File file = new File("data/events/" + file2);
-			result += "<font color=\"LEVEL\">" + file.getName() + " </font><br><button value=\"select\" action=\"bypass -h admin_event_set " + file.getName() + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><button value=\"ver\" action=\"bypass -h admin_event_see " + file.getName() + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><button value=\"delete\" action=\"bypass -h admin_event_del " + file.getName() + "\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br><br>";
-		}
-		
-		return result;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
-		replyMSG.append("<br><center><button value=\"Create NEW event \" action=\"bypass -h admin_event_new\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<center><br>Stored Events<br></center>");
-		replyMSG.append(showStoredEvents());
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showNewEventPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
-		replyMSG.append("<br><center>Event's Title<br><font color=\"LEVEL\">");
-		if (tempName.equals(""))
-		{
-			replyMSG.append("Use //event_name text to insert a new title");
-		}
-		else
-		{
-			replyMSG.append(tempName);
-		}
-		
-		replyMSG.append("</font></center><br><br>Event's description<br>");
-		if (tempBuffer.equals(""))
-		{
-			replyMSG.append("Use //add text o //delete_buffer to modify this text field");
-		}
-		else
-		{
-			replyMSG.append(tempBuffer);
-		}
-		
-		if ((!tempName.equals("") || !tempBuffer.equals("")))
-		{
-			replyMSG.append("<br><button value=\"Crear\" action=\"bypass -h admin_event_store\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		}
-		
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showEventParameters(PlayerInstance activeChar, int teamnumbers)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
-		replyMSG.append("<center><font color=\"LEVEL\">" + GameEvent.eventName + "</font></center><br>");
-		replyMSG.append("<br><center><button value=\"Change number of teams to\" action=\"bypass -h admin_event_change_teams_number $event_teams_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"> <edit var=\"event_teams_number\" width=100 height=20><br><br>");
-		replyMSG.append("<font color=\"LEVEL\">Team's Names</font><br>");
-		for (int i = 0; i < teamnumbers; i++)
-		{
-			replyMSG.append((i + 1) + ".- <edit var=\"event_teams_name" + (i + 1) + "\" width=100 height=20><br>");
-		}
-		
-		replyMSG.append("<br><br>Announcer NPC id<edit var=\"event_npcid\" width=100 height=20><br><br><button value=\"Announce Event!!\" action=\"bypass -h admin_event_announce $event_npcid " + teamnumbers + " ");
-		for (int i = 0; i < teamnumbers; i++)
-		{
-			replyMSG.append("$event_teams_name" + (i + 1) + " - ");
-		}
-		
-		replyMSG.append("\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	void muestraNpcConInfoAPlayers(PlayerInstance activeChar, int id)
-	{
-		GameEvent.npcs.clear();
-		final LinkedList<PlayerInstance> temp = new LinkedList<>();
-		temp.clear();
-		
-		for (PlayerInstance player : World.getInstance().getAllPlayers())
-		{
-			if (!temp.contains(player))
-			{
-				GameEvent.spawn(player, id);
-				temp.add(player);
-			}
-			for (PlayerInstance playertemp : player.getKnownList().getKnownPlayers().values())
-			{
-				if ((Math.abs(playertemp.getX() - player.getX()) < 500) && (Math.abs(playertemp.getY() - player.getY()) < 500) && (Math.abs(playertemp.getZ() - player.getZ()) < 500))
-				{
-					temp.add(playertemp);
-				}
-			}
-		}
-		
-		GameEvent.announceAllPlayers(activeChar.getName() + " wants to make an event !!! (you'll find a npc with the details around)");
-	}
-	
-	void showEventControl(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br><font color=\"LEVEL\">" + GameEvent.eventName + "</font><br><br><table width=200>");
-		replyMSG.append("<tr><td>Apply this command to teams number </td><td><edit var=\"team_number\" width=100 height=15></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		
-		if (!npcsDeleted)
-		{
-			replyMSG.append("<tr><td><button value=\"Start\" action=\"bypass -h admin_event_control_begin\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Destroys all event npcs so no more people can't participate now on</font></td></tr>");
-		}
-		
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Teleport\" action=\"bypass -h admin_event_control_teleport $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Teleports the specified team to your position</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Sit\" action=\"bypass -h admin_event_control_sit $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Sits/Stands up the team</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Kill\" action=\"bypass -h admin_event_control_kill $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Finish with the life of all the players in the selected team</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Resurrect\" action=\"bypass -h admin_event_control_res $team_number\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Resurrect Team's members</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"Give Item\" action=\"bypass -h admin_event_control_prize $team_number $n $id\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"> number <edit var=\"n\" width=100 height=15> item id <edit var=\"id\" width=100 height=15></td><td><font color=\"LEVEL\">Give the specified item id to every single member of the team, you can put 5*level, 5*kills or 5 in the number field for example</font></td></tr>");
-		replyMSG.append("<tr><td>&nbsp;</td></tr>");
-		replyMSG.append("<tr><td><button value=\"End\" action=\"bypass -h admin_event_control_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td><font color=\"LEVEL\">Will finish the event teleporting back all the players</font></td></tr>");
-		replyMSG.append("</table></body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	String getMaxLeveledPlayer()
-	{
-		final Iterator<String> it = GameEvent.participatingPlayers.iterator();
-		PlayerInstance pc = null;
-		int max = 0;
-		String name = "";
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				tempName2 = it.next();
-				pc = World.getInstance().getPlayer(tempName2);
-				if (max < pc.getLevel())
-				{
-					max = pc.getLevel();
-					name = pc.getName();
-				}
-			}
-			catch (Exception e)
-			{
-				try
-				{
-					GameEvent.participatingPlayers.remove(tempName2);
-				}
-				catch (Exception e2)
-				{
-				}
-			}
-		}
-		
-		GameEvent.participatingPlayers.remove(name);
-		
-		return name;
-	}
-	
-	void destroyEventNpcs()
-	{
-		NpcInstance npc;
-		while (!GameEvent.npcs.isEmpty())
-		{
-			try
-			{
-				npc = (NpcInstance) World.getInstance().findObject(Integer.parseInt(GameEvent.npcs.get(0)));
-				final Spawn spawn = npc.getSpawn();
-				if (spawn != null)
-				{
-					spawn.stopRespawn();
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-				
-				npc.deleteMe();
-				GameEvent.npcs.remove(0);
-			}
-			catch (Exception e)
-			{
-				GameEvent.npcs.remove(0);
-			}
-		}
-	}
-	
-	void teleportTeam(PlayerInstance activeChar, int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance pc = World.getInstance().getPlayer(it.next());
-				pc.setTitle(GameEvent.names.get(team));
-				pc.teleToLocation(activeChar.getX(), activeChar.getY(), activeChar.getZ(), true);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void sitTeam(int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance pc = World.getInstance().getPlayer(it.next());
-				pc.eventSitForced = !pc.eventSitForced;
-				if (pc.eventSitForced)
-				{
-					pc.sitDown();
-				}
-				else
-				{
-					pc.standUp();
-				}
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void killTeam(PlayerInstance activeChar, int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance target = World.getInstance().getPlayer(it.next());
-				target.reduceCurrentHp(target.getMaxHp() + target.getMaxCp() + 1, activeChar);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void resTeam(int team)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance character = World.getInstance().getPlayer(it.next());
-				character.setCurrentHpMp(character.getMaxHp(), character.getMaxMp());
-				character.setCurrentCp(character.getMaxCp());
-				
-				final Revive revive = new Revive(character);
-				final SocialAction sa = new SocialAction(character.getObjectId(), 15);
-				character.broadcastPacket(sa);
-				character.sendPacket(sa);
-				character.sendPacket(revive);
-				character.broadcastPacket(revive);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	private void createItem(PlayerInstance activeChar, PlayerInstance player, int id, int num)
-	{
-		player.getInventory().addItem("Event", id, num, player, activeChar);
-		player.sendPacket(new ItemList(player, true));
-		
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("CONGRATULATIONS, you should have a present in your inventory");
-		replyMSG.append("</body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		player.sendPacket(adminReply);
-	}
-	
-	void regardTeam(PlayerInstance activeChar, int team, int n, int id, String type)
-	{
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		int temp = n;
-		
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance target = World.getInstance().getPlayer(it.next());
-				if (type.equalsIgnoreCase("level"))
-				{
-					temp = n * target.getLevel();
-				}
-				else if (type.equalsIgnoreCase("kills"))
-				{
-					temp = n * target.kills.size();
-				}
-				else
-				{
-					temp = n;
-				}
-				createItem(activeChar, target, id, temp);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-	
-	void telePlayersBack(int team)
-	{
-		resTeam(team);
-		
-		final LinkedList<String> linked = GameEvent.players.get(team);
-		final Iterator<String> it = linked.iterator();
-		
-		while (it.hasNext())
-		{
-			try
-			{
-				final PlayerInstance target = World.getInstance().getPlayer(it.next());
-				target.setTitle(target.eventTitle);
-				target.setKarma(target.eventKarma);
-				target.setPvpKills(target.eventPvpKills);
-				target.setPkKills(target.eventPkKills);
-				target.teleToLocation(target.eventX, target.eventY, target.eventZ, true);
-				target.kills.clear();
-				target.eventSitForced = false;
-				target.atEvent = false;
-			}
-			catch (Exception e)
-			{
-			}
-		}
-	}
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTownWar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTownWar.java
deleted file mode 100644
index 7218491cea..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTownWar.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.xml.MapRegionData;
-import org.l2jmobius.gameserver.data.xml.ZoneData;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.type.TownZone;
-
-public class AdminTownWar implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_townwar_start",
-		"admin_townwar_end"
-	};
-	private WorldObject _activeObject;
-	
-	public WorldObject getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.startsWith("admin_townwar_start")) // townwar_start
-		{
-			startTW(activeChar);
-		}
-		if (command.startsWith("admin_townwar_end")) // townwar_end
-		{
-			endTW(activeChar);
-		}
-		return true;
-	}
-	
-	private void startTW(PlayerInstance activeChar)
-	{
-		// All Towns will become War Zones
-		if (Config.TW_ALL_TOWNS)
-		{
-			for (TownZone zone : ZoneData.getInstance().getAllZones(TownZone.class))
-			{
-				zone.setParameter("noPeace", "true");
-			}
-		}
-		
-		// A Town will become War Zone
-		if (!Config.TW_ALL_TOWNS && (Config.TW_TOWN_ID != 18) && (Config.TW_TOWN_ID != 21) && (Config.TW_TOWN_ID != 22))
-		{
-			MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).setParameter("noPeace", "true");
-		}
-		
-		int x;
-		int y;
-		int z;
-		TownZone town;
-		for (PlayerInstance onlinePlayer : World.getInstance().getAllPlayers())
-		{
-			if (onlinePlayer.isOnline())
-			{
-				x = onlinePlayer.getX();
-				y = onlinePlayer.getY();
-				z = onlinePlayer.getZ();
-				town = ZoneData.getInstance().getZone(x, y, z, TownZone.class);
-				if (town != null)
-				{
-					if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, false);
-						onlinePlayer.revalidateZone(true);
-					}
-					else if (Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, false);
-						onlinePlayer.revalidateZone(true);
-					}
-				}
-				onlinePlayer.setInTownWar(true);
-			}
-		}
-		
-		// Announce for all towns
-		if (Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("Town War Event!");
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("All towns have been set to war zone by " + activeChar.getName() + ".");
-		}
-		
-		// Announce for one town
-		if (!Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("Town War Event!");
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).getName() + " has been set to war zone by " + activeChar.getName() + ".");
-		}
-	}
-	
-	private void endTW(PlayerInstance activeChar)
-	{
-		// All Towns will become Peace Zones
-		if (Config.TW_ALL_TOWNS)
-		{
-			MapRegionData.getInstance().getTown(1).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(2).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(3).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(4).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(5).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(6).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(7).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(8).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(9).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(10).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(11).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(12).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(13).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(14).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(15).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(16).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(17).setParameter("noPeace", "false");
-			MapRegionData.getInstance().getTown(19).setParameter("noPeace", "false");
-		}
-		
-		// A Town will become Peace Zone
-		if (!Config.TW_ALL_TOWNS && (Config.TW_TOWN_ID != 18) && (Config.TW_TOWN_ID != 21) && (Config.TW_TOWN_ID != 22))
-		{
-			MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).setParameter("noPeace", "false");
-		}
-		
-		int x;
-		int y;
-		int z;
-		TownZone town;
-		for (PlayerInstance onlinePlayer : World.getInstance().getAllPlayers())
-		{
-			if (onlinePlayer.isOnline())
-			{
-				x = onlinePlayer.getX();
-				y = onlinePlayer.getY();
-				z = onlinePlayer.getZ();
-				town = ZoneData.getInstance().getZone(x, y, z, TownZone.class);
-				if (town != null)
-				{
-					if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, true);
-						onlinePlayer.revalidateZone(true);
-					}
-					else if (Config.TW_ALL_TOWNS)
-					{
-						onlinePlayer.setInsideZone(ZoneId.PVP, true);
-						onlinePlayer.revalidateZone(true);
-					}
-				}
-				onlinePlayer.setInTownWar(false);
-			}
-		}
-		
-		// Announce for all towns
-		if (Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("All towns have been set back to normal by " + activeChar.getName() + ".");
-		}
-		
-		// Announce for one town
-		if (!Config.TW_ALL_TOWNS)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(MapRegionData.getInstance().getTown(Config.TW_TOWN_ID).getName() + " has been set back to normal by " + activeChar.getName() + ".");
-		}
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java
deleted file mode 100644
index b971028f74..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import java.util.StringTokenizer;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminTvTEngine implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_tvt",
-		"admin_tvt_name",
-		"admin_tvt_desc",
-		"admin_tvt_join_loc",
-		"admin_tvt_minLevel",
-		"admin_tvt_maxLevel",
-		"admin_tvt_npc",
-		"admin_tvt_npc_pos",
-		"admin_tvt_reward",
-		"admin_tvt_reward_amount",
-		"admin_tvt_team_add",
-		"admin_tvt_team_remove",
-		"admin_tvt_team_pos",
-		"admin_tvt_team_color",
-		"admin_tvt_join",
-		"admin_tvt_teleport",
-		"admin_tvt_start",
-		"admin_tvt_abort",
-		"admin_tvt_finish",
-		"admin_tvt_sit",
-		"admin_tvt_dump",
-		"admin_tvt_save",
-		"admin_tvt_load",
-		"admin_tvt_jointime",
-		"admin_tvt_eventtime",
-		"admin_tvt_autoevent",
-		"admin_tvt_startevent",
-		"admin_tvt_minplayers",
-		"admin_tvt_maxplayers",
-		"admin_tvtkick",
-		"admin_tvt_interval"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_tvt"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_name "))
-		{
-			if (TvT.setEventName(command.substring(15)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_desc "))
-		{
-			if (TvT.setEventDesc(command.substring(15)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_minLevel "))
-		{
-			if (!TvT.checkMinLevel(Integer.parseInt(command.substring(17))))
-			{
-				return false;
-			}
-			
-			if (TvT.setMinlvl(Integer.parseInt(command.substring(17))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_maxLevel "))
-		{
-			if (!TvT.checkMaxLevel(Integer.parseInt(command.substring(17))))
-			{
-				return false;
-			}
-			
-			if (TvT.setMaxlvl(Integer.parseInt(command.substring(17))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_minplayers "))
-		{
-			if (TvT.setMinPlayers(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_maxplayers "))
-		{
-			if (TvT.setMaxPlayers(Integer.parseInt(command.substring(21))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_join_loc "))
-		{
-			if (TvT.setJoiningLocationName(command.substring(19)))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_npc "))
-		{
-			if (TvT.setNpcId(Integer.parseInt(command.substring(14))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.equals("admin_tvt_npc_pos"))
-		{
-			TvT.setNpcPos(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_reward "))
-		{
-			if (TvT.setRewardId(Integer.parseInt(command.substring(17))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_reward_amount "))
-		{
-			if (TvT.setRewardAmount(Integer.parseInt(command.substring(24))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_jointime "))
-		{
-			if (TvT.setJoinTime(Integer.parseInt(command.substring(19))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_eventtime "))
-		{
-			if (TvT.setEventTime(Integer.parseInt(command.substring(20))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_interval "))
-		{
-			if (TvT.setIntervalBetweenMatches(Integer.parseInt(command.substring(20))))
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
-			}
-		}
-		else if (command.startsWith("admin_tvt_team_add "))
-		{
-			final String teamName = command.substring(19);
-			TvT.addTeam(teamName);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_team_remove "))
-		{
-			final String teamName = command.substring(22);
-			TvT.removeTeam(teamName);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_team_pos "))
-		{
-			final String teamName = command.substring(19);
-			TvT.setTeamPos(teamName, activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_tvt_team_color "))
-		{
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 3)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usege: //tvt_team_color <colorHex> <teamName>");
-				return false;
-			}
-			
-			TvT.setTeamColor(command.substring(params[0].length() + params[1].length() + 2), Integer.decode("0x" + params[1]));
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_join"))
-		{
-			if (TvT.startJoin())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startJoin, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_tvt_teleport"))
-		{
-			TvT.startTeleport();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_start"))
-		{
-			if (TvT.startEvent())
-			{
-				showMainPage(activeChar);
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot startEvent, check LOGGER for info..");
-			}
-		}
-		else if (command.equals("admin_tvt_startevent"))
-		{
-			TvT.eventOnceStart();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_abort"))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Aborting event");
-			TvT.abortEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_finish"))
-		{
-			TvT.finishEvent();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_sit"))
-		{
-			TvT.sit();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_load"))
-		{
-			TvT.loadData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_autoevent"))
-		{
-			if ((TvT.getJoinTime() > 0) && (TvT.getEventTime() > 0))
-			{
-				TvT.autoEvent();
-			}
-			else
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usege: join time or event time invalid.");
-			}
-			
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_save"))
-		{
-			TvT.saveData();
-			showMainPage(activeChar);
-		}
-		else if (command.equals("admin_tvt_dump"))
-		{
-			TvT.dumpData();
-		}
-		else if (command.startsWith("admin_tvtkick"))
-		{
-			final StringTokenizer st = new StringTokenizer(command);
-			if (st.countTokens() > 1)
-			{
-				st.nextToken();
-				final String plyr = st.nextToken();
-				final PlayerInstance playerToKick = World.getInstance().getPlayer(plyr);
-				if (playerToKick != null)
-				{
-					TvT.kickPlayerFromTvt(playerToKick);
-					BuilderUtil.sendSysMessage(activeChar, "You kicked " + playerToKick.getName() + " from the TvT.");
-				}
-				else
-				{
-					BuilderUtil.sendSysMessage(activeChar, "Wrong usege: //tvtkick <player>");
-				}
-			}
-		}
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><title>Team vs Team</title><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[TvT Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"125\"></td><td><edit var=\"input2\" width=\"125\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Name\" action=\"bypass -h admin_tvt_name $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Description\" action=\"bypass -h admin_tvt_desc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_tvt_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_tvt_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_tvt_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Max players\" action=\"bypass -h admin_tvt_maxplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Min players\" action=\"bypass -h admin_tvt_minplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC\" action=\"bypass -h admin_tvt_npc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"NPC Pos\" action=\"bypass -h admin_tvt_npc_pos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward\" action=\"bypass -h admin_tvt_reward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Reward Amount\" action=\"bypass -h admin_tvt_reward_amount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join Time\" action=\"bypass -h admin_tvt_jointime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Event Time\" action=\"bypass -h admin_tvt_eventtime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Interval Time\" action=\"bypass -h admin_tvt_interval $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Add\" action=\"bypass -h admin_tvt_team_add $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Color\" action=\"bypass -h admin_tvt_team_color $input1 $input2\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Pos\" action=\"bypass -h admin_tvt_team_pos $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Team Remove\" action=\"bypass -h admin_tvt_team_remove $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join\" action=\"bypass -h admin_tvt_join\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Teleport\" action=\"bypass -h admin_tvt_teleport\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start\" action=\"bypass -h admin_tvt_start\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("</tr></table><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"StartEventOnceTime\" action=\"bypass -h admin_tvt_startevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Abort\" action=\"bypass -h admin_tvt_abort\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Finish\" action=\"bypass -h admin_tvt_finish\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Sit Force\" action=\"bypass -h admin_tvt_sit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Dump\" action=\"bypass -h admin_tvt_dump\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Save\" action=\"bypass -h admin_tvt_save\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Load\" action=\"bypass -h admin_tvt_load\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Auto Event\" action=\"bypass -h admin_tvt_autoevent\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br>");
-		replyMSG.append("Current event:<br1>");
-		replyMSG.append("Name:&nbsp;<font color=\"00FF00\">" + TvT.getEventName() + "</font><br1>");
-		replyMSG.append("Description:&nbsp;<font color=\"00FF00\">" + TvT.getEventDesc() + "</font><br1>");
-		replyMSG.append("Joining location name:&nbsp;<font color=\"00FF00\">" + TvT.getJoiningLocationName() + "</font><br1>");
-		
-		final Location npcLoc = TvT.getNpcLocation();
-		replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + TvT.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
-		replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + TvT.getRewardId() + "</font><br1>");
-		replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + TvT.getRewardAmount() + "</font><br><br>");
-		replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMinLevel() + "</font><br>");
-		replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMaxLevel() + "</font><br><br>");
-		replyMSG.append("Min Players:&nbsp;<font color=\"00FF00\">" + TvT.getMinPlayers() + "</font><br>");
-		replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + TvT.getMaxPlayers() + "</font><br><br>");
-		replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + TvT.getJoinTime() + "</font><br>");
-		replyMSG.append("Event Timer:&nbsp;<font color=\"00FF00\">" + TvT.getEventTime() + "</font><br><br>");
-		replyMSG.append("Interval Time:&nbsp;<font color=\"00FF00\">" + TvT.getIntervalBetweenMatches() + "</font><br><br>");
-		replyMSG.append("Current teams:<br1>");
-		replyMSG.append("<center><table border=\"0\">");
-		for (String team : TvT._teams)
-		{
-			replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font>");
-			if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-			{
-				replyMSG.append("&nbsp;(" + TvT.teamPlayersCount(team) + " joined)");
-			}
-			else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				if (TvT.isTeleport() || TvT.isStarted())
-				{
-					replyMSG.append("&nbsp;(" + TvT.teamPlayersCount(team) + " in)");
-				}
-			}
-			
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(TvT._teamColors.get(TvT._teams.indexOf(team)));
-			replyMSG.append("</td></tr><tr><td>");
-			replyMSG.append(TvT._teamsX.get(TvT._teams.indexOf(team)) + ", " + TvT._teamsY.get(TvT._teams.indexOf(team)) + ", " + TvT._teamsZ.get(TvT._teams.indexOf(team)));
-			replyMSG.append("</td></tr><tr><td width=\"60\"><button value=\"Remove\" action=\"bypass -h admin_tvt_team_remove " + team + "\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");
-		}
-		
-		replyMSG.append("</table></center>");
-		
-		if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			if (!TvT.isStarted())
-			{
-				replyMSG.append("<br1>");
-				replyMSG.append(TvT._playersShuffle.size() + " players participating. Waiting to shuffle in teams(done on teleport)!");
-				replyMSG.append("<br><br>");
-			}
-		}
-		
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminVIPEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminVIPEngine.java
deleted file mode 100644
index 13c1d5e2c5..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminVIPEngine.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.admincommandhandlers;
-
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-public class AdminVIPEngine implements IAdminCommandHandler
-{
-	private static String[] ADMIN_COMMANDS =
-	{
-		"admin_vip",
-		"admin_vip_setteam",
-		"admin_vip_randomteam",
-		"admin_vip_settime",
-		"admin_vip_endnpc",
-		"admin_vip_setdelay",
-		"admin_vip_joininit",
-		"admin_vip_joinnpc",
-		"admin_vip_joinlocxyz",
-		"admin_vip_setarea",
-		"admin_vip_vipreward",
-		"admin_vip_viprewardamount",
-		"admin_vip_thevipreward",
-		"admin_vip_theviprewardamount",
-		"admin_vip_notvipreward",
-		"admin_vip_notviprewardamount",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_vip"))
-		{
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_setteam "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_setteam <team>");
-				return false;
-			}
-			
-			VIP.setTeam(params[1], activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_randomteam"))
-		{
-			if (VIP._started || VIP._joining)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			VIP.setRandomTeam(activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_settime "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_settime <time>");
-				return false;
-			}
-			
-			VIP._time = Integer.parseInt(params[1]) * 60 * 1000;
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_endnpc "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_endnpc <npc>");
-				return false;
-			}
-			
-			VIP.endNPC(Integer.parseInt(params[1]), activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joinnpc "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_joinnpc <npc>");
-				return false;
-			}
-			
-			VIP.joinNPC(Integer.parseInt(params[1]), activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_setdelay "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_setdelay <time>");
-				return false;
-			}
-			
-			VIP._delay = Integer.parseInt(params[1]) * 60 * 1000;
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joininit"))
-		{
-			VIP.startJoin(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joinlocxyz "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 4)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_joinlocxyz <x> <y> <z>");
-				return false;
-			}
-			
-			VIP.setJoinLOC(params[1], params[2], params[3]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_joinnpc "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_joinnpc <npc>");
-				return false;
-			}
-			
-			VIP.joinNPC(Integer.parseInt(params[1]), activeChar);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_setarea "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_setarea <Area>");
-				return false;
-			}
-			VIP._joinArea = params[1];
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_vipreward "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_vipreward <id>");
-				return false;
-			}
-			
-			VIP._vipReward = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_viprewardamount "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_viprewardamount <amount>");
-				return false;
-			}
-			
-			VIP._vipRewardAmount = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_notvipreward "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_notvipreward <id>");
-				return false;
-			}
-			
-			VIP._notVipReward = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_notviprewardamount "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_notviprewardamount <amount>");
-				return false;
-			}
-			
-			VIP._notVipRewardAmount = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_thevipreward "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_thevipreward <id>");
-				return false;
-			}
-			
-			VIP._theVipReward = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		else if (command.startsWith("admin_vip_theviprewardamount "))
-		{
-			if (VIP._inProgress)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Cannot change variables when event has already started");
-				return false;
-			}
-			
-			String[] params;
-			params = command.split(" ");
-			if (params.length != 2)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Wrong usage: //vip_theviprewardamount <amount>");
-				return false;
-			}
-			
-			VIP._theVipRewardAmount = Integer.parseInt(params[1]);
-			showMainPage(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-		final StringBuilder replyMSG = new StringBuilder("<html><body>");
-		replyMSG.append("<center><font color=\"LEVEL\">[VIP Engine]</font></center><br><br><br>");
-		replyMSG.append("<table><tr><td><edit var=\"input1\" width=\"50\"></td><td><edit var=\"input2\" width=\"50\"></td><td><edit var=\"input3\" width\"50\"></td></tr></table>");
-		replyMSG.append("<table border=\"0\"><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Team\" action=\"bypass -h admin_vip_setteam $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Random Team\" action=\"bypass -h admin_vip_randomteam\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Time\" action=\"bypass -h admin_vip_settime $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Delay\" action=\"bypass -h admin_vip_setdelay $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Set Area\" action=\"bypass -h admin_vip_setarea $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"End NPC\" action=\"bypass -h admin_vip_endnpc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join NPC\" action=\"bypass -h admin_vip_joinnpc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Join LOC\" action=\"bypass -h admin_vip_joinlocxyz $input1 $input2 $input3\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"VIP Reward\" action=\"bypass -h admin_vip_vipreward $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"VIP Reward Am\" action=\"bypass -h admin_vip_viprewardamount $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Not VIP Reward\" action=\"bypass -h admin_vip_notvipreward $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"Not VIP Reward Am\" action=\"bypass -h admin_vip_notviprewardamount $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"The VIP Reward\" action=\"bypass -h admin_vip_thevipreward $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td width=\"100\"><button value=\"The VIP Reward Am\" action=\"bypass -h admin_vip_theviprewardamount $input1\" width=130 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr><tr>");
-		
-		replyMSG.append("</tr></table><br><table><tr>");
-		replyMSG.append("<td width=\"100\"><button value=\"Start Join\" action=\"bypass -h admin_vip_joininit\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("</tr></table><br><br>");
-		
-		replyMSG.append("<font color=\"LEVEL\">VIP Settings...</font><br1>");
-		replyMSG.append("Team:&nbsp;<font color=\"FFFFFF\">" + VIP._teamName + "</font><br>");
-		replyMSG.append("Delay:&nbsp;<font color=\"FFFFFF\">" + (VIP._delay / 1000 / 60) + "</font><br1>");
-		replyMSG.append("Time:&nbsp;<font color=\"FFFFFF\">" + (VIP._time / 1000 / 60) + "</font><br>");
-		replyMSG.append("End NPC ID:&nbsp;<font color=\"FFFFFF\">" + VIP._endNPC + " (" + VIP.getNPCName(VIP._endNPC, activeChar) + ")</font><br1>");
-		replyMSG.append("Join NPC ID:&nbsp;<font color=\"FFFFFF\">" + VIP._joinNPC + " (" + VIP.getNPCName(VIP._joinNPC, activeChar) + ")</font><br>");
-		replyMSG.append("Start Location:&nbsp;<font color=\"FFFFFF\">" + VIP._startX + "," + VIP._startY + "," + VIP._startZ + "</font><br1>");
-		replyMSG.append("End Location:&nbsp;<font color=\"FFFFFF\">" + VIP._endX + "," + VIP._endY + "," + VIP._endZ + "</font><br1>");
-		replyMSG.append("Join Location:&nbsp;<font color=\"FFFFFF\">" + VIP._joinX + "," + VIP._joinY + "," + VIP._joinZ + "</font><br>");
-		replyMSG.append("VIP Team Reward:&nbsp;<font color=\"FFFFFF\">" + VIP.getItemName(VIP._vipReward, activeChar) + " (" + VIP._vipRewardAmount + ")</font><br1>");
-		replyMSG.append("Not VIP Team Reward:&nbsp;<font color=\"FFFFFF\">" + VIP.getItemName(VIP._notVipReward, activeChar) + " (" + VIP._notVipRewardAmount + ")</font><br1>");
-		replyMSG.append("VIP Reward:&nbsp;<font color=\"FFFFFF\">" + VIP.getItemName(VIP._theVipReward, activeChar) + " (" + VIP._theVipRewardAmount + ")</font><br>");
-		replyMSG.append("</body></html>");
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
index 4d3df7fe1d..ac0fc79291 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
@@ -28,10 +28,6 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.handler.IItemHandler;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Effect.EffectType;
 import org.l2jmobius.gameserver.model.Skill;
@@ -41,7 +37,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 public class Potions implements IItemHandler
@@ -49,17 +44,17 @@ public class Potions implements IItemHandler
 	protected static final Logger LOGGER = Logger.getLogger(Potions.class.getName());
 	private int _herbstask = 0;
 	
-	private static final Map<Integer, PotionsSkills> POTIONS = new HashMap<>();
+	private static final Map<Integer, PotionSkill> POTIONS = new HashMap<>();
 	
 	private static void loadPotions()
 	{
-		for (PotionsSkills potionSkill : PotionsSkills.values())
+		for (PotionSkill potionSkill : PotionSkill.values())
 		{
 			POTIONS.put(potionSkill.potionId, potionSkill);
 		}
 	}
 	
-	public static PotionsSkills getSkillsForPotion(Integer potionId)
+	public static PotionSkill getSkillsForPotion(Integer potionId)
 	{
 		if (POTIONS.isEmpty())
 		{
@@ -76,7 +71,7 @@ public class Potions implements IItemHandler
 		}
 		
 		final List<Integer> outputPotions = new ArrayList<>();
-		for (Entry<Integer, PotionsSkills> entry : POTIONS.entrySet())
+		for (Entry<Integer, PotionSkill> entry : POTIONS.entrySet())
 		{
 			Map<Integer, Integer> itemSkills = null;
 			if (entry.getValue() != null)
@@ -208,30 +203,6 @@ public class Potions implements IItemHandler
 		{
 			PlayerInstance activeChar;
 			activeChar = (PlayerInstance) playable;
-			if (activeChar._inEventTvT && TvT.isStarted() && !Config.TVT_ALLOW_POTIONS)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
-			if (activeChar._inEventDM && DM.hasStarted() && !Config.DM_ALLOW_POTIONS)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
-			if (activeChar._inEventCTF && CTF.isStarted() && !Config.CTF_ALLOW_POTIONS)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
-			if (activeChar._inEventVIP && VIP._started)
-			{
-				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
 			if (activeChar.isInOlympiadMode())
 			{
 				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
@@ -897,7 +868,7 @@ public class Potions implements IItemHandler
 		}
 	}
 	
-	enum PotionsSkills
+	enum PotionSkill
 	{
 		mana_drug(726, 2003, 1),
 		mana_potion(728, 2005, 1),
@@ -1003,13 +974,13 @@ public class Potions implements IItemHandler
 		public Integer potionId;
 		public Map<Integer, Integer> skills = new HashMap<>();
 		
-		private PotionsSkills(int potionItem, int skillIdentifier, int skillLevel)
+		private PotionSkill(int potionItem, int skillIdentifier, int skillLevel)
 		{
 			skills.put(skillIdentifier, skillLevel);
 			potionId = potionItem;
 		}
 		
-		private PotionsSkills(int potionItem, Integer[] skillIdentifiers, Integer[] skillLevels)
+		private PotionSkill(int potionItem, Integer[] skillIdentifiers, Integer[] skillLevels)
 		{
 			for (int i = 0; i < skillIdentifiers.length; i++)
 			{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
index 81d6238c3a..bdc2c28a83 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
@@ -25,10 +25,6 @@ import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -101,27 +97,9 @@ public class ScrollOfEscape implements IItemHandler
 			return;
 		}
 		
-		if (player._inEventTvT && TvT.isStarted())
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You can't use Scroll of Escape in TvT.");
-			return;
-		}
-		
-		if (player._inEventDM && DM.hasStarted())
-		{
-			player.sendMessage("You can't use Scroll of Escape in DM.");
-			return;
-		}
-		
-		if (player._inEventCTF && CTF.isStarted())
-		{
-			player.sendMessage("You can't use Scroll of Escape in CTF.");
-			return;
-		}
-		
-		if (player._inEventVIP && VIP._started)
-		{
-			player.sendMessage("You can't use Scroll of Escape in VIP.");
+			player.sendMessage("You can't use Scroll of Escape in an event.");
 			return;
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
index 2654cba726..1973c190a0 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
@@ -16,16 +16,12 @@
  */
 package org.l2jmobius.gameserver.handler.itemhandlers;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.NpcTable;
 import org.l2jmobius.gameserver.data.xml.SummonItemData;
 import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.SummonItem;
 import org.l2jmobius.gameserver.model.World;
@@ -61,24 +57,9 @@ public class SummonItems implements IItemHandler
 			return;
 		}
 		
-		if (player._inEventTvT && TvT.isStarted() && !Config.TVT_ALLOW_SUMMON)
+		if (player.isOnCustomEvent())
 		{
-			final ActionFailed af = ActionFailed.STATIC_PACKET;
-			player.sendPacket(af);
-			return;
-		}
-		
-		if (player._inEventDM && DM.hasStarted() && !Config.DM_ALLOW_SUMMON)
-		{
-			final ActionFailed af = ActionFailed.STATIC_PACKET;
-			player.sendPacket(af);
-			return;
-		}
-		
-		if (player._inEventCTF && CTF.isStarted() && !Config.CTF_ALLOW_SUMMON)
-		{
-			final ActionFailed af = ActionFailed.STATIC_PACKET;
-			player.sendPacket(af);
+			playable.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
 		
@@ -126,13 +107,13 @@ public class SummonItems implements IItemHandler
 			return;
 		}
 		
-		final int npcID = sitem.getNpcId();
-		if (npcID == 0)
+		final int npcId = sitem.getNpcId();
+		if (npcId == 0)
 		{
 			return;
 		}
 		
-		final NpcTemplate npcTemplate = NpcTable.getInstance().getTemplate(npcID);
+		final NpcTemplate npcTemplate = NpcTable.getInstance().getTemplate(npcId);
 		if (npcTemplate == null)
 		{
 			return;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
index 540868ce4a..019c6803fe 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
@@ -53,7 +53,7 @@ public class ClanGate implements ISkillHandler
 			return;
 		}
 		
-		if (player.isInFunEvent() || player.isInsideZone(ZoneId.NO_LANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null))
+		if (player.isOnCustomEvent() || player.isInsideZone(ZoneId.NO_LANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null))
 		{
 			player.sendMessage("Cannot open the portal here.");
 			return;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
index cdea868c37..160d305883 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
@@ -21,10 +21,6 @@ import java.util.List;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.handler.ISkillHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -92,9 +88,9 @@ public class Recall implements ISkillHandler
 						continue;
 					}
 					
-					if ((targetChar._inEventCTF && CTF.isStarted()) || (targetChar._inEventTvT && TvT.isStarted()) || (targetChar._inEventDM && DM.hasStarted()) || (targetChar._inEventVIP && VIP._started))
+					if (targetChar.isOnCustomEvent())
 					{
-						targetChar.sendMessage("You can't use escape skill in Event.");
+						targetChar.sendMessage("You can't use escape skill in an event.");
 						continue;
 					}
 					
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
index cb606476c1..0df83e6dec 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
@@ -20,10 +20,6 @@ import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ISkillHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -62,31 +58,7 @@ public class SummonFriend implements ISkillHandler
 			return;
 		}
 		
-		if (activePlayer._inEvent)
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventCTF && CTF.isStarted())
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventDM && DM.hasStarted())
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventTvT && TvT.isStarted())
-		{
-			activePlayer.sendMessage("You cannot use this skill in an Event.");
-			return;
-		}
-		
-		if (activePlayer._inEventVIP && VIP._started)
+		if (activePlayer.isOnCustomEvent())
 		{
 			activePlayer.sendMessage("You cannot use this skill in an Event.");
 			return;
@@ -143,32 +115,6 @@ public class SummonFriend implements ISkillHandler
 						continue;
 					}
 					
-					if (targetPlayer._inEvent)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventCTF)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventDM)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventTvT)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					if (targetPlayer._inEventVIP)
-					{
-						targetPlayer.sendMessage("You cannot use this skill in an Event.");
-						return;
-					}
-					
 					if (targetPlayer.isInStoreMode())
 					{
 						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
index 6ae8789803..1bd27fe082 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
@@ -22,10 +22,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
@@ -51,31 +47,10 @@ public class Escape implements IUserCommandHandler
 			return false;
 		}
 		
-		// Check to see if the current player is in TVT Event.
-		if (player._inEventTvT && TvT.isStarted())
+		// Check to see if the current player is in an event.
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You may not use an escape skill in TvT.");
-			return false;
-		}
-		
-		// Check to see if the current player is in CTF Event.
-		if (player._inEventCTF && CTF.isStarted())
-		{
-			player.sendMessage("You may not use an escape skill in CTF.");
-			return false;
-		}
-		
-		// Check to see if the current player is in DM Event.
-		if (player._inEventDM && DM.hasStarted())
-		{
-			player.sendMessage("You may not use an escape skill in DM.");
-			return false;
-		}
-		
-		// Check to see if the current player is in Vip Event.
-		if (player._inEventVIP && VIP._started)
-		{
-			player.sendMessage("You may not use an escape skill in VIP.");
+			player.sendMessage("You may not use an escape skill in an event.");
 			return false;
 		}
 		
@@ -93,13 +68,6 @@ public class Escape implements IUserCommandHandler
 			return false;
 		}
 		
-		// Check to see if the current player is in fun event.
-		if (player.isInFunEvent())
-		{
-			player.sendMessage("You may not escape from an event.");
-			return false;
-		}
-		
 		// Check to see if the current player is in Observer Mode.
 		if (player.inObserverMode())
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
index d0d9aa68b9..642f015a5c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
@@ -57,9 +57,9 @@ public class OfflineShop implements IUserCommandHandler
 			return false;
 		}
 		
-		if (player.isInFunEvent() && !player.isGM())
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You cannot Logout while in registered in an Event.");
+			player.sendMessage("You cannot logout while registered in an event.");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
@@ -105,12 +105,6 @@ public class OfflineShop implements IUserCommandHandler
 			return false;
 		}
 		
-		if (player.atEvent)
-		{
-			player.sendPacket(SystemMessage.sendString("A superior power doesn't allow you to leave the event."));
-			return false;
-		}
-		
 		if (player.isInOlympiadMode() || Olympiad.getInstance().isRegistered(player))
 		{
 			player.sendMessage("You can't Logout in Olympiad mode.");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java
deleted file mode 100644
index 604aad9b4e..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class CTFCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"ctfjoin",
-		"ctfleave",
-		"ctfinfo"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		if (command.startsWith("ctfjoin"))
-		{
-			JoinCTF(activeChar);
-		}
-		else if (command.startsWith("ctfleave"))
-		{
-			LeaveCTF(activeChar);
-		}
-		
-		else if (command.startsWith("ctfinfo"))
-		{
-			CTFinfo(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	public boolean JoinCTF(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!CTF.isJoining())
-		{
-			activeChar.sendMessage("There is no CTF Event in progress.");
-			return false;
-		}
-		else if (CTF.isJoining() && activeChar._inEventCTF)
-		{
-			activeChar.sendMessage("You are already registered.");
-			return false;
-		}
-		else if (activeChar.isCursedWeaponEquipped())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are holding a Cursed Weapon.");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
-			return false;
-		}
-		else if (activeChar.getLevel() < CTF.getMinLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
-			return false;
-		}
-		else if (activeChar.getLevel() > CTF.getMaxLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
-			return false;
-		}
-		else if (activeChar.getKarma() > 0)
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you have Karma.");
-			return false;
-		}
-		else if (CTF.isTeleport() || CTF.isStarted())
-		{
-			activeChar.sendMessage("CTF Event registration period is over. You can't register now.");
-			return false;
-		}
-		else
-		{
-			activeChar.sendMessage("Your participation in the CTF event has been approved.");
-			CTF.addPlayer(activeChar, "");
-			return true;
-		}
-	}
-	
-	public boolean LeaveCTF(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!CTF.isJoining())
-		{
-			activeChar.sendMessage("There is no CTF Event in progress.");
-			return false;
-		}
-		else if ((CTF.isTeleport() || CTF.isStarted()) && activeChar._inEventCTF)
-		{
-			activeChar.sendMessage("You can not leave now because CTF event has started.");
-			return false;
-		}
-		else if (CTF.isJoining() && !activeChar._inEventCTF)
-		{
-			activeChar.sendMessage("You aren't registered in the CTF Event.");
-			return false;
-		}
-		else
-		{
-			CTF.removePlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean CTFinfo(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!CTF.isJoining())
-		{
-			activeChar.sendMessage("There is no CTF Event in progress.");
-			return false;
-		}
-		else if (CTF.isTeleport() || CTF.isStarted())
-		{
-			activeChar.sendMessage("I can't provide you this info. Command available only in joining period.");
-			return false;
-		}
-		else
-		{
-			if (CTF._playersShuffle.size() == 1)
-			{
-				activeChar.sendMessage("There is " + CTF._playersShuffle.size() + " player participating in this event.");
-				activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + CTF.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLevel() + ".");
-			}
-			else
-			{
-				activeChar.sendMessage("There are " + CTF._playersShuffle.size() + " players participating in this event.");
-				activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + CTF.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLevel() + ".");
-			}
-			return true;
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java
deleted file mode 100644
index 1c87c822d2..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class DMCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"dmjoin",
-		"dmleave",
-		"dminfo"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		if (command.startsWith("dmjoin"))
-		{
-			JoinDM(activeChar);
-		}
-		else if (command.startsWith("dmleave"))
-		{
-			LeaveDM(activeChar);
-		}
-		
-		else if (command.startsWith("dminfo"))
-		{
-			DMinfo(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	public boolean JoinDM(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!DM.isJoining())
-		{
-			activeChar.sendMessage("There is no DeathMatch Event in progress.");
-			return false;
-		}
-		else if (DM.isJoining() && activeChar._inEventDM)
-		{
-			activeChar.sendMessage("You are already registered.");
-			return false;
-		}
-		else if (activeChar.isCursedWeaponEquipped())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are holding a Cursed Weapon.");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
-			return false;
-		}
-		else if (activeChar.getLevel() < DM.getMinLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
-			return false;
-		}
-		else if (activeChar.getLevel() > DM.getMaxLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
-			return false;
-		}
-		else if (activeChar.getKarma() > 0)
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you have Karma.");
-			return false;
-		}
-		else if (DM.isTeleport() || DM.hasStarted())
-		{
-			activeChar.sendMessage("DeathMatch Event registration period is over. You can't register now.");
-			return false;
-		}
-		else
-		{
-			activeChar.sendMessage("Your participation in the DeathMatch event has been approved.");
-			DM.addPlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean LeaveDM(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!DM.isJoining())
-		{
-			activeChar.sendMessage("There is no DeathMatch Event in progress.");
-			return false;
-		}
-		else if ((DM.isTeleport() || DM.hasStarted()) && activeChar._inEventDM)
-		{
-			activeChar.sendMessage("You can not leave now because DeathMatch event has started.");
-			return false;
-		}
-		else if (DM.isJoining() && !activeChar._inEventDM)
-		{
-			activeChar.sendMessage("You aren't registered in the DeathMatch Event.");
-			return false;
-		}
-		else
-		{
-			DM.removePlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean DMinfo(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!DM.isJoining())
-		{
-			activeChar.sendMessage("There is no DeathMatch Event in progress.");
-			return false;
-		}
-		else if (DM.isTeleport() || DM.hasStarted())
-		{
-			activeChar.sendMessage("I can't provide you this info. Command available only in joining period.");
-			return false;
-		}
-		else
-		{
-			if (DM._players.size() == 1)
-			{
-				activeChar.sendMessage("There is " + DM._players.size() + " player participating in this event.");
-				activeChar.sendMessage("Reward: " + DM.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(DM.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + DM.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + DM.getMaxLevel() + ".");
-			}
-			else
-			{
-				activeChar.sendMessage("There are " + DM._players.size() + " players participating in this event.");
-				activeChar.sendMessage("Reward: " + DM.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(DM.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + DM.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + DM.getMaxLevel() + ".");
-			}
-			return true;
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java
deleted file mode 100644
index f65fb8df31..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-
-public class FarmPvpCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"farm1",
-		"farm2",
-		"pvp1",
-		"pvp2"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		int placex;
-		int placey;
-		int placez;
-		String message;
-		if (command.equalsIgnoreCase("farm1") && Config.ALLOW_FARM1_COMMAND)
-		{
-			placex = Config.FARM1_X;
-			placey = Config.FARM1_Y;
-			placez = Config.FARM1_Z;
-			message = Config.FARM1_CUSTOM_MESSAGE;
-		}
-		else if (command.equalsIgnoreCase("farm2") && Config.ALLOW_FARM2_COMMAND)
-		{
-			placex = Config.FARM2_X;
-			placey = Config.FARM2_Y;
-			placez = Config.FARM2_Z;
-			message = Config.FARM2_CUSTOM_MESSAGE;
-		}
-		else if (command.equalsIgnoreCase("pvp1") && Config.ALLOW_PVP1_COMMAND)
-		{
-			placex = Config.PVP1_X;
-			placey = Config.PVP1_Y;
-			placez = Config.PVP1_Z;
-			message = Config.PVP1_CUSTOM_MESSAGE;
-		}
-		else if (command.equalsIgnoreCase("pvp2") && Config.ALLOW_PVP2_COMMAND)
-		{
-			placex = Config.PVP2_X;
-			placey = Config.PVP2_Y;
-			placez = Config.PVP2_Z;
-			message = Config.PVP2_CUSTOM_MESSAGE;
-		}
-		else
-		{
-			return false;
-		}
-		
-		if (activeChar.isInJail())
-		{
-			activeChar.sendMessage("Sorry, you are in Jail!");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("Sorry, you are in the Olympiad now.");
-			return false;
-		}
-		else if (activeChar.isInFunEvent())
-		{
-			activeChar.sendMessage("Sorry, you are in an event.");
-			return false;
-		}
-		else if (activeChar.isInDuel())
-		{
-			activeChar.sendMessage("Sorry, you are in a duel!");
-			return false;
-		}
-		else if (activeChar.inObserverMode())
-		{
-			activeChar.sendMessage("Sorry, you are in the observation mode.");
-			return false;
-		}
-		else if (activeChar.isFestivalParticipant())
-		{
-			activeChar.sendMessage("Sorry, you are in a festival.");
-			return false;
-		}
-		else if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_GK && (activeChar.getKarma() > 0))
-		{
-			activeChar.sendMessage("Sorry, you are PK");
-			return false;
-		}
-		else if (Olympiad.getInstance().isRegistered(activeChar))
-		{
-			activeChar.sendMessage("Sorry, you can't use this command while registered in Olympiad");
-			return false;
-		}
-		activeChar.sendPacket(new SetupGauge(SetupGauge.BLUE, 15000));
-		activeChar.setImmobilized(true);
-		
-		ThreadPool.schedule(new teleportTask(activeChar, placex, placey, placez, message), 15000);
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	class teleportTask implements Runnable
-	{
-		private final PlayerInstance _player;
-		private final int _x;
-		private final int _y;
-		private final int _z;
-		private final String _message;
-		
-		teleportTask(PlayerInstance activeChar, int x, int y, int z, String message)
-		{
-			_player = activeChar;
-			_x = x;
-			_y = y;
-			_z = z;
-			_message = message;
-		}
-		
-		@Override
-		public void run()
-		{
-			if (_player == null)
-			{
-				return;
-			}
-			
-			_player.teleToLocation(_x, _y, _z);
-			_player.sendMessage(_message);
-			_player.setImmobilized(false);
-		}
-	}
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
index 8fd38829bd..c45a71203b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
@@ -58,9 +58,9 @@ public class OfflineShop implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (player.isInFunEvent() && !player.isGM())
+		if (player.isOnCustomEvent())
 		{
-			player.sendMessage("You cannot Logout while in registered in an Event.");
+			player.sendMessage("You cannot Logout while registered in an event.");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
@@ -106,12 +106,6 @@ public class OfflineShop implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (player.atEvent)
-		{
-			player.sendPacket(SystemMessage.sendString("A superior power doesn't allow you to leave the event."));
-			return false;
-		}
-		
 		if (player.isInOlympiadMode() || Olympiad.getInstance().isRegistered(player))
 		{
 			player.sendMessage("You can't Logout in Olympiad mode.");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java
index 8100a3eaed..5d680d5d09 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java
@@ -139,12 +139,10 @@ public class StatsCmd implements IVoicedCommandHandler
 					final StringBuilder replyMSG = new StringBuilder("<html><body>");
 					replyMSG.append("<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>");
 					replyMSG.append("<br>Statistics for player <font color=\"LEVEL\">" + targetp.getName() + "</font><br>");
-					replyMSG.append("Total kills <font color=\"FF0000\">" + targetp.kills.size() + "</font><br>");
+					replyMSG.append("Total kills <font color=\"FF0000\">" + (targetp.getPvpKills() + targetp.getPkKills()) + "</font><br>");
 					replyMSG.append("<br>Detailed list:<br>");
-					for (String kill : targetp.kills)
-					{
-						replyMSG.append("<font color=\"FF0000\">" + kill + "</font><br>");
-					}
+					replyMSG.append("<font color=\"FF0000\">PvP Kills: " + targetp.getPvpKills() + "</font><br>");
+					replyMSG.append("<font color=\"FF0000\">PK Kills: " + targetp.getPkKills() + "</font><br>");
 					replyMSG.append("</body></html>");
 					adminReply.setHtml(replyMSG.toString());
 					activeChar.sendPacket(adminReply);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java
deleted file mode 100644
index fcd90ff7bf..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.handler.voicedcommandhandlers;
-
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class TvTCmd implements IVoicedCommandHandler
-{
-	private static final String[] VOICED_COMMANDS =
-	{
-		"tvtjoin",
-		"tvtleave",
-		"tvtinfo"
-	};
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
-	{
-		if (command.startsWith("tvtjoin"))
-		{
-			JoinTvT(activeChar);
-		}
-		else if (command.startsWith("tvtleave"))
-		{
-			LeaveTvT(activeChar);
-		}
-		
-		else if (command.startsWith("tvtinfo"))
-		{
-			TvTinfo(activeChar);
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	public boolean JoinTvT(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!TvT.isJoining())
-		{
-			activeChar.sendMessage("There is no TvT Event in progress.");
-			return false;
-		}
-		else if (TvT.isJoining() && activeChar._inEventTvT)
-		{
-			activeChar.sendMessage("You are already registered.");
-			return false;
-		}
-		else if (activeChar.isCursedWeaponEquipped())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are holding a Cursed Weapon.");
-			return false;
-		}
-		else if (activeChar.isInOlympiadMode())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
-			return false;
-		}
-		else if (activeChar.getLevel() < TvT.getMinLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
-			return false;
-		}
-		else if (activeChar.getLevel() > TvT.getMaxLevel())
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
-			return false;
-		}
-		else if (activeChar.getKarma() > 0)
-		{
-			activeChar.sendMessage("You are not allowed to participate to the event because you have Karma.");
-			return false;
-		}
-		else if (TvT.isTeleport() || TvT.isStarted())
-		{
-			activeChar.sendMessage("TvT Event registration period is over. You can't register now.");
-			return false;
-		}
-		else
-		{
-			activeChar.sendMessage("Your participation in the TvT event has been approved.");
-			TvT.addPlayer(activeChar, "");
-			return false;
-		}
-	}
-	
-	public boolean LeaveTvT(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!TvT.isJoining())
-		{
-			activeChar.sendMessage("There is no TvT Event in progress.");
-			return false;
-		}
-		else if ((TvT.isTeleport() || TvT.isStarted()) && activeChar._inEventTvT)
-		{
-			activeChar.sendMessage("You can not leave now because TvT event has started.");
-			return false;
-		}
-		else if (TvT.isJoining() && !activeChar._inEventTvT)
-		{
-			activeChar.sendMessage("You aren't registered in the TvT Event.");
-			return false;
-		}
-		else
-		{
-			TvT.removePlayer(activeChar);
-			return true;
-		}
-	}
-	
-	public boolean TvTinfo(PlayerInstance activeChar)
-	{
-		if (activeChar == null)
-		{
-			return false;
-		}
-		
-		if (!TvT.isJoining())
-		{
-			activeChar.sendMessage("There is no TvT Event in progress.");
-			return false;
-		}
-		else if (TvT.isTeleport() || TvT.isStarted())
-		{
-			activeChar.sendMessage("I can't provide you this info. Command available only in joining period.");
-			return false;
-		}
-		else
-		{
-			if (TvT._playersShuffle.size() == 1)
-			{
-				activeChar.sendMessage("There is " + TvT._playersShuffle.size() + " player participating in this event.");
-				activeChar.sendMessage("Reward: " + TvT.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(TvT.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + TvT.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + TvT.getMaxLevel() + ".");
-			}
-			else
-			{
-				activeChar.sendMessage("There are " + TvT._playersShuffle.size() + " players participating in this event.");
-				activeChar.sendMessage("Reward: " + TvT.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(TvT.getRewardId()).getName() + " !");
-				activeChar.sendMessage("Player Min lvl: " + TvT.getMinLevel() + ".");
-				activeChar.sendMessage("Player Max lvl: " + TvT.getMaxLevel() + ".");
-			}
-			return true;
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
index 9202862006..25ed20636e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
@@ -26,10 +26,6 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.CoupleManager;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -56,9 +52,9 @@ public class Wedding implements IVoicedCommandHandler
 	@Override
 	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
 	{
-		if (activeChar.isInFunEvent() || activeChar.isInOlympiadMode())
+		if (activeChar.isRegisteredOnCustomEvent() || activeChar.isInOlympiadMode())
 		{
-			activeChar.sendMessage("Sorry, you are in an event now.");
+			activeChar.sendMessage("Sorry, you have registered in an event.");
 			return false;
 		}
 		
@@ -230,10 +226,10 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		// Check to see if the current player is in fun event.
-		if (activeChar.isInFunEvent())
+		// Check to see if the current player is in an event.
+		if (activeChar.isOnCustomEvent())
 		{
-			activeChar.sendMessage("You're partener is in a Fun Event.");
+			activeChar.sendMessage("You are in an event.");
 			return false;
 		}
 		
@@ -267,7 +263,7 @@ public class Wedding implements IVoicedCommandHandler
 			activeChar.sendMessage("Your partner is in the Olympiad now.");
 			return false;
 		}
-		else if (partner.atEvent)
+		else if (partner.isOnCustomEvent())
 		{
 			activeChar.sendMessage("Your partner is in an event.");
 			return false;
@@ -312,31 +308,6 @@ public class Wedding implements IVoicedCommandHandler
 			activeChar.sendMessage("You are in the Olympiad now.");
 			return false;
 		}
-		else if (activeChar.atEvent)
-		{
-			activeChar.sendMessage("You are in an event.");
-			return false;
-		}
-		if (activeChar._inEventTvT && TvT.isStarted())
-		{
-			activeChar.sendMessage("You may not use go to love in TvT.");
-			return false;
-		}
-		if (activeChar._inEventCTF && CTF.isStarted())
-		{
-			activeChar.sendMessage("You may not use go to love in CTF.");
-			return false;
-		}
-		if (activeChar._inEventDM && DM.hasStarted())
-		{
-			activeChar.sendMessage("You may not use go to love in DM.");
-			return false;
-		}
-		if (activeChar._inEventVIP && VIP._started)
-		{
-			activeChar.sendMessage("You may not use go to love in VIP.");
-			return false;
-		}
 		else if (activeChar.isInDuel())
 		{
 			activeChar.sendMessage("You are in a duel!");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
index 809421a002..e7a30f5242 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
@@ -156,7 +156,7 @@ public class PrecautionaryRestartManager
 				return true;
 			}
 			
-			if (player._inEvent || player.atEvent)
+			if (player.isOnCustomEvent())
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java
deleted file mode 100644
index b158d0b211..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java
+++ /dev/null
@@ -1,3287 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SkillTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.Radar;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
-import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.ItemList;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.RadarControl;
-import org.l2jmobius.gameserver.network.serverpackets.Ride;
-import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
-
-public class CTF implements EventTask
-{
-	protected static final Logger LOGGER = Logger.getLogger(CTF.class.getName());
-	
-	protected static String _eventName = "";
-	protected static String _eventDesc = "";
-	protected static String _joiningLocationName = "";
-	private static Spawn _npcSpawn;
-	protected static boolean _joining = false;
-	protected static boolean _teleport = false;
-	protected static boolean _started = false;
-	protected static boolean _aborted = false;
-	protected static boolean _sitForced = false;
-	protected static boolean _inProgress = false;
-	protected static int _npcId = 0;
-	protected static int _npcX = 0;
-	protected static int _npcY = 0;
-	protected static int _npcZ = 0;
-	protected static int _npcHeading = 0;
-	protected static int _rewardId = 0;
-	protected static int _rewardAmount = 0;
-	protected static int _minLevel = 0;
-	protected static int _maxLevel = 0;
-	protected static int _joinTime = 0;
-	protected static int _eventTime = 0;
-	protected static int _minPlayers = 0;
-	protected static int _maxPlayers = 0;
-	protected static long _intervalBetweenMatches = 0;
-	private String startEventTime;
-	protected static boolean _teamEvent = true; // TODO to be integrated
-	public static List<PlayerInstance> _players = new ArrayList<>();
-	private static String _topTeam = "";
-	public static List<PlayerInstance> _playersShuffle = new ArrayList<>();
-	public static List<String> _teams = new ArrayList<>();
-	public static List<String> _savePlayers = new ArrayList<>();
-	public static List<String> _savePlayerTeams = new ArrayList<>();
-	public static List<Integer> _teamPlayersCount = new ArrayList<>();
-	public static List<Integer> _teamColors = new ArrayList<>();
-	public static List<Integer> _teamsX = new ArrayList<>();
-	public static List<Integer> _teamsY = new ArrayList<>();
-	public static List<Integer> _teamsZ = new ArrayList<>();
-	public static List<Integer> _teamPointsCount = new ArrayList<>();
-	public static int _topScore = 0;
-	public static int _eventCenterX = 0;
-	public static int _eventCenterY = 0;
-	public static int _eventCenterZ = 0;
-	public static int _eventOffset = 0;
-	private static int _FlagNPC = 35062;
-	private static int _FLAG_IN_HAND_ITEM_ID = 6718;
-	public static List<Integer> _flagIds = new ArrayList<>();
-	public static List<Integer> _flagsX = new ArrayList<>();
-	public static List<Integer> _flagsY = new ArrayList<>();
-	public static List<Integer> _flagsZ = new ArrayList<>();
-	public static List<Spawn> _flagSpawns = new ArrayList<>();
-	public static List<Spawn> _throneSpawns = new ArrayList<>();
-	public static List<Boolean> _flagsTaken = new ArrayList<>();
-	
-	/**
-	 * Instantiates a new cTF.
-	 */
-	private CTF()
-	{
-	}
-	
-	/**
-	 * Gets the new instance.
-	 * @return the new instance
-	 */
-	public static CTF getNewInstance()
-	{
-		return new CTF();
-	}
-	
-	/**
-	 * Gets the _event name.
-	 * @return the _eventName
-	 */
-	public static String getEventName()
-	{
-		return _eventName;
-	}
-	
-	/**
-	 * Set_event name.
-	 * @param eventName the _eventName to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventName(String eventName)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventName = eventName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event desc.
-	 * @return the _eventDesc
-	 */
-	public static String getEventDesc()
-	{
-		return _eventDesc;
-	}
-	
-	/**
-	 * Set_event desc.
-	 * @param eventDesc the _eventDesc to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventDesc(String eventDesc)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventDesc = eventDesc;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _joining location name.
-	 * @return the _joiningLocationName
-	 */
-	public static String getJoiningLocationName()
-	{
-		return _joiningLocationName;
-	}
-	
-	/**
-	 * Set_joining location name.
-	 * @param joiningLocationName the _joiningLocationName to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoiningLocationName(String joiningLocationName)
-	{
-		if (!_inProgress)
-		{
-			CTF._joiningLocationName = joiningLocationName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc id.
-	 * @return the _npcId
-	 */
-	public static int getNpcId()
-	{
-		return _npcId;
-	}
-	
-	/**
-	 * Set_npc id.
-	 * @param npcId the _npcId to set
-	 * @return true, if successful
-	 */
-	public static boolean setNpcId(int npcId)
-	{
-		if (!_inProgress)
-		{
-			CTF._npcId = npcId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc location.
-	 * @return the _npc location
-	 */
-	public static Location getNpcLocation()
-	{
-		return new Location(_npcX, _npcY, _npcZ, _npcHeading);
-	}
-	
-	/**
-	 * Gets the _reward id.
-	 * @return the _rewardId
-	 */
-	public static int getRewardId()
-	{
-		return _rewardId;
-	}
-	
-	/**
-	 * Set_reward id.
-	 * @param rewardId the _rewardId to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardId(int rewardId)
-	{
-		if (!_inProgress)
-		{
-			CTF._rewardId = rewardId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _reward amount.
-	 * @return the _rewardAmount
-	 */
-	public static int getRewardAmount()
-	{
-		return _rewardAmount;
-	}
-	
-	/**
-	 * Set_reward amount.
-	 * @param rewardAmount the _rewardAmount to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardAmount(int rewardAmount)
-	{
-		if (!_inProgress)
-		{
-			CTF._rewardAmount = rewardAmount;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _minLevel.
-	 * @return the _minLevel
-	 */
-	public static int getMinLevel()
-	{
-		return _minLevel;
-	}
-	
-	/**
-	 * Set_minLevel.
-	 * @param minLevel the _minLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinLevel(int minLevel)
-	{
-		if (!_inProgress)
-		{
-			CTF._minLevel = minLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _maxLevel.
-	 * @return the _maxLevel
-	 */
-	public static int getMaxLevel()
-	{
-		return _maxLevel;
-	}
-	
-	/**
-	 * Set_maxLevel.
-	 * @param maxLevel the _maxLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxLevel(int maxLevel)
-	{
-		if (!_inProgress)
-		{
-			CTF._maxLevel = maxLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _join time.
-	 * @return the _joinTime
-	 */
-	public static int getJoinTime()
-	{
-		return _joinTime;
-	}
-	
-	/**
-	 * Set_join time.
-	 * @param joinTime the _joinTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoinTime(int joinTime)
-	{
-		if (!_inProgress)
-		{
-			CTF._joinTime = joinTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event time.
-	 * @return the _eventTime
-	 */
-	public static int getEventTime()
-	{
-		return _eventTime;
-	}
-	
-	/**
-	 * Set_event time.
-	 * @param eventTime the _eventTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventTime(int eventTime)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventTime = eventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _min players.
-	 * @return the _minPlayers
-	 */
-	public static int getMinPlayers()
-	{
-		return _minPlayers;
-	}
-	
-	/**
-	 * Set_min players.
-	 * @param minPlayers the _minPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinPlayers(int minPlayers)
-	{
-		if (!_inProgress)
-		{
-			CTF._minPlayers = minPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _max players.
-	 * @return the _maxPlayers
-	 */
-	public static int getMaxPlayers()
-	{
-		return _maxPlayers;
-	}
-	
-	/**
-	 * Set_max players.
-	 * @param maxPlayers the _maxPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxPlayers(int maxPlayers)
-	{
-		if (!_inProgress)
-		{
-			CTF._maxPlayers = maxPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _interval between matches.
-	 * @return the _intervalBetweenMatches
-	 */
-	public static long getIntervalBetweenMatches()
-	{
-		return _intervalBetweenMatches;
-	}
-	
-	/**
-	 * Set_interval between matches.
-	 * @param intervalBetweenMatches the _intervalBetweenMatches to set
-	 * @return true, if successful
-	 */
-	public static boolean setIntervalBetweenMatches(long intervalBetweenMatches)
-	{
-		if (!_inProgress)
-		{
-			CTF._intervalBetweenMatches = intervalBetweenMatches;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the start event time.
-	 * @return the startEventTime
-	 */
-	public String getStartEventTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the start event time.
-	 * @param startEventTime the startEventTime to set
-	 * @return true, if successful
-	 */
-	public boolean setStartEventTime(String startEventTime)
-	{
-		if (!_inProgress)
-		{
-			this.startEventTime = startEventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks if is _joining.
-	 * @return the _joining
-	 */
-	public static boolean isJoining()
-	{
-		return _joining;
-	}
-	
-	/**
-	 * Checks if is _teleport.
-	 * @return the _teleport
-	 */
-	public static boolean isTeleport()
-	{
-		return _teleport;
-	}
-	
-	/**
-	 * Checks if is _started.
-	 * @return the _started
-	 */
-	public static boolean isStarted()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Checks if is _aborted.
-	 * @return the _aborted
-	 */
-	public static boolean isAborted()
-	{
-		return _aborted;
-	}
-	
-	/**
-	 * Checks if is _sit forced.
-	 * @return the _sitForced
-	 */
-	public static boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	/**
-	 * Checks if is _in progress.
-	 * @return the _inProgress
-	 */
-	public static boolean isInProgress()
-	{
-		return _inProgress;
-	}
-	
-	/**
-	 * Check max level.
-	 * @param maxLevel the maxLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxLevel(int maxLevel)
-	{
-		return _minLevel < maxLevel;
-	}
-	
-	/**
-	 * Check min level.
-	 * @param minLevel the minLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMinLevel(int minLevel)
-	{
-		return _maxLevel > minLevel;
-	}
-	
-	/**
-	 * returns true if participated players is higher or equal then minimum needed players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMinPlayers(int players)
-	{
-		return _minPlayers <= players;
-	}
-	
-	/**
-	 * returns true if max players is higher or equal then participated players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxPlayers(int players)
-	{
-		return _maxPlayers > players;
-	}
-	
-	/**
-	 * Check start join ok.
-	 * @return true, if successful
-	 */
-	public static boolean checkStartJoinOk()
-	{
-		if (_started || _teleport || _joining || _eventName.equals("") || _joiningLocationName.equals("") || _eventDesc.equals("") || (_npcId == 0) || (_npcX == 0) || (_npcY == 0) || (_npcZ == 0) || (_rewardId == 0) || (_rewardAmount == 0))
-		{
-			return false;
-		}
-		
-		if (_teamEvent)
-		{
-			if (!checkStartJoinTeamInfo())
-			{
-				return false;
-			}
-		}
-		else if (!checkStartJoinPlayerInfo())
-		{
-			return false;
-		}
-		
-		if (!Config.ALLOW_EVENTS_DURING_OLY && Olympiad.getInstance().inCompPeriod())
-		{
-			return false;
-		}
-		
-		for (Castle castle : CastleManager.getInstance().getCastles())
-		{
-			if ((castle != null) && (castle.getSiege() != null) && castle.getSiege().isInProgress())
-			{
-				return false;
-			}
-		}
-		
-		if (!checkOptionalEventStartJoinOk())
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Check start join team info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinTeamInfo()
-	{
-		return (_teams.size() >= 2) && !_teamsX.contains(0) && !_teamsY.contains(0) && !_teamsZ.contains(0);
-	}
-	
-	/**
-	 * Check start join player info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinPlayerInfo()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Check auto event start join ok.
-	 * @return true, if successful
-	 */
-	protected static boolean checkAutoEventStartJoinOk()
-	{
-		return (_joinTime != 0) && (_eventTime != 0);
-	}
-	
-	/**
-	 * Check optional event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkOptionalEventStartJoinOk()
-	{
-		try
-		{
-			if (_flagsX.contains(0) || _flagsY.contains(0) || _flagsZ.contains(0) || _flagIds.contains(0))
-			{
-				return false;
-			}
-			if ((_flagsX.size() < _teams.size()) || (_flagsY.size() < _teams.size()) || (_flagsZ.size() < _teams.size()) || (_flagIds.size() < _teams.size()))
-			{
-				return false;
-			}
-		}
-		catch (ArrayIndexOutOfBoundsException e)
-		{
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Sets the npc pos.
-	 * @param player the new npc pos
-	 */
-	public static void setNpcPos(PlayerInstance player)
-	{
-		_npcX = player.getX();
-		_npcY = player.getY();
-		_npcZ = player.getZ();
-		_npcHeading = player.getHeading();
-	}
-	
-	/**
-	 * Spawn event npc.
-	 */
-	private static void spawnEventNpc()
-	{
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_npcId);
-		
-		try
-		{
-			_npcSpawn = new Spawn(tmpl);
-			_npcSpawn.setX(_npcX);
-			_npcSpawn.setY(_npcY);
-			_npcSpawn.setZ(_npcZ);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(_npcHeading);
-			_npcSpawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_npcSpawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			_npcSpawn.getLastSpawn().setTitle(_eventName);
-			_npcSpawn.getLastSpawn()._isEventMobCTF = true;
-			_npcSpawn.getLastSpawn().isAggressive();
-			_npcSpawn.getLastSpawn().decayMe();
-			_npcSpawn.getLastSpawn().spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_npcSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_npcSpawn.getLastSpawn(), _npcSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[spawnEventNpc(exception: " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Unspawn event npc.
-	 */
-	private static void unspawnEventNpc()
-	{
-		if ((_npcSpawn == null) || (_npcSpawn.getLastSpawn() == null))
-		{
-			return;
-		}
-		
-		_npcSpawn.getLastSpawn().deleteMe();
-		_npcSpawn.stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_npcSpawn, true);
-	}
-	
-	/**
-	 * Start join.
-	 * @return true, if successful
-	 */
-	public static boolean startJoin()
-	{
-		if (!checkStartJoinOk())
-		{
-			return false;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		spawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Event " + _eventName + "!");
-		if (Config.CTF_ANNOUNCE_REWARD && (ItemTable.getInstance().getTemplate(_rewardId) != null))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
-		}
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + ".");
-		if (Config.CTF_COMMAND)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Commands .ctfjoin .ctfleave .ctfinfo!");
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Start teleport.
-	 * @return true, if successful
-	 */
-	public static boolean startTeleport()
-	{
-		if (!_joining || _started || _teleport)
-		{
-			return false;
-		}
-		
-		removeOfflinePlayers();
-		
-		if (_teamEvent)
-		{
-			if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && checkMinPlayers(_playersShuffle.size()))
-			{
-				shuffleTeams();
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && !checkMinPlayers(_playersShuffle.size()))
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-				if (Config.CTF_STATS_LOGGER)
-				{
-					LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-				}
-				
-				return false;
-			}
-		}
-		else if (!checkMinPlayers(_players.size()))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _players.size());
-			if (Config.CTF_STATS_LOGGER)
-			{
-				LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _players.size());
-			}
-			return false;
-		}
-		
-		_joining = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport to team spot in 20 seconds!");
-		setUserData();
-		ThreadPool.schedule(() ->
-		{
-			sit();
-			afterTeleportOperations();
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// Remove Summon's buffs
-						if (Config.CTF_ON_START_UNSUMMON_PET && (player.getPet() != null))
-						{
-							final Summon summon = player.getPet();
-							for (Effect e1 : summon.getAllEffects())
-							{
-								if (e1 != null)
-								{
-									e1.exit(true);
-								}
-							}
-							
-							if (summon instanceof PetInstance)
-							{
-								summon.unSummon(player);
-							}
-						}
-						
-						if (Config.CTF_ON_START_REMOVE_ALL_EFFECTS)
-						{
-							for (Effect e2 : player.getAllEffects())
-							{
-								if (e2 != null)
-								{
-									e2.exit(true);
-								}
-							}
-						}
-						
-						// Remove player from his party
-						if (player.getParty() != null)
-						{
-							final Party party = player.getParty();
-							party.removePartyMember(player);
-						}
-						
-						if (_teamEvent)
-						{
-							final int offset = Config.CTF_SPAWN_OFFSET;
-							player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsY.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsZ.get(_teams.indexOf(player._teamNameCTF)));
-						}
-					}
-				}
-			}
-		}, 20000);
-		_teleport = true;
-		return true;
-	}
-	
-	/**
-	 * After teleport operations.
-	 */
-	protected static void afterTeleportOperations()
-	{
-		spawnAllFlags();
-	}
-	
-	/**
-	 * Start event.
-	 * @return true, if successful
-	 */
-	public static boolean startEvent()
-	{
-		if (!startEventOk())
-		{
-			return false;
-		}
-		
-		_teleport = false;
-		sit();
-		
-		afterStartOperations();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Started. Go Capture the Flags!");
-		_started = true;
-		return true;
-	}
-	
-	/**
-	 * After start operations.
-	 */
-	private static void afterStartOperations()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					player._teamNameHaveFlagCTF = null;
-					player._haveFlagCTF = false;
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Restarts Event checks if event was aborted. and if true cancels restart task
-	 */
-	public static synchronized void restartEvent()
-	{
-		LOGGER.info(_eventName + ": Event has been restarted...");
-		_joining = false;
-		_started = false;
-		_inProgress = false;
-		_aborted = false;
-		final long delay = _intervalBetweenMatches;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": joining period will be avaible again in " + _intervalBetweenMatches + " minute(s)!");
-		waiter(delay);
-		
-		try
-		{
-			if (!_aborted)
-			{
-				autoEvent(); // start a new event
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": next event aborted!");
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + ": Error While Trying to restart Event... " + e);
-		}
-	}
-	
-	/**
-	 * Finish event.
-	 */
-	public static void finishEvent()
-	{
-		if (!finishEventOk())
-		{
-			return;
-		}
-		
-		_started = false;
-		_aborted = false;
-		unspawnEventNpc();
-		
-		afterFinishOperations();
-		
-		if (_teamEvent)
-		{
-			processTopTeam();
-			
-			if (_topScore != 0)
-			{
-				playKneelAnimation(_topTeam);
-				
-				if (Config.CTF_ANNOUNCE_TEAM_STATS)
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + " Team Statistics:");
-					for (String team : _teams)
-					{
-						final int _flags_ = teamPointsCount(team);
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Team: " + team + " - Flags taken: " + _flags_);
-					}
-				}
-				
-				if (_topTeam != null)
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Team " + _topTeam + " wins the match, with " + _topScore + " flags taken!");
-				}
-				else
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: " + _topScore + " flags taken by each team!");
-				}
-				rewardTeam(_topTeam);
-				
-				if (Config.CTF_STATS_LOGGER)
-				{
-					LOGGER.info("**** " + _eventName + " ****");
-					LOGGER.info(_eventName + " Team Statistics:");
-					for (String team : _teams)
-					{
-						final int _flags_ = teamPointsCount(team);
-						LOGGER.info("Team: " + team + " - Flags taken: " + _flags_);
-					}
-					
-					LOGGER.info(_eventName + ": Team " + _topTeam + " wins the match, with " + _topScore + " flags taken!");
-				}
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: No team wins the match(nobody took flags)!");
-				if (Config.CTF_STATS_LOGGER)
-				{
-					LOGGER.info(_eventName + ": No team win the match(nobody took flags).");
-				}
-				
-				rewardTeam(_topTeam);
-			}
-		}
-		else
-		{
-			processTopPlayer();
-		}
-		
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish operations.
-	 */
-	private static void afterFinishOperations()
-	{
-		unspawnAllFlags();
-	}
-	
-	/**
-	 * Abort event.
-	 */
-	public static void abortEvent()
-	{
-		if (!_joining && !_teleport && !_started)
-		{
-			return;
-		}
-		
-		if (_joining && !_teleport && !_started)
-		{
-			unspawnEventNpc();
-			cleanCTF();
-			_joining = false;
-			_inProgress = false;
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-			return;
-		}
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_aborted = true;
-		unspawnEventNpc();
-		
-		afterFinish();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish.
-	 */
-	private static void afterFinish()
-	{
-		unspawnAllFlags();
-	}
-	
-	/**
-	 * Teleport finish.
-	 */
-	public static void teleportFinish()
-	{
-		sit();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport back to participation NPC in 20 seconds!");
-		ThreadPool.schedule(() ->
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						if (player.isOnline())
-						{
-							player.teleToLocation(_npcX, _npcY, _npcZ);
-						}
-						else
-						{
-							try (Connection con = DatabaseFactory.getConnection())
-							{
-								final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=? WHERE char_name=?");
-								statement.setInt(1, _npcX);
-								statement.setInt(2, _npcY);
-								statement.setInt(3, _npcZ);
-								statement.setString(4, player.getName());
-								statement.execute();
-								statement.close();
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning(e.getMessage());
-							}
-						}
-					}
-				}
-			}
-			
-			sit();
-			cleanCTF();
-		}, 20000);
-	}
-	
-	protected static class AutoEventTask implements Runnable
-	{
-		@Override
-		public void run()
-		{
-			LOGGER.info("Starting " + _eventName + "!");
-			LOGGER.info("Matchs Are Restarted At Every: " + getIntervalBetweenMatchs() + " Minutes.");
-			if (checkAutoEventStartJoinOk() && startJoin() && !_aborted)
-			{
-				if (_joinTime > 0)
-				{
-					waiter(_joinTime * 60 * 1000); // minutes for join event
-				}
-				else if (_joinTime <= 0)
-				{
-					LOGGER.info(_eventName + ": join time <=0 aborting event.");
-					abortEvent();
-					return;
-				}
-				if (startTeleport() && !_aborted)
-				{
-					waiter(30 * 1000); // 30 sec wait time untill start fight after teleported
-					if (startEvent() && !_aborted)
-					{
-						LOGGER.warning(_eventName + ": waiting.....minutes for event time " + _eventTime);
-						waiter(_eventTime * 60 * 1000); // minutes for event time
-						finishEvent();
-						
-						LOGGER.info(_eventName + ": waiting... delay for final messages ");
-						waiter(60000); // just a give a delay delay for final messages
-						sendFinalMessages();
-						
-						if (!_started && !_aborted)
-						{ // if is not already started and it's not aborted
-							
-							LOGGER.info(_eventName + ": waiting.....delay for restart event  " + _intervalBetweenMatches + " minutes.");
-							waiter(60000); // just a give a delay to next restart
-							
-							try
-							{
-								if (!_aborted)
-								{
-									restartEvent();
-								}
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning("Error while tying to Restart Event " + e);
-							}
-						}
-					}
-				}
-				else if (!_aborted)
-				{
-					abortEvent();
-					restartEvent();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Auto event.
-	 */
-	public static void autoEvent()
-	{
-		ThreadPool.execute(new AutoEventTask());
-	}
-	
-	// start without restart
-	/**
-	 * Event once start.
-	 */
-	public static void eventOnceStart()
-	{
-		if (startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(1 * 60 * 1000); // 1 min wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Waiter.
-	 * @param interval the interval
-	 */
-	protected static void waiter(long interval)
-	{
-		final long startWaiterTime = Chronos.currentTimeMillis();
-		int seconds = (int) (interval / 1000);
-		
-		while (((startWaiterTime + interval) > Chronos.currentTimeMillis()) && !_aborted)
-		{
-			seconds--; // Here because we don't want to see two time announce at the same time
-			if (_joining || _started || _teleport)
-			{
-				switch (seconds)
-				{
-					case 3600: // 1 hour left
-					{
-						removeOfflinePlayers();
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till event finish!");
-						}
-						break;
-					}
-					case 1800: // 30 minutes left
-					case 900: // 15 minutes left
-					case 600: // 10 minutes left
-					case 300: // 5 minutes left
-					case 240: // 4 minutes left
-					case 180: // 3 minutes left
-					case 120: // 2 minutes left
-					case 60: // 1 minute left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till event finish!");
-						}
-						break;
-					}
-					case 30: // 30 seconds left
-					case 15: // 15 seconds left
-					case 10: // 10 seconds left
-					{
-						removeOfflinePlayers();
-						// fallthrou?
-					}
-					case 3: // 3 seconds left
-					case 2: // 2 seconds left
-					case 1: // 1 seconds left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till registration close!");
-						}
-						else if (_teleport)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " seconds(s) till start fight!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till event finish!");
-						}
-						break;
-					}
-				}
-			}
-			
-			final long startOneSecondWaiterStartTime = Chronos.currentTimeMillis();
-			
-			// Only the try catch with Thread.sleep(1000) give bad countdown on high wait times
-			while ((startOneSecondWaiterStartTime + 1000) > Chronos.currentTimeMillis())
-			{
-				try
-				{
-					Thread.sleep(1);
-				}
-				catch (InterruptedException ie)
-				{
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Sit.
-	 */
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (_sitForced)
-					{
-						player.stopMove(null, false);
-						player.abortAttack();
-						player.abortCast();
-						
-						if (!player.isSitting())
-						{
-							player.sitDown();
-						}
-					}
-					else if (player.isSitting())
-					{
-						player.standUp();
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Removes the offline players.
-	 */
-	public static void removeOfflinePlayers()
-	{
-		try
-		{
-			if ((_playersShuffle == null) || _playersShuffle.isEmpty())
-			{
-				return;
-			}
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player == null)
-				{
-					_playersShuffle.remove(player);
-				}
-				else if (!player.isOnline() || player.isInJail() || player.isInOfflineMode())
-				{
-					removePlayer(player);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-	}
-	
-	/**
-	 * Start event ok.
-	 * @return true, if successful
-	 */
-	private static boolean startEventOk()
-	{
-		if (_joining || !_teleport || _started)
-		{
-			return false;
-		}
-		
-		if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-		{
-			if (_teamPlayersCount.contains(0))
-			{
-				return false;
-			}
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			final List<PlayerInstance> playersShuffleTemp = new ArrayList<>();
-			int loopCount = 0;
-			loopCount = _playersShuffle.size();
-			for (int i = 0; i < loopCount; i++)
-			{
-				playersShuffleTemp.add(_playersShuffle.get(i));
-			}
-			
-			_playersShuffle = playersShuffleTemp;
-			playersShuffleTemp.clear();
-		}
-		return true;
-	}
-	
-	/**
-	 * Finish event ok.
-	 * @return true, if successful
-	 */
-	private static boolean finishEventOk()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Adds the player ok.
-	 * @param teamName the team name
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	private static boolean addPlayerOk(String teamName, PlayerInstance eventPlayer)
-	{
-		if (eventPlayer.isAio() && !Config.ALLOW_AIO_IN_EVENTS)
-		{
-			eventPlayer.sendMessage("AIO charactes are not allowed to participate in events :/");
-		}
-		if (checkShufflePlayers(eventPlayer) || eventPlayer._inEventCTF)
-		{
-			eventPlayer.sendMessage("You already participated in the event!");
-			return false;
-		}
-		
-		if (eventPlayer._inEventTvT || eventPlayer._inEventDM)
-		{
-			eventPlayer.sendMessage("You already participated in another event!");
-			return false;
-		}
-		
-		if (Olympiad.getInstance().isRegistered(eventPlayer) || eventPlayer.isInOlympiadMode())
-		{
-			eventPlayer.sendMessage("You already participated in Olympiad!");
-			return false;
-		}
-		
-		if ((eventPlayer._activeBoxes > 1) && !Config.ALLOW_DUALBOX_EVENT)
-		{
-			final List<String> playerBoxes = eventPlayer._activeBoxCharacters;
-			if ((playerBoxes != null) && (playerBoxes.size() > 1))
-			{
-				for (String characterName : playerBoxes)
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(characterName);
-					if ((player != null) && player._inEventCTF)
-					{
-						eventPlayer.sendMessage("You already participated in event with another char!");
-						return false;
-					}
-				}
-			}
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-				else if (player.getName().equalsIgnoreCase(eventPlayer.getName()))
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-			}
-			
-			if (_players.contains(eventPlayer))
-			{
-				eventPlayer.sendMessage("You already participated in the event!");
-				return false;
-			}
-		}
-		
-		if (_savePlayers.contains(eventPlayer.getName()))
-		{
-			eventPlayer.sendMessage("You already participated in another event!");
-			return false;
-		}
-		
-		if (Config.CTF_EVEN_TEAMS.equals("NO"))
-		{
-			return true;
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-		{
-			boolean allTeamsEqual = true;
-			int countBefore = -1;
-			for (int playersCount : _teamPlayersCount)
-			{
-				if (countBefore == -1)
-				{
-					countBefore = playersCount;
-				}
-				
-				if (countBefore != playersCount)
-				{
-					allTeamsEqual = false;
-					break;
-				}
-				
-				countBefore = playersCount;
-			}
-			
-			if (allTeamsEqual)
-			{
-				return true;
-			}
-			
-			countBefore = Integer.MAX_VALUE;
-			for (int teamPlayerCount : _teamPlayersCount)
-			{
-				if (teamPlayerCount < countBefore)
-				{
-					countBefore = teamPlayerCount;
-				}
-			}
-			
-			final List<String> joinableTeams = new ArrayList<>();
-			for (String team : _teams)
-			{
-				if (teamPlayersCount(team) == countBefore)
-				{
-					joinableTeams.add(team);
-				}
-			}
-			
-			if (joinableTeams.contains(teamName))
-			{
-				return true;
-			}
-		}
-		else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			return true;
-		}
-		
-		eventPlayer.sendMessage("Too many players in team \"" + teamName + "\"");
-		return false;
-	}
-	
-	/**
-	 * Sets the user data.
-	 */
-	public static void setUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player._originalNameColorCTF = player.getAppearance().getNameColor();
-				player._originalKarmaCTF = player.getKarma();
-				player._originalTitleCTF = player.getTitle();
-				player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameCTF)));
-				player.setKarma(0);
-				if (Config.CTF_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(_teams.indexOf(player._teamNameCTF) + 1);
-				}
-				
-				if (player.isMounted() && player.setMountType(0))
-				{
-					if (player.isFlying())
-					{
-						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
-					}
-					
-					player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
-					player.setMountObjectID(0);
-				}
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * Dump data.
-	 */
-	public static void dumpData()
-	{
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		if (!_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (INACTIVE) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (JOINING) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		else if (!_joining && _teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (TELEPORT) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (!_joining && !_teleport && _started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (STARTED) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		
-		LOGGER.info("Name: " + _eventName);
-		LOGGER.info("Desc: " + _eventDesc);
-		LOGGER.info("Join location: " + _joiningLocationName);
-		LOGGER.info("Min lvl: " + _minLevel);
-		LOGGER.info("Max lvl: " + _maxLevel);
-		LOGGER.info("");
-		LOGGER.info("##########################");
-		LOGGER.info("# _teams(List<String>) #");
-		LOGGER.info("##########################");
-		
-		for (String team : _teams)
-		{
-			LOGGER.info(team + " Flags Taken :" + _teamPointsCount.get(_teams.indexOf(team)));
-		}
-		
-		if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			LOGGER.info("");
-			LOGGER.info("#########################################");
-			LOGGER.info("# _playersShuffle(List<PlayerInstance>) #");
-			LOGGER.info("#########################################");
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName());
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("##################################");
-		LOGGER.info("# _players(List<PlayerInstance>) #");
-		LOGGER.info("##################################");
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName() + "   Team: " + player._teamNameCTF + "  Flags :" + player._countCTFflags);
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("#####################################################################");
-		LOGGER.info("# _savePlayers(List<String>) and _savePlayerTeams(List<String>) #");
-		LOGGER.info("#####################################################################");
-		
-		for (String player : _savePlayers)
-		{
-			LOGGER.info("Name: " + player + "	Team: " + _savePlayerTeams.get(_savePlayers.indexOf(player)));
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		dumpLocalEventInfo();
-	}
-	
-	/**
-	 * Dump local event info.
-	 */
-	private static void dumpLocalEventInfo()
-	{
-		LOGGER.info("**********==CTF==************");
-		LOGGER.info("CTF._teamPointsCount:" + _teamPointsCount);
-		LOGGER.info("CTF._flagIds:" + _flagIds);
-		LOGGER.info("CTF._flagSpawns:" + _flagSpawns);
-		LOGGER.info("CTF._throneSpawns:" + _throneSpawns);
-		LOGGER.info("CTF._flagsTaken:" + _flagsTaken);
-		LOGGER.info("CTF._flagsX:" + _flagsX);
-		LOGGER.info("CTF._flagsY:" + _flagsY);
-		LOGGER.info("CTF._flagsZ:" + _flagsZ);
-		LOGGER.info("************EOF**************\n");
-		LOGGER.info("");
-	}
-	
-	/**
-	 * Load data.
-	 */
-	public static void loadData()
-	{
-		_eventName = "";
-		_eventDesc = "";
-		_joiningLocationName = "";
-		_savePlayers = new ArrayList<>();
-		synchronized (_players)
-		{
-			_players = new ArrayList<>();
-		}
-		
-		_topTeam = "";
-		_teams = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_playersShuffle = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamColors = new ArrayList<>();
-		_teamsX = new ArrayList<>();
-		_teamsY = new ArrayList<>();
-		_teamsZ = new ArrayList<>();
-		_throneSpawns = new ArrayList<>();
-		_flagSpawns = new ArrayList<>();
-		_flagsTaken = new ArrayList<>();
-		_flagIds = new ArrayList<>();
-		_flagsX = new ArrayList<>();
-		_flagsY = new ArrayList<>();
-		_flagsZ = new ArrayList<>();
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_sitForced = false;
-		_aborted = false;
-		_inProgress = false;
-		_npcId = 0;
-		_npcX = 0;
-		_npcY = 0;
-		_npcZ = 0;
-		_npcHeading = 0;
-		_rewardId = 0;
-		_rewardAmount = 0;
-		_topScore = 0;
-		_minLevel = 0;
-		_maxLevel = 0;
-		_joinTime = 0;
-		_eventTime = 0;
-		_minPlayers = 0;
-		_maxPlayers = 0;
-		_intervalBetweenMatches = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			ResultSet rs;
-			statement = con.prepareStatement("Select * from ctf");
-			rs = statement.executeQuery();
-			int teams = 0;
-			
-			while (rs.next())
-			{
-				_eventName = rs.getString("eventName");
-				_eventDesc = rs.getString("eventDesc");
-				_joiningLocationName = rs.getString("joiningLocation");
-				_minLevel = rs.getInt("minLevel");
-				_maxLevel = rs.getInt("maxLevel");
-				_npcId = rs.getInt("npcId");
-				_npcX = rs.getInt("npcX");
-				_npcY = rs.getInt("npcY");
-				_npcZ = rs.getInt("npcZ");
-				_npcHeading = rs.getInt("npcHeading");
-				_rewardId = rs.getInt("rewardId");
-				_rewardAmount = rs.getInt("rewardAmount");
-				teams = rs.getInt("teamsCount");
-				_joinTime = rs.getInt("joinTime");
-				_eventTime = rs.getInt("eventTime");
-				_minPlayers = rs.getInt("minPlayers");
-				_maxPlayers = rs.getInt("maxPlayers");
-				_intervalBetweenMatches = rs.getLong("delayForNextEvent");
-			}
-			statement.close();
-			
-			int index = -1;
-			if (teams > 0)
-			{
-				index = 0;
-			}
-			while ((index < teams) && (index > -1))
-			{
-				statement = con.prepareStatement("Select * from ctf_teams where teamId = ?");
-				statement.setInt(1, index);
-				rs = statement.executeQuery();
-				while (rs.next())
-				{
-					_teams.add(rs.getString("teamName"));
-					_teamPlayersCount.add(0);
-					_teamPointsCount.add(0);
-					_teamColors.add(0);
-					_teamsX.add(0);
-					_teamsY.add(0);
-					_teamsZ.add(0);
-					_teamsX.set(index, rs.getInt("teamX"));
-					_teamsY.set(index, rs.getInt("teamY"));
-					_teamsZ.set(index, rs.getInt("teamZ"));
-					_teamColors.set(index, rs.getInt("teamColor"));
-					_flagsX.add(0);
-					_flagsY.add(0);
-					_flagsZ.add(0);
-					_flagsX.set(index, rs.getInt("flagX"));
-					_flagsY.set(index, rs.getInt("flagY"));
-					_flagsZ.set(index, rs.getInt("flagZ"));
-					_flagSpawns.add(null);
-					_flagIds.add(_FlagNPC);
-					_flagsTaken.add(false);
-				}
-				index++;
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: loadData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Save data.
-	 */
-	public static void saveData()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			statement = con.prepareStatement("Delete from ctf");
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("INSERT INTO ctf (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-			statement.setString(1, _eventName);
-			statement.setString(2, _eventDesc);
-			statement.setString(3, _joiningLocationName);
-			statement.setInt(4, _minLevel);
-			statement.setInt(5, _maxLevel);
-			statement.setInt(6, _npcId);
-			statement.setInt(7, _npcX);
-			statement.setInt(8, _npcY);
-			statement.setInt(9, _npcZ);
-			statement.setInt(10, _npcHeading);
-			statement.setInt(11, _rewardId);
-			statement.setInt(12, _rewardAmount);
-			statement.setInt(13, _teams.size());
-			statement.setInt(14, _joinTime);
-			statement.setInt(15, _eventTime);
-			statement.setInt(16, _minPlayers);
-			statement.setInt(17, _maxPlayers);
-			statement.setLong(18, _intervalBetweenMatches);
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("Delete from ctf_teams");
-			statement.execute();
-			statement.close();
-			
-			for (String teamName : _teams)
-			{
-				final int index = _teams.indexOf(teamName);
-				if (index == -1)
-				{
-					return;
-				}
-				statement = con.prepareStatement("INSERT INTO ctf_teams (teamId ,teamName, teamX, teamY, teamZ, teamColor, flagX, flagY, flagZ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
-				statement.setInt(1, index);
-				statement.setString(2, teamName);
-				statement.setInt(3, _teamsX.get(index));
-				statement.setInt(4, _teamsY.get(index));
-				statement.setInt(5, _teamsZ.get(index));
-				statement.setInt(6, _teamColors.get(index));
-				statement.setInt(7, _flagsX.get(index));
-				statement.setInt(8, _flagsY.get(index));
-				statement.setInt(9, _flagsZ.get(index));
-				statement.execute();
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: saveData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Show event html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 */
-	public static void showEventHtml(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><title>" + _eventName + "</title><body>");
-			replyMSG.append("<center><img src=\"L2UI_CH3.herotower_deco\" width=256 height=32></center><br1>");
-			replyMSG.append("<center><font color=\"3366CC\">Current event:</font></center><br1>");
-			replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
-			replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
-			if (!_started && !_joining)
-			{
-				replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && !checkMaxPlayers(_playersShuffle.size()))
-			{
-				if (!_started)
-				{
-					replyMSG.append("Currently participated: <font color=\"00FF00\">" + _playersShuffle.size() + ".</font><br>");
-					replyMSG.append("Max players: <font color=\"00FF00\">" + _maxPlayers + "</font><br><br>");
-					replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-				}
-			}
-			else if (eventPlayer.isCursedWeaponEquiped() && !Config.CTF_JOIN_CURSED)
-			{
-				replyMSG.append("<font color=\"FFFF00\">You can't participate to this event with a cursed Weapon.</font><br>");
-			}
-			else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
-			{
-				synchronized (_players)
-				{
-					if (_players.contains(eventPlayer) || _playersShuffle.contains(eventPlayer) || checkShufflePlayers(eventPlayer))
-					{
-						if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("You participated already in team <font color=\"LEVEL\">" + eventPlayer._teamNameCTF + "</font><br><br>");
-						}
-						else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center><font color=\"3366CC\">You participated already!</font></center><br><br>");
-						}
-						
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _playersShuffle.size() + "</font></center><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Wait till event start or remove your participation!</font><center>");
-						replyMSG.append("<center><button value=\"Remove\" action=\"bypass -h npc_" + objectId + "_ctf_player_leave\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-					}
-					else
-					{
-						replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
-						replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
-						replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Teams:</font></center><br>");
-						if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("<center><table border=\"0\">");
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font>&nbsp;(" + teamPlayersCount(team) + " joined)</td>");
-								replyMSG.append("<center><td width=\"60\"><button value=\"Join\" action=\"bypass -h npc_" + objectId + "_ctf_player_join " + team + "\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center></td></tr>");
-							}
-							replyMSG.append("</table></center>");
-						}
-						else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center>");
-							
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font> &nbsp;</td>");
-							}
-							
-							replyMSG.append("</center><br>");
-							
-							replyMSG.append("<center><button value=\"Join Event\" action=\"bypass -h npc_" + objectId + "_ctf_player_join eventShuffle\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-							replyMSG.append("<center><font color=\"3366CC\">Teams will be reandomly generated!</font></center><br>");
-							replyMSG.append("<center>Joined Players:</font> <font color=\"LEVEL\">" + _playersShuffle.size() + "</center></font><br>");
-							replyMSG.append("<center>Reward: <font color=\"LEVEL\">" + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName() + "</center></font>");
-						}
-					}
-				}
-			}
-			else if (_started && !_joining)
-			{
-				replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
-			}
-			else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
-			{
-				replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
-				replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
-				replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
-				replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			eventPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Adds the player.
-	 * @param player the player
-	 * @param teamName the team name
-	 */
-	public static void addPlayer(PlayerInstance player, String teamName)
-	{
-		if (!addPlayerOk(teamName, player))
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
-			{
-				player._teamNameCTF = teamName;
-				_players.add(player);
-				setTeamPlayersCount(teamName, teamPlayersCount(teamName) + 1);
-			}
-			else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				_playersShuffle.add(player);
-			}
-		}
-		
-		player._inEventCTF = true;
-		player._countCTFflags = 0;
-		player.sendMessage(_eventName + ": You successfully registered for the event.");
-	}
-	
-	/**
-	 * Removes the player.
-	 * @param player the player
-	 */
-	public static void removePlayer(PlayerInstance player)
-	{
-		if (player._inEventCTF)
-		{
-			if (!_joining)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorCTF);
-				player.setTitle(player._originalTitleCTF);
-				player.setKarma(player._originalKarmaCTF);
-				if (Config.CTF_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(0); // clear aura :P
-				}
-				player.broadcastUserInfo();
-			}
-			
-			// after remove, all event data must be cleaned in player
-			player._originalNameColorCTF = 0;
-			player._originalTitleCTF = null;
-			player._originalKarmaCTF = 0;
-			player._teamNameCTF = "";
-			player._countCTFflags = 0;
-			player._inEventCTF = false;
-			
-			synchronized (_players)
-			{
-				if ((Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE")) && _players.contains(player))
-				{
-					setTeamPlayersCount(player._teamNameCTF, teamPlayersCount(player._teamNameCTF) - 1);
-					_players.remove(player);
-				}
-				else if (Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && (!_playersShuffle.isEmpty() && _playersShuffle.contains(player)))
-				{
-					_playersShuffle.remove(player);
-				}
-			}
-			
-			player.sendMessage("Your participation in the CTF event has been removed.");
-		}
-	}
-	
-	/**
-	 * Clean ctf.
-	 */
-	public static void cleanCTF()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					cleanEventPlayer(player);
-					
-					removePlayer(player);
-					if (_savePlayers.contains(player.getName()))
-					{
-						_savePlayers.remove(player.getName());
-					}
-					player._inEventCTF = false;
-				}
-			}
-		}
-		
-		if ((_playersShuffle != null) && !_playersShuffle.isEmpty())
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					player._inEventCTF = false;
-				}
-			}
-		}
-		
-		_topScore = 0;
-		_topTeam = "";
-		synchronized (_players)
-		{
-			_players = new ArrayList<>();
-		}
-		
-		_playersShuffle = new ArrayList<>();
-		_savePlayers = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		cleanLocalEventInfo();
-		
-		_inProgress = false;
-		loadData();
-	}
-	
-	/**
-	 * Clean local event info.
-	 */
-	private static void cleanLocalEventInfo()
-	{
-		_flagSpawns = new ArrayList<>();
-		_flagsTaken = new ArrayList<>();
-	}
-	
-	/**
-	 * Clean event player.
-	 * @param player the player
-	 */
-	private static void cleanEventPlayer(PlayerInstance player)
-	{
-		if (player._haveFlagCTF)
-		{
-			removeFlagFromPlayer(player);
-		}
-		else
-		{
-			player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
-		}
-		player._haveFlagCTF = false;
-	}
-	
-	/**
-	 * Adds the disconnected player.
-	 * @param player the player
-	 */
-	public static synchronized void addDisconnectedPlayer(PlayerInstance player)
-	{
-		if ((Config.CTF_EVEN_TEAMS.equals("SHUFFLE") && (_teleport || _started)) || (Config.CTF_EVEN_TEAMS.equals("NO") || (Config.CTF_EVEN_TEAMS.equals("BALANCE") && (_teleport || _started))))
-		{
-			if (Config.CTF_ON_START_REMOVE_ALL_EFFECTS)
-			{
-				player.stopAllEffects();
-			}
-			
-			player._teamNameCTF = _savePlayerTeams.get(_savePlayers.indexOf(player.getName()));
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance p : _players)
-				{
-					// check by name incase player got new objectId
-					if ((p != null) && p.getName().equals(player.getName()))
-					{
-						player._originalNameColorCTF = player.getAppearance().getNameColor();
-						player._originalTitleCTF = player.getTitle();
-						player._originalKarmaCTF = player.getKarma();
-						player._inEventCTF = true;
-						player._countCTFflags = p._countCTFflags;
-						_players.remove(p); // removing old object id from vector
-						_players.add(player); // adding new objectId to vector
-						break;
-					}
-				}
-			}
-			
-			player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameCTF)));
-			player.setKarma(0);
-			if (Config.CTF_AURA && (_teams.size() >= 2))
-			{
-				player.setTeam(_teams.indexOf(player._teamNameCTF) + 1);
-			}
-			player.broadcastUserInfo();
-			
-			final int offset = Config.CTF_SPAWN_OFFSET;
-			player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsY.get(_teams.indexOf(player._teamNameCTF)) + Rnd.get(offset), _teamsZ.get(_teams.indexOf(player._teamNameCTF)));
-			afterAddDisconnectedPlayerOperations(player);
-		}
-	}
-	
-	/**
-	 * After add disconnected player operations.
-	 * @param player the player
-	 */
-	private static void afterAddDisconnectedPlayerOperations(PlayerInstance player)
-	{
-		player._teamNameHaveFlagCTF = null;
-		player._haveFlagCTF = false;
-		checkRestoreFlags();
-	}
-	
-	/**
-	 * Shuffle teams.
-	 */
-	public static void shuffleTeams()
-	{
-		int teamCount = 0;
-		int playersCount = 0;
-		
-		synchronized (_players)
-		{
-			for (;;)
-			{
-				if (_playersShuffle.isEmpty())
-				{
-					break;
-				}
-				
-				final int playerToAddIndex = Rnd.get(_playersShuffle.size());
-				PlayerInstance player = null;
-				player = _playersShuffle.get(playerToAddIndex);
-				_players.add(player);
-				_players.get(playersCount)._teamNameCTF = _teams.get(teamCount);
-				_savePlayers.add(_players.get(playersCount).getName());
-				_savePlayerTeams.add(_teams.get(teamCount));
-				playersCount++;
-				
-				if (teamCount == (_teams.size() - 1))
-				{
-					teamCount = 0;
-				}
-				else
-				{
-					teamCount++;
-				}
-				
-				_playersShuffle.remove(playerToAddIndex);
-			}
-		}
-	}
-	
-	/**
-	 * Play kneel animation.
-	 * @param teamName the team name
-	 */
-	public static void playKneelAnimation(String teamName)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (!player._teamNameCTF.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 7));
-					}
-					else if (player._teamNameCTF.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 3));
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Reward team.
-	 * @param teamName the team name
-	 */
-	public static void rewardTeam(String teamName)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if ((player != null) && player.isOnline() && (player._inEventCTF))
-				{
-					if ((teamName != null) && (player._teamNameCTF.equals(teamName)))
-					{
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, _rewardAmount, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team wins the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-					else if (teamName == null)
-					{
-						int minusReward = 0;
-						if (_topScore != 0)
-						{
-							minusReward = _rewardAmount / 2;
-						}
-						else
-						{
-							// nobody took flags
-							minusReward = _rewardAmount / 4;
-						}
-						
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, minusReward, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team had a tie in the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Process top player.
-	 */
-	private static void processTopPlayer()
-	{
-		//
-	}
-	
-	/**
-	 * Process top team.
-	 */
-	private static void processTopTeam()
-	{
-		_topTeam = null;
-		for (String team : _teams)
-		{
-			if ((teamPointsCount(team) == _topScore) && (_topScore > 0))
-			{
-				_topTeam = null;
-			}
-			
-			if (teamPointsCount(team) > _topScore)
-			{
-				_topTeam = team;
-				_topScore = teamPointsCount(team);
-			}
-		}
-	}
-	
-	/**
-	 * Adds the team.
-	 * @param teamName the team name
-	 */
-	public static void addTeam(String teamName)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		if (teamName.equals(" "))
-		{
-			return;
-		}
-		
-		_teams.add(teamName);
-		_teamPlayersCount.add(0);
-		_teamPointsCount.add(0);
-		_teamColors.add(0);
-		_teamsX.add(0);
-		_teamsY.add(0);
-		_teamsZ.add(0);
-		
-		addTeamEventOperations(teamName);
-	}
-	
-	/**
-	 * Adds the team event operations.
-	 * @param teamName the team name
-	 */
-	private static void addTeamEventOperations(String teamName)
-	{
-		addOrSet(_teams.indexOf(teamName), null, false, _FlagNPC, 0, 0, 0);
-	}
-	
-	/**
-	 * Removes the team.
-	 * @param teamName the team name
-	 */
-	public static void removeTeam(String teamName)
-	{
-		if (_inProgress || _teams.isEmpty())
-		{
-			return;
-		}
-		
-		if (teamPlayersCount(teamName) > 0)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsZ.remove(index);
-		_teamsY.remove(index);
-		_teamsX.remove(index);
-		_teamColors.remove(index);
-		_teamPointsCount.remove(index);
-		_teamPlayersCount.remove(index);
-		_teams.remove(index);
-		
-		removeTeamEventItems(teamName);
-	}
-	
-	/**
-	 * Removes the team event items.
-	 * @param teamName the team name
-	 */
-	private static void removeTeamEventItems(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		_flagSpawns.remove(index);
-		_flagsTaken.remove(index);
-		_flagIds.remove(index);
-		_flagsX.remove(index);
-		_flagsY.remove(index);
-		_flagsZ.remove(index);
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param player the player
-	 */
-	public static void setTeamPos(String teamName, PlayerInstance player)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, player.getX());
-		_teamsY.set(index, player.getY());
-		_teamsZ.set(index, player.getZ());
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param x the x
-	 * @param y the y
-	 * @param z the z
-	 */
-	public static void setTeamPos(String teamName, int x, int y, int z)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, x);
-		_teamsY.set(index, y);
-		_teamsZ.set(index, z);
-	}
-	
-	/**
-	 * Sets the team color.
-	 * @param teamName the team name
-	 * @param color the color
-	 */
-	public static void setTeamColor(String teamName, int color)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamColors.set(index, color);
-	}
-	
-	/**
-	 * Team players count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamPlayersCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPlayersCount.get(index);
-	}
-	
-	/**
-	 * Sets the team players count.
-	 * @param teamName the team name
-	 * @param teamPlayersCount the team players count
-	 */
-	public static void setTeamPlayersCount(String teamName, int teamPlayersCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPlayersCount.set(index, teamPlayersCount);
-	}
-	
-	/**
-	 * Check shuffle players.
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	public static boolean checkShufflePlayers(PlayerInstance eventPlayer)
-	{
-		try
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if ((player == null) || !player.isOnline())
-				{
-					_playersShuffle.remove(player);
-					eventPlayer._inEventCTF = false;
-				}
-				else if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer._inEventCTF = true;
-					eventPlayer._countCTFflags = 0;
-					return true;
-				}
-				// This 1 is incase player got new objectid after DC or reconnect
-				else if (player.getName().equals(eventPlayer.getName()))
-				{
-					_playersShuffle.remove(player);
-					_playersShuffle.add(eventPlayer);
-					eventPlayer._inEventCTF = true;
-					eventPlayer._countCTFflags = 0;
-					return true;
-				}
-			}
-		}
-		catch (Exception e)
-		{
-		}
-		return false;
-	}
-	
-	/**
-	 * just an announcer to send termination messages.
-	 */
-	public static void sendFinalMessages()
-	{
-		if (!_started && !_aborted)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Thank you For Participating At, " + _eventName + " Event.");
-		}
-	}
-	
-	/**
-	 * returns the interval between each event.
-	 * @return the interval between matches
-	 */
-	public static int getIntervalBetweenMatchs()
-	{
-		final long actualTime = Chronos.currentTimeMillis();
-		final long totalTime = actualTime + _intervalBetweenMatches;
-		final long interval = totalTime - actualTime;
-		final int seconds = (int) (interval / 1000);
-		return seconds / 60;
-	}
-	
-	@Override
-	public void run()
-	{
-		LOGGER.info(_eventName + ": Event notification start");
-		eventOnceStart();
-	}
-	
-	@Override
-	public String getEventIdentifier()
-	{
-		return _eventName;
-	}
-	
-	@Override
-	public String getEventStartTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the event start time.
-	 * @param newTime the new event start time
-	 */
-	public void setEventStartTime(String newTime)
-	{
-		startEventTime = newTime;
-	}
-	
-	/**
-	 * On disconnect.
-	 * @param player the player
-	 */
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventCTF)
-		{
-			removePlayer(player);
-			player.teleToLocation(_npcX, _npcY, _npcZ);
-		}
-	}
-	
-	/**
-	 * Team points count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamPointsCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPointsCount.get(index);
-	}
-	
-	/**
-	 * Sets the team points count.
-	 * @param teamName the team name
-	 * @param teamPointCount the team point count
-	 */
-	public static void setTeamPointsCount(String teamName, int teamPointCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPointsCount.set(index, teamPointCount);
-	}
-	
-	/**
-	 * Gets the _event offset.
-	 * @return the _eventOffset
-	 */
-	public static int getEventOffset()
-	{
-		return _eventOffset;
-	}
-	
-	/**
-	 * Set_event offset.
-	 * @param eventOffset the _eventOffset to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventOffset(int eventOffset)
-	{
-		if (!_inProgress)
-		{
-			CTF._eventOffset = eventOffset;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Show flag html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 * @param teamName the team name
-	 */
-	public static void showFlagHtml(PlayerInstance eventPlayer, String objectId, String teamName)
-	{
-		if (eventPlayer == null)
-		{
-			return;
-		}
-		
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><head><body><center>");
-			replyMSG.append("CTF Flag<br><br>");
-			replyMSG.append("<font color=\"00FF00\">" + teamName + "'s Flag</font><br1>");
-			if ((eventPlayer._teamNameCTF != null) && eventPlayer._teamNameCTF.equals(teamName))
-			{
-				replyMSG.append("<font color=\"LEVEL\">This is your Flag</font><br1>");
-			}
-			else
-			{
-				replyMSG.append("<font color=\"LEVEL\">Enemy Flag!</font><br1>");
-			}
-			if (_started)
-			{
-				processInFlagRange(eventPlayer);
-			}
-			else
-			{
-				replyMSG.append("CTF match is not in progress yet.<br>Wait for a GM to start the event<br>");
-			}
-			replyMSG.append("</center></body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception: " + e.getStackTrace());
-		}
-	}
-	
-	/**
-	 * Check restore flags.
-	 */
-	public static void checkRestoreFlags()
-	{
-		final List<Integer> teamsTakenFlag = new ArrayList<>();
-		try
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// logged off with a flag in his hands
-						if (!player.isOnline() && player._haveFlagCTF)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player.getName() + " logged off with a CTF flag!");
-							player._haveFlagCTF = false;
-							if ((_teams.indexOf(player._teamNameHaveFlagCTF) >= 0) && _flagsTaken.get(_teams.indexOf(player._teamNameHaveFlagCTF)))
-							{
-								_flagsTaken.set(_teams.indexOf(player._teamNameHaveFlagCTF), false);
-								spawnFlag(player._teamNameHaveFlagCTF);
-								AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player._teamNameHaveFlagCTF + " flag now returned to place.");
-							}
-							removeFlagFromPlayer(player);
-							player._teamNameHaveFlagCTF = null;
-							return;
-						}
-						else if (player._haveFlagCTF)
-						{
-							teamsTakenFlag.add(_teams.indexOf(player._teamNameHaveFlagCTF));
-						}
-					}
-				}
-			}
-			
-			// Go over the list of ALL teams
-			for (String team : _teams)
-			{
-				if (team == null)
-				{
-					continue;
-				}
-				final int index = _teams.indexOf(team);
-				if (!teamsTakenFlag.contains(index) && _flagsTaken.get(index))
-				{
-					_flagsTaken.set(index, false);
-					spawnFlag(team);
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + team + " flag returned due to player error.");
-				}
-			}
-			// Check if a player ran away from the event holding a flag:
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if ((player != null) && player._haveFlagCTF && isOutsideCTFArea(player))
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player.getName() + " escaped from the event holding a flag!");
-						player._haveFlagCTF = false;
-						if ((_teams.indexOf(player._teamNameHaveFlagCTF) >= 0) && _flagsTaken.get(_teams.indexOf(player._teamNameHaveFlagCTF)))
-						{
-							_flagsTaken.set(_teams.indexOf(player._teamNameHaveFlagCTF), false);
-							spawnFlag(player._teamNameHaveFlagCTF);
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player._teamNameHaveFlagCTF + " flag now returned to place.");
-						}
-						removeFlagFromPlayer(player);
-						player._teamNameHaveFlagCTF = null;
-						player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameCTF)), _teamsY.get(_teams.indexOf(player._teamNameCTF)), _teamsZ.get(_teams.indexOf(player._teamNameCTF)));
-						player.sendMessage("You have been returned to your team spawn");
-						return;
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF.restoreFlags() Error:" + e);
-		}
-	}
-	
-	/**
-	 * Adds the flag to player.
-	 * @param player the player
-	 */
-	public static void addFlagToPlayer(PlayerInstance player)
-	{
-		// Remove items from the player hands (right, left, both)
-		// This is NOT a BUG, I don't want them to see the icon they have 8D
-		ItemInstance wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
-		if (wpn == null)
-		{
-			wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LRHAND);
-			if (wpn != null)
-			{
-				player.getInventory().unEquipItemInBodySlotAndRecord(Inventory.PAPERDOLL_LRHAND);
-			}
-		}
-		else
-		{
-			player.getInventory().unEquipItemInBodySlotAndRecord(Inventory.PAPERDOLL_RHAND);
-			wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
-			if (wpn != null)
-			{
-				player.getInventory().unEquipItemInBodySlotAndRecord(Inventory.PAPERDOLL_LHAND);
-			}
-		}
-		// Add the flag in his hands
-		player.getInventory().equipItem(ItemTable.getInstance().createItem("", _FLAG_IN_HAND_ITEM_ID, 1, player, null));
-		player.broadcastPacket(new SocialAction(player.getObjectId(), 16)); // Amazing glow
-		player._haveFlagCTF = true;
-		player.broadcastUserInfo();
-		player.sendPacket(new CreatureSay(player.getObjectId(), ChatType.PARTYROOM_COMMANDER, ":", "You got it! Run back! ::"));
-	}
-	
-	/**
-	 * Removes the flag from player.
-	 * @param player the player
-	 */
-	public static void removeFlagFromPlayer(PlayerInstance player)
-	{
-		final ItemInstance wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LRHAND);
-		player._haveFlagCTF = false;
-		if (wpn != null)
-		{
-			player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
-			final InventoryUpdate iu = new InventoryUpdate();
-			for (ItemInstance element : player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()))
-			{
-				iu.addModifiedItem(element);
-			}
-			player.sendPacket(iu);
-			player.sendPacket(new ItemList(player, true)); // Get your weapon back now ...
-			player.abortAttack();
-			player.broadcastUserInfo();
-		}
-		else
-		{
-			player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
-			player.sendPacket(new ItemList(player, true)); // Get your weapon back now ...
-			player.abortAttack();
-			player.broadcastUserInfo();
-		}
-	}
-	
-	/**
-	 * Sets the team flag.
-	 * @param teamName the team name
-	 * @param player the player
-	 */
-	public static void setTeamFlag(String teamName, PlayerInstance player)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		addOrSet(_teams.indexOf(teamName), null, false, _FlagNPC, player.getX(), player.getY(), player.getZ());
-	}
-	
-	/**
-	 * Spawn all flags.
-	 */
-	public static void spawnAllFlags()
-	{
-		while (_flagSpawns.size() < _teams.size())
-		{
-			_flagSpawns.add(null);
-		}
-		while (_throneSpawns.size() < _teams.size())
-		{
-			_throneSpawns.add(null);
-		}
-		for (String team : _teams)
-		{
-			final int index = _teams.indexOf(team);
-			final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_flagIds.get(index));
-			final NpcTemplate throne = NpcTable.getInstance().getTemplate(32027);
-			try
-			{
-				// Spawn throne
-				_throneSpawns.set(index, new Spawn(throne));
-				_throneSpawns.get(index).setX(_flagsX.get(index));
-				_throneSpawns.get(index).setY(_flagsY.get(index));
-				_throneSpawns.get(index).setZ(_flagsZ.get(index) - 10);
-				_throneSpawns.get(index).setAmount(1);
-				_throneSpawns.get(index).setHeading(0);
-				_throneSpawns.get(index).setRespawnDelay(1);
-				SpawnTable.getInstance().addNewSpawn(_throneSpawns.get(index), false);
-				_throneSpawns.get(index).init();
-				_throneSpawns.get(index).getLastSpawn().getStatus().setCurrentHp(999999999);
-				_throneSpawns.get(index).getLastSpawn().decayMe();
-				_throneSpawns.get(index).getLastSpawn().spawnMe(_throneSpawns.get(index).getLastSpawn().getX(), _throneSpawns.get(index).getLastSpawn().getY(), _throneSpawns.get(index).getLastSpawn().getZ());
-				_throneSpawns.get(index).getLastSpawn().setTitle(team + " Throne");
-				_throneSpawns.get(index).getLastSpawn().broadcastPacket(new MagicSkillUse(_throneSpawns.get(index).getLastSpawn(), _throneSpawns.get(index).getLastSpawn(), 1036, 1, 5500, 1));
-				_throneSpawns.get(index).getLastSpawn()._isCTF_throneSpawn = true;
-				// Spawn flag
-				_flagSpawns.set(index, new Spawn(tmpl));
-				_flagSpawns.get(index).setX(_flagsX.get(index));
-				_flagSpawns.get(index).setY(_flagsY.get(index));
-				_flagSpawns.get(index).setZ(_flagsZ.get(index));
-				_flagSpawns.get(index).setAmount(1);
-				_flagSpawns.get(index).setHeading(0);
-				_flagSpawns.get(index).setRespawnDelay(1);
-				SpawnTable.getInstance().addNewSpawn(_flagSpawns.get(index), false);
-				_flagSpawns.get(index).init();
-				_flagSpawns.get(index).getLastSpawn().getStatus().setCurrentHp(999999999);
-				_flagSpawns.get(index).getLastSpawn().setTitle(team + "'s Flag");
-				_flagSpawns.get(index).getLastSpawn()._CTF_FlagTeamName = team;
-				_flagSpawns.get(index).getLastSpawn().decayMe();
-				_flagSpawns.get(index).getLastSpawn().spawnMe(_flagSpawns.get(index).getLastSpawn().getX(), _flagSpawns.get(index).getLastSpawn().getY(), _flagSpawns.get(index).getLastSpawn().getZ());
-				_flagSpawns.get(index).getLastSpawn()._isCTF_Flag = true;
-				calculateOutSideOfCTF(); // Sets event boundaries so players don't run with the flag.
-			}
-			catch (Exception e)
-			{
-				LOGGER.info("CTF Engine[spawnAllFlags()]: exception: " + e);
-			}
-		}
-	}
-	
-	/**
-	 * Unspawn all flags.
-	 */
-	public static void unspawnAllFlags()
-	{
-		try
-		{
-			if ((_throneSpawns == null) || (_flagSpawns == null) || (_teams == null))
-			{
-				return;
-			}
-			for (String team : _teams)
-			{
-				final int index = _teams.indexOf(team);
-				if (_throneSpawns.get(index) != null)
-				{
-					_throneSpawns.get(index).getLastSpawn().deleteMe();
-					_throneSpawns.get(index).stopRespawn();
-					SpawnTable.getInstance().deleteSpawn(_throneSpawns.get(index), true);
-				}
-				if (_flagSpawns.get(index) != null)
-				{
-					_flagSpawns.get(index).getLastSpawn().deleteMe();
-					_flagSpawns.get(index).stopRespawn();
-					SpawnTable.getInstance().deleteSpawn(_flagSpawns.get(index), true);
-				}
-			}
-			_throneSpawns.clear();
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF Engine[unspawnAllFlags()]: exception: " + e);
-		}
-	}
-	
-	/**
-	 * Unspawn flag.
-	 * @param teamName the team name
-	 */
-	private static void unspawnFlag(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		_flagSpawns.get(index).getLastSpawn().deleteMe();
-		_flagSpawns.get(index).stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_flagSpawns.get(index), true);
-	}
-	
-	/**
-	 * Spawn flag.
-	 * @param teamName the team name
-	 */
-	public static void spawnFlag(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_flagIds.get(index));
-		
-		try
-		{
-			_flagSpawns.set(index, new Spawn(tmpl));
-			_flagSpawns.get(index).setX(_flagsX.get(index));
-			_flagSpawns.get(index).setY(_flagsY.get(index));
-			_flagSpawns.get(index).setZ(_flagsZ.get(index));
-			_flagSpawns.get(index).setAmount(1);
-			_flagSpawns.get(index).setHeading(0);
-			_flagSpawns.get(index).setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_flagSpawns.get(index), false);
-			_flagSpawns.get(index).init();
-			_flagSpawns.get(index).getLastSpawn().getStatus().setCurrentHp(999999999);
-			_flagSpawns.get(index).getLastSpawn().setTitle(teamName + "'s Flag");
-			_flagSpawns.get(index).getLastSpawn()._CTF_FlagTeamName = teamName;
-			_flagSpawns.get(index).getLastSpawn()._isCTF_Flag = true;
-			_flagSpawns.get(index).getLastSpawn().decayMe();
-			_flagSpawns.get(index).getLastSpawn().spawnMe(_flagSpawns.get(index).getLastSpawn().getX(), _flagSpawns.get(index).getLastSpawn().getY(), _flagSpawns.get(index).getLastSpawn().getZ());
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("CTF Engine[spawnFlag(" + teamName + ")]: exception: " + e);
-		}
-	}
-	
-	/**
-	 * In range of flag.
-	 * @param player the _player
-	 * @param flagIndex the flag index
-	 * @param offset the offset
-	 * @return true, if successful
-	 */
-	public static boolean inRangeOfFlag(PlayerInstance player, int flagIndex, int offset)
-	{
-		return (player.getX() > (_flagsX.get(flagIndex) - offset)) && (player.getX() < (_flagsX.get(flagIndex) + offset)) && (player.getY() > (_flagsY.get(flagIndex) - offset)) && (player.getY() < (_flagsY.get(flagIndex) + offset)) && (player.getZ() > (_flagsZ.get(flagIndex) - offset)) && (player.getZ() < (_flagsZ.get(flagIndex) + offset));
-	}
-	
-	/**
-	 * Process in flag range.
-	 * @param player the _player
-	 */
-	public static void processInFlagRange(PlayerInstance player)
-	{
-		try
-		{
-			checkRestoreFlags();
-			for (String team : _teams)
-			{
-				if (team.equals(player._teamNameCTF))
-				{
-					final int indexOwn = _teams.indexOf(player._teamNameCTF);
-					// If player is near his team flag holding the enemy flag
-					if (inRangeOfFlag(player, indexOwn, 100) && !_flagsTaken.get(indexOwn) && player._haveFlagCTF)
-					{
-						final int indexEnemy = _teams.indexOf(player._teamNameHaveFlagCTF);
-						// Return enemy flag to place
-						_flagsTaken.set(indexEnemy, false);
-						spawnFlag(player._teamNameHaveFlagCTF);
-						// Remove the flag from this player
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 16)); // Amazing glow
-						player.broadcastUserInfo();
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 3)); // Victory
-						player.broadcastUserInfo();
-						removeFlagFromPlayer(player);
-						_teamPointsCount.set(indexOwn, teamPointsCount(team) + 1);
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + player.getName() + " scores for " + player._teamNameCTF + ".");
-					}
-				}
-				else
-				{
-					final int indexEnemy = _teams.indexOf(team);
-					// If the player is near a enemy flag
-					if (inRangeOfFlag(player, indexEnemy, 100) && !_flagsTaken.get(indexEnemy) && !player._haveFlagCTF && !player.isDead())
-					{
-						_flagsTaken.set(indexEnemy, true);
-						unspawnFlag(team);
-						player._teamNameHaveFlagCTF = team;
-						addFlagToPlayer(player);
-						player.broadcastUserInfo();
-						player._haveFlagCTF = true;
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + team + " flag taken by " + player.getName() + "...");
-						pointTeamTo(player, team);
-						break;
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-	}
-	
-	/**
-	 * Point team to.
-	 * @param hasFlag the has flag
-	 * @param ourFlag the our flag
-	 */
-	public static void pointTeamTo(PlayerInstance hasFlag, String ourFlag)
-	{
-		try
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if ((player != null) && player.isOnline() && player._teamNameCTF.equals(ourFlag))
-					{
-						player.sendMessage(hasFlag.getName() + " took your flag!");
-						if (player._haveFlagCTF)
-						{
-							player.sendMessage("You can not return the flag to headquarters, until your flag is returned to it's place.");
-							player.sendPacket(new RadarControl(1, 1, player.getX(), player.getY(), player.getZ()));
-						}
-						else
-						{
-							player.sendPacket(new RadarControl(0, 1, hasFlag.getX(), hasFlag.getY(), hasFlag.getZ()));
-							final Radar rdr = new Radar(player);
-							final Radar.RadarOnPlayer radar = rdr.new RadarOnPlayer(hasFlag, player);
-							ThreadPool.schedule(radar, 10000 + Rnd.get(30000));
-						}
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-	}
-	
-	/**
-	 * Adds the or set.
-	 * @param listSize the list size
-	 * @param flagSpawn the flag spawn
-	 * @param flagsTaken the flags taken
-	 * @param flagId the flag id
-	 * @param flagX the flag x
-	 * @param flagY the flag y
-	 * @param flagZ the flag z
-	 */
-	private static void addOrSet(int listSize, Spawn flagSpawn, boolean flagsTaken, int flagId, int flagX, int flagY, int flagZ)
-	{
-		while (_flagsX.size() <= listSize)
-		{
-			_flagSpawns.add(null);
-			_flagsTaken.add(false);
-			_flagIds.add(_FlagNPC);
-			_flagsX.add(0);
-			_flagsY.add(0);
-			_flagsZ.add(0);
-		}
-		_flagSpawns.set(listSize, flagSpawn);
-		_flagsTaken.set(listSize, flagsTaken);
-		_flagIds.set(listSize, flagId);
-		_flagsX.set(listSize, flagX);
-		_flagsY.set(listSize, flagY);
-		_flagsZ.set(listSize, flagZ);
-	}
-	
-	/**
-	 * Used to calculate the event CTF area, so that players don't run off with the flag. Essential, since a player may take the flag just so other teams can't score points. This function is Only called upon ONE time on BEGINING OF EACH EVENT right after we spawn the flags.
-	 */
-	private static void calculateOutSideOfCTF()
-	{
-		if ((_teams == null) || (_flagSpawns == null) || (_teamsX == null) || (_teamsY == null) || (_teamsZ == null))
-		{
-			return;
-		}
-		final int division = _teams.size() * 2;
-		int pos = 0;
-		final int[] locX = new int[division];
-		final int[] locY = new int[division];
-		final int[] locZ = new int[division];
-		// Get all coordinates inorder to create a polygon:
-		for (Spawn flag : _flagSpawns)
-		{
-			if (flag == null)
-			{
-				continue;
-			}
-			
-			locX[pos] = flag.getX();
-			locY[pos] = flag.getY();
-			locZ[pos] = flag.getZ();
-			pos++;
-			if (pos > (division / 2))
-			{
-				break;
-			}
-		}
-		for (int x = 0; x < _teams.size(); x++)
-		{
-			locX[pos] = _teamsX.get(x);
-			locY[pos] = _teamsY.get(x);
-			locZ[pos] = _teamsZ.get(x);
-			pos++;
-			if (pos > division)
-			{
-				break;
-			}
-		}
-		// Find the polygon center, note that it's not the mathematical center of the polygon,
-		// Rather than a point which centers all coordinates:
-		int centerX = 0;
-		int centerY = 0;
-		int centerZ = 0;
-		for (int x = 0; x < pos; x++)
-		{
-			centerX += (locX[x] / division);
-			centerY += (locY[x] / division);
-			centerZ += (locZ[x] / division);
-		}
-		// Now let's find the furthest distance from the "center" to the egg shaped sphere
-		// Surrounding the polygon, size x1.5 (for maximum logical area to wander...):
-		int maxX = 0;
-		int maxY = 0;
-		int maxZ = 0;
-		for (int x = 0; x < pos; x++)
-		{
-			if (maxX < (2 * Math.abs(centerX - locX[x])))
-			{
-				maxX = (2 * Math.abs(centerX - locX[x]));
-			}
-			if (maxY < (2 * Math.abs(centerY - locY[x])))
-			{
-				maxY = (2 * Math.abs(centerY - locY[x]));
-			}
-			if (maxZ < (2 * Math.abs(centerZ - locZ[x])))
-			{
-				maxZ = (2 * Math.abs(centerZ - locZ[x]));
-			}
-		}
-		
-		// CenterX,centerY,centerZ are the coordinates of the "event center".
-		// So let's save those coordinates to check on the players:
-		_eventCenterX = centerX;
-		_eventCenterY = centerY;
-		_eventCenterZ = centerZ;
-		_eventOffset = maxX;
-		if (_eventOffset < maxY)
-		{
-			_eventOffset = maxY;
-		}
-		if (_eventOffset < maxZ)
-		{
-			_eventOffset = maxZ;
-		}
-	}
-	
-	/**
-	 * Checks if is outside ctf area.
-	 * @param player the player
-	 * @return true, if is outside ctf area
-	 */
-	public static boolean isOutsideCTFArea(PlayerInstance player)
-	{
-		return (player == null) || !player.isOnline() || (player.getX() <= (_eventCenterX - _eventOffset)) || (player.getX() >= (_eventCenterX + _eventOffset)) || (player.getY() <= (_eventCenterY - _eventOffset)) || (player.getY() >= (_eventCenterY + _eventOffset)) || (player.getZ() <= (_eventCenterZ - _eventOffset)) || (player.getZ() >= (_eventCenterZ + _eventOffset));
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/DM.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/DM.java
deleted file mode 100644
index 3b5952e933..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/DM.java
+++ /dev/null
@@ -1,2066 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SkillTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.ClassId;
-import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.Ride;
-import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-
-public class DM implements EventTask
-{
-	protected static final Logger LOGGER = Logger.getLogger(DM.class.getName());
-	
-	private static String _eventName = "";
-	private static String _eventDesc = "";
-	private static String _joiningLocationName = "";
-	private static Spawn _npcSpawn;
-	private static boolean _joining = false;
-	private static boolean _teleport = false;
-	private static boolean _started = false;
-	private static boolean _aborted = false;
-	private static boolean _sitForced = false;
-	private static boolean _inProgress = false;
-	protected static int _npcId = 0;
-	protected static int _npcX = 0;
-	protected static int _npcY = 0;
-	protected static int _npcZ = 0;
-	protected static int _npcHeading = 0;
-	protected static int _rewardId = 0;
-	protected static int _rewardAmount = 0;
-	protected static int _minLevel = 0;
-	protected static int _maxLevel = 0;
-	protected static int _joinTime = 0;
-	protected static int _eventTime = 0;
-	protected static int _minPlayers = 0;
-	protected static int _maxPlayers = 0;
-	protected static int _topKills = 0;
-	protected static int _playerColors = 0;
-	protected static int _playerX = 0;
-	protected static int _playerY = 0;
-	protected static int _playerZ = 0;
-	private static long _intervalBetweenMatches = 0;
-	private String startEventTime;
-	protected static boolean _teamEvent = false; // TODO to be integrated
-	public static List<PlayerInstance> _players = new ArrayList<>();
-	public static List<PlayerInstance> _topPlayers = new ArrayList<>();
-	public static List<String> _savePlayers = new ArrayList<>();
-	
-	/**
-	 * Instantiates a new dM.
-	 */
-	private DM()
-	{
-	}
-	
-	/**
-	 * Gets the new instance.
-	 * @return the new instance
-	 */
-	public static DM getNewInstance()
-	{
-		return new DM();
-	}
-	
-	/**
-	 * Gets the _event name.
-	 * @return the _eventName
-	 */
-	public static String getEventName()
-	{
-		return _eventName;
-	}
-	
-	/**
-	 * Set_event name.
-	 * @param eventName the _eventName to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventName(String eventName)
-	{
-		if (!_inProgress)
-		{
-			DM._eventName = eventName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event desc.
-	 * @return the _eventDesc
-	 */
-	public static String getEventDesc()
-	{
-		return _eventDesc;
-	}
-	
-	/**
-	 * Set_event desc.
-	 * @param eventDesc the _eventDesc to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventDesc(String eventDesc)
-	{
-		if (!_inProgress)
-		{
-			DM._eventDesc = eventDesc;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _joining location name.
-	 * @return the _joiningLocationName
-	 */
-	public static String getJoiningLocationName()
-	{
-		return _joiningLocationName;
-	}
-	
-	/**
-	 * Set_joining location name.
-	 * @param joiningLocationName the _joiningLocationName to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoiningLocationName(String joiningLocationName)
-	{
-		if (!_inProgress)
-		{
-			DM._joiningLocationName = joiningLocationName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc id.
-	 * @return the _npcId
-	 */
-	public static int getNpcId()
-	{
-		return _npcId;
-	}
-	
-	/**
-	 * Set_npc id.
-	 * @param npcId the _npcId to set
-	 * @return true, if successful
-	 */
-	public static boolean setNpcId(int npcId)
-	{
-		if (!_inProgress)
-		{
-			DM._npcId = npcId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc location.
-	 * @return the _npc location
-	 */
-	public static Location getNpcLocation()
-	{
-		return new Location(_npcX, _npcY, _npcZ, _npcHeading);
-	}
-	
-	/**
-	 * Gets the _reward id.
-	 * @return the _rewardId
-	 */
-	public static int getRewardId()
-	{
-		return _rewardId;
-	}
-	
-	/**
-	 * Set_reward id.
-	 * @param rewardId the _rewardId to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardId(int rewardId)
-	{
-		if (!_inProgress)
-		{
-			DM._rewardId = rewardId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _reward amount.
-	 * @return the _rewardAmount
-	 */
-	public static int getRewardAmount()
-	{
-		return _rewardAmount;
-	}
-	
-	/**
-	 * Set_reward amount.
-	 * @param rewardAmount the _rewardAmount to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardAmount(int rewardAmount)
-	{
-		if (!_inProgress)
-		{
-			DM._rewardAmount = rewardAmount;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _minLevel.
-	 * @return the _minLevel
-	 */
-	public static int getMinLevel()
-	{
-		return _minLevel;
-	}
-	
-	/**
-	 * Set_minLevel.
-	 * @param minLevel the _minLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinlvl(int minLevel)
-	{
-		if (!_inProgress)
-		{
-			DM._minLevel = minLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _maxLevel.
-	 * @return the _maxLevel
-	 */
-	public static int getMaxLevel()
-	{
-		return _maxLevel;
-	}
-	
-	/**
-	 * Set_maxLevel.
-	 * @param maxLevel the _maxLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxlvl(int maxLevel)
-	{
-		if (!_inProgress)
-		{
-			DM._maxLevel = maxLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _join time.
-	 * @return the _joinTime
-	 */
-	public static int getJoinTime()
-	{
-		return _joinTime;
-	}
-	
-	/**
-	 * Set_join time.
-	 * @param joinTime the _joinTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoinTime(int joinTime)
-	{
-		if (!_inProgress)
-		{
-			DM._joinTime = joinTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event time.
-	 * @return the _eventTime
-	 */
-	public static int getEventTime()
-	{
-		return _eventTime;
-	}
-	
-	/**
-	 * Set_event time.
-	 * @param eventTime the _eventTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventTime(int eventTime)
-	{
-		if (!_inProgress)
-		{
-			DM._eventTime = eventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _min players.
-	 * @return the _minPlayers
-	 */
-	public static int getMinPlayers()
-	{
-		return _minPlayers;
-	}
-	
-	/**
-	 * Set_min players.
-	 * @param minPlayers the _minPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinPlayers(int minPlayers)
-	{
-		if (!_inProgress)
-		{
-			DM._minPlayers = minPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _max players.
-	 * @return the _maxPlayers
-	 */
-	public static int getMaxPlayers()
-	{
-		return _maxPlayers;
-	}
-	
-	/**
-	 * Set_max players.
-	 * @param maxPlayers the _maxPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxPlayers(int maxPlayers)
-	{
-		if (!_inProgress)
-		{
-			DM._maxPlayers = maxPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _interval between matches.
-	 * @return the _intervalBetweenMatchs
-	 */
-	public static long getIntervalBetweenMatches()
-	{
-		return _intervalBetweenMatches;
-	}
-	
-	/**
-	 * Set_interval between matches.
-	 * @param intervalBetweenMatches the _intervalBetweenMatchs to set
-	 * @return true, if successful
-	 */
-	public static boolean setIntervalBetweenMatches(long intervalBetweenMatches)
-	{
-		if (!_inProgress)
-		{
-			DM._intervalBetweenMatches = intervalBetweenMatches;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the start event time.
-	 * @return the startEventTime
-	 */
-	public String getStartEventTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the start event time.
-	 * @param startEventTime the startEventTime to set
-	 * @return true, if successful
-	 */
-	public boolean setStartEventTime(String startEventTime)
-	{
-		if (!_inProgress)
-		{
-			this.startEventTime = startEventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks if is _joining.
-	 * @return the _joining
-	 */
-	public static boolean isJoining()
-	{
-		return _joining;
-	}
-	
-	/**
-	 * Checks if is _teleport.
-	 * @return the _teleport
-	 */
-	public static boolean isTeleport()
-	{
-		return _teleport;
-	}
-	
-	/**
-	 * Checks if is _started.
-	 * @return the _started
-	 */
-	public static boolean hasStarted()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Checks if is _aborted.
-	 * @return the _aborted
-	 */
-	public static boolean isAborted()
-	{
-		return _aborted;
-	}
-	
-	/**
-	 * Checks if is _sit forced.
-	 * @return the _sitForced
-	 */
-	public static boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	/**
-	 * Checks if is _in progress.
-	 * @return the _inProgress
-	 */
-	public static boolean isInProgress()
-	{
-		return _inProgress;
-	}
-	
-	/**
-	 * Check max level.
-	 * @param maxLevel the maxLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxLevel(int maxLevel)
-	{
-		return _minLevel < maxLevel;
-	}
-	
-	/**
-	 * Check min level.
-	 * @param minLevel the minLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMinLevel(int minLevel)
-	{
-		return _maxLevel > minLevel;
-	}
-	
-	/**
-	 * returns true if participated players is higher or equal then minimum needed players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMinPlayers(int players)
-	{
-		return _minPlayers <= players;
-	}
-	
-	/**
-	 * returns true if max players is higher or equal then participated players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxPlayers(int players)
-	{
-		return _maxPlayers > players;
-	}
-	
-	/**
-	 * Check start join ok.
-	 * @return true, if successful
-	 */
-	public static boolean checkStartJoinOk()
-	{
-		if (_started || _teleport || _joining || _eventName.equals("") || _joiningLocationName.equals("") || _eventDesc.equals("") || (_npcId == 0) || (_npcX == 0) || (_npcY == 0) || (_npcZ == 0) || (_rewardId == 0) || (_rewardAmount == 0))
-		{
-			return false;
-		}
-		
-		if (_teamEvent)
-		{
-			if (!checkStartJoinTeamInfo())
-			{
-				return false;
-			}
-		}
-		else if (!checkStartJoinPlayerInfo())
-		{
-			return false;
-		}
-		
-		if (!Config.ALLOW_EVENTS_DURING_OLY && Olympiad.getInstance().inCompPeriod())
-		{
-			return false;
-		}
-		
-		for (Castle castle : CastleManager.getInstance().getCastles())
-		{
-			if ((castle != null) && (castle.getSiege() != null) && castle.getSiege().isInProgress())
-			{
-				return false;
-			}
-		}
-		
-		if (!checkOptionalEventStartJoinOk())
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Check start join team info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinTeamInfo()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Check start join player info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinPlayerInfo()
-	{
-		return (_playerX != 0) && (_playerY != 0) && (_playerZ != 0) && (_playerColors != 0);
-	}
-	
-	/**
-	 * Check auto event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkAutoEventStartJoinOk()
-	{
-		return (_joinTime != 0) && (_eventTime != 0);
-	}
-	
-	/**
-	 * Check optional event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkOptionalEventStartJoinOk()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Sets the npc pos.
-	 * @param player the new npc pos
-	 */
-	public static void setNpcPos(PlayerInstance player)
-	{
-		_npcX = player.getX();
-		_npcY = player.getY();
-		_npcZ = player.getZ();
-		_npcHeading = player.getHeading();
-	}
-	
-	/**
-	 * Spawn event npc.
-	 */
-	private static void spawnEventNpc()
-	{
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_npcId);
-		
-		try
-		{
-			_npcSpawn = new Spawn(tmpl);
-			_npcSpawn.setX(_npcX);
-			_npcSpawn.setY(_npcY);
-			_npcSpawn.setZ(_npcZ);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(_npcHeading);
-			_npcSpawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_npcSpawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			_npcSpawn.getLastSpawn().setTitle(_eventName);
-			_npcSpawn.getLastSpawn()._isEventMobDM = true;
-			_npcSpawn.getLastSpawn().isAggressive();
-			_npcSpawn.getLastSpawn().decayMe();
-			_npcSpawn.getLastSpawn().spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_npcSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_npcSpawn.getLastSpawn(), _npcSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[spawnEventNpc(exception: " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Unspawn event npc.
-	 */
-	private static void unspawnEventNpc()
-	{
-		if ((_npcSpawn == null) || (_npcSpawn.getLastSpawn() == null))
-		{
-			return;
-		}
-		
-		_npcSpawn.getLastSpawn().deleteMe();
-		_npcSpawn.stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_npcSpawn, true);
-	}
-	
-	/**
-	 * Start join.
-	 * @return true, if successful
-	 */
-	public static boolean startJoin()
-	{
-		if (!checkStartJoinOk())
-		{
-			return false;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		spawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Event " + _eventName + "!");
-		if (Config.DM_ANNOUNCE_REWARD && (ItemTable.getInstance().getTemplate(_rewardId) != null))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
-		}
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName);
-		if (Config.DM_COMMAND)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Commands .dmjoin .dmleave .dminfo");
-		}
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": FULL BUFF Event: be ready with your buffs, they won't be deleted!!!");
-		return true;
-	}
-	
-	/**
-	 * Start teleport.
-	 * @return true, if successful
-	 */
-	public static boolean startTeleport()
-	{
-		if (!_joining || _started || _teleport)
-		{
-			return false;
-		}
-		
-		removeOfflinePlayers();
-		
-		if (!_teamEvent)
-		{
-			synchronized (_players)
-			{
-				final int size = _players.size();
-				if (!checkMinPlayers(size))
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + size);
-					if (Config.DM_STATS_LOGGER)
-					{
-						LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + size);
-					}
-					
-					return false;
-				}
-			}
-		}
-		
-		_joining = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport to team spot in 20 seconds!");
-		setUserData();
-		ThreadPool.schedule(() ->
-		{
-			sit();
-			afterTeleportOperations();
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// Remove Summon's buffs
-						if (Config.DM_ON_START_UNSUMMON_PET && (player.getPet() != null))
-						{
-							final Summon summon = player.getPet();
-							summon.stopAllEffects();
-							
-							if (summon instanceof PetInstance)
-							{
-								summon.unSummon(player);
-							}
-						}
-						
-						if (Config.DM_ON_START_REMOVE_ALL_EFFECTS)
-						{
-							player.stopAllEffects();
-						}
-						
-						// Remove player from his party
-						if (player.getParty() != null)
-						{
-							final Party party = player.getParty();
-							party.removePartyMember(player);
-						}
-						
-						if (!_teamEvent)
-						{
-							final int offset = Config.DM_SPAWN_OFFSET;
-							player.teleToLocation(_playerX + Rnd.get(offset), _playerY + Rnd.get(offset), _playerZ);
-						}
-					}
-				}
-			}
-		}, 20000);
-		_teleport = true;
-		return true;
-	}
-	
-	/**
-	 * After teleport operations.
-	 */
-	protected static void afterTeleportOperations()
-	{
-	}
-	
-	/**
-	 * Start event.
-	 * @return true, if successful
-	 */
-	public static boolean startEvent()
-	{
-		if (!startEventOk())
-		{
-			return false;
-		}
-		
-		_teleport = false;
-		sit();
-		removeParties();
-		
-		afterStartOperations();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Started. Go to kill your enemies!");
-		_started = true;
-		return true;
-	}
-	
-	/**
-	 * Removes the parties.
-	 */
-	private static void removeParties()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player.getParty() != null)
-				{
-					final Party party = player.getParty();
-					party.removePartyMember(player);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * After start operations.
-	 */
-	private static void afterStartOperations()
-	{
-	}
-	
-	/**
-	 * Restarts Event checks if event was aborted. and if true cancels restart task
-	 */
-	public static synchronized void restartEvent()
-	{
-		LOGGER.info(_eventName + ": Event has been restarted...");
-		_joining = false;
-		_started = false;
-		_inProgress = false;
-		_aborted = false;
-		final long delay = _intervalBetweenMatches;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": joining period will be avaible again in " + _intervalBetweenMatches + " minute(s)!");
-		waiter(delay);
-		
-		try
-		{
-			if (!_aborted)
-			{
-				autoEvent(); // start a new event
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": next event aborted!");
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + ": Error While Trying to restart Event... " + e);
-		}
-	}
-	
-	/**
-	 * Finish event.
-	 */
-	public static void finishEvent()
-	{
-		if (!finishEventOk())
-		{
-			return;
-		}
-		
-		_started = false;
-		_aborted = false;
-		unspawnEventNpc();
-		
-		afterFinishOperations();
-		
-		if (_teamEvent)
-		{
-			processTopTeam();
-		}
-		else
-		{
-			processTopPlayer();
-			
-			if (_topKills != 0)
-			{
-				String winners = "";
-				for (PlayerInstance winner : _topPlayers)
-				{
-					winners = winners + " " + winner.getName();
-				}
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + winners + " win the match! " + _topKills + " kills.");
-				rewardPlayer();
-				
-				if (Config.DM_STATS_LOGGER)
-				{
-					LOGGER.info("**** " + _eventName + " ****");
-					LOGGER.info(_eventName + ": " + winners + " win the match! " + _topKills + " kills.");
-				}
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": No players win the match(nobody killed).");
-				if (Config.DM_STATS_LOGGER)
-				{
-					LOGGER.info(_eventName + ": No players win the match(nobody killed).");
-				}
-			}
-		}
-		
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish operations.
-	 */
-	private static void afterFinishOperations()
-	{
-	}
-	
-	/**
-	 * Abort event.
-	 */
-	public static void abortEvent()
-	{
-		if (!_joining && !_teleport && !_started)
-		{
-			return;
-		}
-		
-		if (_joining && !_teleport && !_started)
-		{
-			unspawnEventNpc();
-			cleanDM();
-			_joining = false;
-			_inProgress = false;
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-			return;
-		}
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_aborted = true;
-		unspawnEventNpc();
-		
-		afterFinish();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish.
-	 */
-	private static void afterFinish()
-	{
-	}
-	
-	/**
-	 * Teleport finish.
-	 */
-	public static void teleportFinish()
-	{
-		sit();
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport back to participation NPC in 20 seconds!");
-		removeUserData();
-		ThreadPool.schedule(() ->
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						if (player.isOnline())
-						{
-							player.teleToLocation(_npcX, _npcY, _npcZ);
-						}
-						else
-						{
-							try (Connection con = DatabaseFactory.getConnection())
-							{
-								final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=? WHERE char_name=?");
-								statement.setInt(1, _npcX);
-								statement.setInt(2, _npcY);
-								statement.setInt(3, _npcZ);
-								statement.setString(4, player.getName());
-								statement.execute();
-								statement.close();
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning(e.getMessage());
-							}
-						}
-					}
-				}
-			}
-			
-			sit();
-			cleanDM();
-		}, 20000);
-	}
-	
-	/**
-	 * Auto event.
-	 */
-	public static void autoEvent()
-	{
-		LOGGER.info("Starting " + _eventName + "!");
-		LOGGER.info("Matchs Are Restarted At Every: " + getIntervalBetweenMatchs() + " Minutes.");
-		if (checkAutoEventStartJoinOk() && startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				LOGGER.info(_eventName + ": join time <=0 aborting event.");
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(30 * 1000); // 30 sec wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					LOGGER.warning(_eventName + ": waiting.....minutes for event time " + _eventTime);
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-					
-					LOGGER.info(_eventName + ": waiting... delay for final messages ");
-					waiter(60000); // just a give a delay delay for final messages
-					sendFinalMessages();
-					
-					if (!_started && !_aborted) // if is not already started and it's not aborted
-					{
-						LOGGER.info(_eventName + ": waiting.....delay for restart event  " + _intervalBetweenMatches + " minutes.");
-						waiter(60000); // just a give a delay to next restart
-						
-						try
-						{
-							if (!_aborted)
-							{
-								restartEvent();
-							}
-						}
-						catch (Exception e)
-						{
-							LOGGER.warning("Error while tying to Restart Event " + e);
-						}
-					}
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-				restartEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Event once start.
-	 */
-	public static void eventOnceStart()
-	{
-		if (startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(1 * 60 * 1000); // 1 min wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Waiter.
-	 * @param interval the interval
-	 */
-	private static void waiter(long interval)
-	{
-		final long startWaiterTime = Chronos.currentTimeMillis();
-		int seconds = (int) (interval / 1000);
-		
-		while (((startWaiterTime + interval) > Chronos.currentTimeMillis()) && !_aborted)
-		{
-			seconds--; // Here because we don't want to see two time announce at the same time
-			if (_joining || _started || _teleport)
-			{
-				switch (seconds)
-				{
-					case 3600: // 1 hour left
-					{
-						removeOfflinePlayers();
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till event finish!");
-						}
-						break;
-					}
-					case 1800: // 30 minutes left
-					case 900: // 15 minutes left
-					case 600: // 10 minutes left
-					case 300: // 5 minutes left
-					case 240: // 4 minutes left
-					case 180: // 3 minutes left
-					case 120: // 2 minutes left
-					case 60: // 1 minute left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till event finish!");
-						}
-						break;
-					}
-					case 30: // 30 seconds left
-					case 15: // 15 seconds left
-					case 10: // 10 seconds left
-					{
-						removeOfflinePlayers();
-						// fallthrough?
-					}
-					case 3: // 3 seconds left
-					case 2: // 2 seconds left
-					case 1: // 1 seconds left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till registration close!");
-						}
-						else if (_teleport)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " seconds(s) till start fight!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till event finish!");
-						}
-						break;
-					}
-				}
-			}
-			
-			final long startOneSecondWaiterStartTime = Chronos.currentTimeMillis();
-			
-			// Only the try catch with Thread.sleep(1000) give bad countdown on high wait times
-			while ((startOneSecondWaiterStartTime + 1000) > Chronos.currentTimeMillis())
-			{
-				try
-				{
-					Thread.sleep(1);
-				}
-				catch (InterruptedException ie)
-				{
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Sit.
-	 */
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (_sitForced)
-					{
-						player.stopMove(null, false);
-						player.abortAttack();
-						player.abortCast();
-						
-						if (!player.isSitting())
-						{
-							player.sitDown();
-						}
-					}
-					else if (player.isSitting())
-					{
-						player.standUp();
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Removes the offline players.
-	 */
-	public static void removeOfflinePlayers()
-	{
-		try
-		{
-			synchronized (_players)
-			{
-				if ((_players == null) || _players.isEmpty())
-				{
-					return;
-				}
-				
-				final List<PlayerInstance> toBeRemoved = new ArrayList<>();
-				for (PlayerInstance player : _players)
-				{
-					if (player == null)
-					{
-						continue;
-					}
-					
-					if ((player._inEventDM && !player.isOnline()) || player.isInJail() || player.isInOfflineMode())
-					{
-						if (!_joining)
-						{
-							player.getAppearance().setNameColor(player._originalNameColorDM);
-							player.setTitle(player._originalTitleDM);
-							player.setKarma(player._originalKarmaDM);
-							
-							player.broadcastUserInfo();
-						}
-						
-						// after remove, all event data must be cleaned in player
-						player._originalNameColorDM = 0;
-						player._originalTitleDM = null;
-						player._originalKarmaDM = 0;
-						player._countDMkills = 0;
-						player._inEventDM = false;
-						toBeRemoved.add(player);
-						
-						player.sendMessage("Your participation in the DeathMatch event has been removed.");
-					}
-				}
-				_players.removeAll(toBeRemoved);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-	}
-	
-	/**
-	 * Start event ok.
-	 * @return true, if successful
-	 */
-	private static boolean startEventOk()
-	{
-		return !_joining && _teleport && !_started;
-	}
-	
-	/**
-	 * Finish event ok.
-	 * @return true, if successful
-	 */
-	private static boolean finishEventOk()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Adds the player ok.
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	private static boolean addPlayerOk(PlayerInstance eventPlayer)
-	{
-		if (eventPlayer.isAio() && !Config.ALLOW_AIO_IN_EVENTS)
-		{
-			eventPlayer.sendMessage("AIO charactes are not allowed to participate in events :/");
-		}
-		if (eventPlayer._inEventDM)
-		{
-			eventPlayer.sendMessage("You already participated in the event!");
-			return false;
-		}
-		
-		if (eventPlayer._inEventTvT || eventPlayer._inEventCTF)
-		{
-			eventPlayer.sendMessage("You already participated to another event!");
-			return false;
-		}
-		
-		if (Olympiad.getInstance().isRegistered(eventPlayer) || eventPlayer.isInOlympiadMode())
-		{
-			eventPlayer.sendMessage("You already participated in Olympiad!");
-			return false;
-		}
-		
-		if ((eventPlayer._activeBoxes > 1) && !Config.ALLOW_DUALBOX_EVENT)
-		{
-			final List<String> playerBoxes = eventPlayer._activeBoxCharacters;
-			if ((playerBoxes != null) && (playerBoxes.size() > 1))
-			{
-				for (String characterName : playerBoxes)
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(characterName);
-					if ((player != null) && player._inEventDM)
-					{
-						eventPlayer.sendMessage("You already participated in event with another char!");
-						return false;
-					}
-				}
-			}
-		}
-		
-		if (!Config.DM_ALLOW_HEALER_CLASSES && ((eventPlayer.getClassId() == ClassId.CARDINAL) || (eventPlayer.getClassId() == ClassId.EVA_SAINT) || (eventPlayer.getClassId() == ClassId.SHILLIEN_SAINT)))
-		{
-			eventPlayer.sendMessage("You cant join with Healer Class!");
-			return false;
-		}
-		
-		synchronized (_players)
-		{
-			if (_players.contains(eventPlayer))
-			{
-				eventPlayer.sendMessage("You already participated in the event!");
-				return false;
-			}
-			
-			for (PlayerInstance player : _players)
-			{
-				if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-				else if (player.getName().equalsIgnoreCase(eventPlayer.getName()))
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-			}
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Sets the user data.
-	 */
-	public static void setUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player._originalNameColorDM = player.getAppearance().getNameColor();
-				player._originalKarmaDM = player.getKarma();
-				player._originalTitleDM = player.getTitle();
-				player.getAppearance().setNameColor(_playerColors);
-				player.setKarma(0);
-				player.setTitle("Kills: " + player._countDMkills);
-				if (player.isMounted() && player.setMountType(0))
-				{
-					if (player.isFlying())
-					{
-						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
-					}
-					
-					player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
-					player.setMountObjectID(0);
-				}
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * Dump data.
-	 */
-	public static void dumpData()
-	{
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		if (!_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (INACTIVE) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (JOINING) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		else if (!_joining && _teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (TELEPORT) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (!_joining && !_teleport && _started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (STARTED) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		
-		LOGGER.info("Name: " + _eventName);
-		LOGGER.info("Desc: " + _eventDesc);
-		LOGGER.info("Join location: " + _joiningLocationName);
-		LOGGER.info("Min lvl: " + _minLevel);
-		LOGGER.info("Max lvl: " + _maxLevel);
-		
-		LOGGER.info("");
-		LOGGER.info("##################################");
-		LOGGER.info("# _players(List<PlayerInstance>) #");
-		LOGGER.info("##################################");
-		
-		synchronized (_players)
-		{
-			LOGGER.info("Total Players : " + _players.size());
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName() + " kills :" + player._countDMkills);
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("################################");
-		LOGGER.info("# _savePlayers(List<String>) #");
-		LOGGER.info("################################");
-		
-		for (String player : _savePlayers)
-		{
-			LOGGER.info("Name: " + player);
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		dumpLocalEventInfo();
-	}
-	
-	/**
-	 * Dump local event info.
-	 */
-	private static void dumpLocalEventInfo()
-	{
-	}
-	
-	/**
-	 * Load data.
-	 */
-	public static void loadData()
-	{
-		_eventName = "";
-		_eventDesc = "";
-		_joiningLocationName = "";
-		_savePlayers = new ArrayList<>();
-		
-		synchronized (_players)
-		{
-			_players.clear();
-		}
-		
-		_topPlayers = new ArrayList<>();
-		_npcSpawn = null;
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_sitForced = false;
-		_aborted = false;
-		_inProgress = false;
-		_npcId = 0;
-		_npcX = 0;
-		_npcY = 0;
-		_npcZ = 0;
-		_npcHeading = 0;
-		_rewardId = 0;
-		_rewardAmount = 0;
-		_topKills = 0;
-		_minLevel = 0;
-		_maxLevel = 0;
-		_joinTime = 0;
-		_eventTime = 0;
-		_minPlayers = 0;
-		_maxPlayers = 0;
-		_intervalBetweenMatches = 0;
-		_playerColors = 0;
-		_playerX = 0;
-		_playerY = 0;
-		_playerZ = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			ResultSet rs;
-			statement = con.prepareStatement("Select * from dm");
-			rs = statement.executeQuery();
-			
-			while (rs.next())
-			{
-				_eventName = rs.getString("eventName");
-				_eventDesc = rs.getString("eventDesc");
-				_joiningLocationName = rs.getString("joiningLocation");
-				_minLevel = rs.getInt("minLevel");
-				_maxLevel = rs.getInt("maxLevel");
-				_npcId = rs.getInt("npcId");
-				_npcX = rs.getInt("npcX");
-				_npcY = rs.getInt("npcY");
-				_npcZ = rs.getInt("npcZ");
-				_npcHeading = rs.getInt("npcHeading");
-				_rewardId = rs.getInt("rewardId");
-				_rewardAmount = rs.getInt("rewardAmount");
-				_joinTime = rs.getInt("joinTime");
-				_eventTime = rs.getInt("eventTime");
-				_minPlayers = rs.getInt("minPlayers");
-				_maxPlayers = rs.getInt("maxPlayers");
-				_playerColors = rs.getInt("color");
-				_playerX = rs.getInt("playerX");
-				_playerY = rs.getInt("playerY");
-				_playerZ = rs.getInt("playerZ");
-				_intervalBetweenMatches = rs.getInt("delayForNextEvent");
-			}
-			statement.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: DM.loadData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Save data.
-	 */
-	public static void saveData()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			statement = con.prepareStatement("Delete from dm");
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("INSERT INTO dm (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, joinTime, eventTime, minPlayers, maxPlayers, color, playerX, playerY, playerZ, delayForNextEvent ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-			statement.setString(1, _eventName);
-			statement.setString(2, _eventDesc);
-			statement.setString(3, _joiningLocationName);
-			statement.setInt(4, _minLevel);
-			statement.setInt(5, _maxLevel);
-			statement.setInt(6, _npcId);
-			statement.setInt(7, _npcX);
-			statement.setInt(8, _npcY);
-			statement.setInt(9, _npcZ);
-			statement.setInt(10, _npcHeading);
-			statement.setInt(11, _rewardId);
-			statement.setInt(12, _rewardAmount);
-			statement.setInt(13, _joinTime);
-			statement.setInt(14, _eventTime);
-			statement.setInt(15, _minPlayers);
-			statement.setInt(16, _maxPlayers);
-			statement.setInt(17, _playerColors);
-			statement.setInt(18, _playerX);
-			statement.setInt(19, _playerY);
-			statement.setInt(20, _playerZ);
-			statement.setLong(21, _intervalBetweenMatches);
-			statement.execute();
-			statement.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: DM.saveData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Show event html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 */
-	public static void showEventHtml(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><title>" + _eventName + "</title><body>");
-			replyMSG.append("<center><img src=\"L2UI_CH3.herotower_deco\" width=256 height=32></center><br1>");
-			replyMSG.append("<center><font color=\"3366CC\">Current event:</font></center><br1>");
-			replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
-			replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
-			replyMSG.append("<center>Event Type:&nbsp;<font color=\"00FF00\"> Full Buff Event!!! </font></center><br><br>");
-			
-			synchronized (_players)
-			{
-				if (!_started && !_joining)
-				{
-					replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
-				}
-				else if (!checkMaxPlayers(_players.size()))
-				{
-					if (!_started)
-					{
-						replyMSG.append("Currently participated: <font color=\"00FF00\">" + _players.size() + ".</font><br>");
-						replyMSG.append("Max players: <font color=\"00FF00\">" + _maxPlayers + "</font><br><br>");
-						replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-					}
-				}
-				else if (eventPlayer.isCursedWeaponEquiped() && !Config.DM_JOIN_CURSED)
-				{
-					replyMSG.append("<font color=\"FFFF00\">You can't participate to this event with a cursed Weapon.</font><br>");
-				}
-				else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
-				{
-					if (_players.contains(eventPlayer))
-					{
-						replyMSG.append("<center><font color=\"3366CC\">You participated already!</font></center><br><br>");
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _players.size() + "</font></center><br>");
-						replyMSG.append("<table border=\"0\"><tr>");
-						replyMSG.append("<td width=\"200\">Wait till event start or</td>");
-						replyMSG.append("<td width=\"60\"><center><button value=\"remove\" action=\"bypass -h npc_" + objectId + "_dmevent_player_leave\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></td>");
-						replyMSG.append("<td width=\"100\">your participation!</td>");
-						replyMSG.append("</tr></table>");
-					}
-					else
-					{
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _players.size() + "</font></center><br>");
-						replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
-						replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
-						replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
-						replyMSG.append("<center><button value=\"Join\" action=\"bypass -h npc_" + objectId + "_dmevent_player_join\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center><br>");
-					}
-				}
-				else if (_started && !_joining)
-				{
-					replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
-				}
-				else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
-				{
-					replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
-					replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
-					replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
-					replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-				}
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			eventPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Adds the player.
-	 * @param player the player
-	 */
-	public static void addPlayer(PlayerInstance player)
-	{
-		if (!addPlayerOk(player))
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			_players.add(player);
-		}
-		
-		player._inEventDM = true;
-		player._countDMkills = 0;
-		_savePlayers.add(player.getName());
-		player.sendMessage("DM: You successfully registered for the DeathMatch event.");
-	}
-	
-	/**
-	 * Removes the player.
-	 * @param player the player
-	 */
-	public static void removePlayer(PlayerInstance player)
-	{
-		if ((player != null) && player._inEventDM)
-		{
-			if (!_joining)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorDM);
-				player.setTitle(player._originalTitleDM);
-				player.setKarma(player._originalKarmaDM);
-				
-				player.broadcastUserInfo();
-			}
-			
-			// after remove, all event data must be cleaned in player
-			player._originalNameColorDM = 0;
-			player._originalTitleDM = null;
-			player._originalKarmaDM = 0;
-			player._countDMkills = 0;
-			player._inEventDM = false;
-			
-			synchronized (_players)
-			{
-				_players.remove(player);
-			}
-			
-			player.sendMessage("Your participation in the DeathMatch event has been removed.");
-		}
-	}
-	
-	/**
-	 * Clean dm.
-	 */
-	public static void cleanDM()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					cleanEventPlayer(player);
-					
-					if (player._inEventDM)
-					{
-						if (!_joining)
-						{
-							player.getAppearance().setNameColor(player._originalNameColorDM);
-							player.setTitle(player._originalTitleDM);
-							player.setKarma(player._originalKarmaDM);
-							
-							player.broadcastUserInfo();
-						}
-						
-						// after remove, all event data must be cleaned in player
-						player._originalNameColorDM = 0;
-						player._originalTitleDM = null;
-						player._originalKarmaDM = 0;
-						player._countDMkills = 0;
-						player._inEventDM = false;
-						player.sendMessage("Your participation in the DeathMatch event has been removed.");
-					}
-					
-					if (_savePlayers.contains(player.getName()))
-					{
-						_savePlayers.remove(player.getName());
-					}
-					player._inEventDM = false;
-				}
-			}
-			
-			_players.clear();
-		}
-		
-		_topKills = 0;
-		_savePlayers = new ArrayList<>();
-		_topPlayers = new ArrayList<>();
-		cleanLocalEventInfo();
-		
-		_inProgress = false;
-		loadData();
-	}
-	
-	/**
-	 * Clean local event info.
-	 */
-	private static void cleanLocalEventInfo()
-	{
-		// nothing
-	}
-	
-	/**
-	 * Clean event player.
-	 * @param player the player
-	 */
-	private static void cleanEventPlayer(PlayerInstance player)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Adds the disconnected player.
-	 * @param player the player
-	 */
-	public static void addDisconnectedPlayer(PlayerInstance player)
-	{
-		synchronized (_players)
-		{
-			if (!_players.contains(player) && _savePlayers.contains(player.getName()))
-			{
-				if (Config.DM_ON_START_REMOVE_ALL_EFFECTS)
-				{
-					player.stopAllEffects();
-				}
-				
-				_players.add(player);
-				
-				player._originalNameColorDM = player.getAppearance().getNameColor();
-				player._originalTitleDM = player.getTitle();
-				player._originalKarmaDM = player.getKarma();
-				player._inEventDM = true;
-				player._countDMkills = 0;
-				if (_teleport || _started)
-				{
-					player.setTitle("Kills: " + player._countDMkills);
-					player.getAppearance().setNameColor(_playerColors);
-					player.setKarma(0);
-					player.broadcastUserInfo();
-					player.teleToLocation(_playerX + Rnd.get(Config.DM_SPAWN_OFFSET), _playerY + Rnd.get(Config.DM_SPAWN_OFFSET), _playerZ);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Gets the _player colors.
-	 * @return the _playerColors
-	 */
-	public static int getPlayerColors()
-	{
-		return _playerColors;
-	}
-	
-	/**
-	 * Set_player colors.
-	 * @param playerColors the _playerColors to set
-	 * @return true, if successful
-	 */
-	public static boolean setPlayerColors(int playerColors)
-	{
-		if (!_inProgress)
-		{
-			DM._playerColors = playerColors;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Reward player.
-	 */
-	public static void rewardPlayer()
-	{
-		for (PlayerInstance _topPlayer : _topPlayers)
-		{
-			_topPlayer.addItem("DM Event: " + _eventName, _rewardId, _rewardAmount, _topPlayer, true);
-			
-			final StatusUpdate su = new StatusUpdate(_topPlayer.getObjectId());
-			su.addAttribute(StatusUpdate.CUR_LOAD, _topPlayer.getCurrentLoad());
-			_topPlayer.sendPacket(su);
-			
-			final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("");
-			replyMSG.append("<html><body>You won the event. Look in your inventory for the reward.</body></html>");
-			nhm.setHtml(replyMSG.toString());
-			_topPlayer.sendPacket(nhm);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			_topPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-	}
-	
-	/**
-	 * Process top player.
-	 */
-	private static void processTopPlayer()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player._countDMkills > _topKills)
-				{
-					_topPlayers.clear();
-					_topPlayers.add(player);
-					_topKills = player._countDMkills;
-				}
-				else if (player._countDMkills == _topKills)
-				{
-					if (!_topPlayers.contains(player))
-					{
-						_topPlayers.add(player);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Process top team.
-	 */
-	private static void processTopTeam()
-	{
-	}
-	
-	/**
-	 * Gets the _players spawn location.
-	 * @return the _players spawn location
-	 */
-	public static Location getPlayersSpawnLocation()
-	{
-		return new Location(_playerX + Rnd.get(Config.DM_SPAWN_OFFSET), _playerY + Rnd.get(Config.DM_SPAWN_OFFSET), _playerZ, 0);
-	}
-	
-	/**
-	 * Sets the players pos.
-	 * @param player the new players pos
-	 */
-	public static void setPlayersPos(PlayerInstance player)
-	{
-		_playerX = player.getX();
-		_playerY = player.getY();
-		_playerZ = player.getZ();
-	}
-	
-	/**
-	 * Removes the user data.
-	 */
-	public static void removeUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorDM);
-				player.setTitle(player._originalTitleDM);
-				player.setKarma(player._originalKarmaDM);
-				player._inEventDM = false;
-				player._countDMkills = 0;
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * just an announcer to send termination messages.
-	 */
-	public static void sendFinalMessages()
-	{
-		if (!_started && !_aborted)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Thank you For participating!");
-		}
-	}
-	
-	/**
-	 * returns the interval between each event.
-	 * @return the interval between matchs
-	 */
-	public static int getIntervalBetweenMatchs()
-	{
-		final long actualTime = Chronos.currentTimeMillis();
-		final long totalTime = actualTime + _intervalBetweenMatches;
-		final long interval = totalTime - actualTime;
-		final int seconds = (int) (interval / 1000);
-		return seconds / 60;
-	}
-	
-	/**
-	 * Sets the event start time.
-	 * @param newTime the new event start time
-	 */
-	public void setEventStartTime(String newTime)
-	{
-		startEventTime = newTime;
-	}
-	
-	@Override
-	public String getEventIdentifier()
-	{
-		return _eventName;
-	}
-	
-	@Override
-	public void run()
-	{
-		LOGGER.info("DM: Event notification start");
-		eventOnceStart();
-	}
-	
-	@Override
-	public String getEventStartTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * On disconnect.
-	 * @param player the player
-	 */
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventDM)
-		{
-			removePlayer(player);
-			player.teleToLocation(_npcX, _npcY, _npcZ);
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/EventManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/EventManager.java
deleted file mode 100644
index c671c2c61a..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/EventManager.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-/**
- * @author Shyla
- */
-public class EventManager
-{
-	protected static final Logger LOGGER = Logger.getLogger(EventManager.class.getName());
-	
-	private static final String EVENT_MANAGER_CONFIGURATION_FILE = "./config/events/EventManager.ini";
-	
-	public static boolean TVT_EVENT_ENABLED;
-	public static List<String> TVT_TIMES_LIST;
-	
-	public static boolean CTF_EVENT_ENABLED;
-	public static List<String> CTF_TIMES_LIST;
-	
-	public static boolean DM_EVENT_ENABLED;
-	public static List<String> DM_TIMES_LIST;
-	
-	private static EventManager instance = null;
-	
-	private EventManager()
-	{
-		loadConfiguration();
-	}
-	
-	public static EventManager getInstance()
-	{
-		if (instance == null)
-		{
-			instance = new EventManager();
-		}
-		return instance;
-	}
-	
-	public static void loadConfiguration()
-	{
-		InputStream is = null;
-		try
-		{
-			final Properties eventSettings = new Properties();
-			is = new FileInputStream(new File(EVENT_MANAGER_CONFIGURATION_FILE));
-			eventSettings.load(is);
-			
-			TVT_EVENT_ENABLED = Boolean.parseBoolean(eventSettings.getProperty("TVTEventEnabled", "false"));
-			TVT_TIMES_LIST = new ArrayList<>();
-			String[] propertySplit;
-			propertySplit = eventSettings.getProperty("TVTStartTime", "").split(";");
-			for (String time : propertySplit)
-			{
-				TVT_TIMES_LIST.add(time);
-			}
-			
-			CTF_EVENT_ENABLED = Boolean.parseBoolean(eventSettings.getProperty("CTFEventEnabled", "false"));
-			CTF_TIMES_LIST = new ArrayList<>();
-			propertySplit = eventSettings.getProperty("CTFStartTime", "").split(";");
-			for (String time : propertySplit)
-			{
-				CTF_TIMES_LIST.add(time);
-			}
-			
-			DM_EVENT_ENABLED = Boolean.parseBoolean(eventSettings.getProperty("DMEventEnabled", "false"));
-			DM_TIMES_LIST = new ArrayList<>();
-			propertySplit = eventSettings.getProperty("DMStartTime", "").split(";");
-			for (String time : propertySplit)
-			{
-				DM_TIMES_LIST.add(time);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.toString());
-		}
-		finally
-		{
-			if (is != null)
-			{
-				try
-				{
-					is.close();
-				}
-				catch (IOException e)
-				{
-					LOGGER.warning(e.toString());
-				}
-			}
-		}
-	}
-	
-	public void startEventRegistration()
-	{
-		if (TVT_EVENT_ENABLED)
-		{
-			registerTvT();
-		}
-		
-		if (CTF_EVENT_ENABLED)
-		{
-			registerCTF();
-		}
-		
-		if (DM_EVENT_ENABLED)
-		{
-			registerDM();
-		}
-	}
-	
-	private void registerTvT()
-	{
-		TvT.loadData();
-		if (!TvT.checkStartJoinOk())
-		{
-			LOGGER.warning("registerTvT: TvT Event is not setted Properly");
-		}
-		
-		EventsGlobalTask.getInstance().clearEventTasksByEventName(TvT.getEventName());
-		
-		for (String time : TVT_TIMES_LIST)
-		{
-			final TvT newInstance = TvT.getNewInstance();
-			newInstance.setEventStartTime(time);
-			EventsGlobalTask.getInstance().registerNewEventTask(newInstance);
-		}
-	}
-	
-	private void registerCTF()
-	{
-		CTF.loadData();
-		if (!CTF.checkStartJoinOk())
-		{
-			LOGGER.warning("registerCTF: CTF Event is not setted Properly");
-		}
-		
-		EventsGlobalTask.getInstance().clearEventTasksByEventName(CTF.getEventName());
-		
-		for (String time : CTF_TIMES_LIST)
-		{
-			final CTF newInstance = CTF.getNewInstance();
-			newInstance.setEventStartTime(time);
-			EventsGlobalTask.getInstance().registerNewEventTask(newInstance);
-		}
-	}
-	
-	private void registerDM()
-	{
-		DM.loadData();
-		if (!DM.checkStartJoinOk())
-		{
-			LOGGER.warning("registerDM: DM Event is not setted Properly");
-		}
-		
-		EventsGlobalTask.getInstance().clearEventTasksByEventName(DM.getEventName());
-		
-		for (String time : DM_TIMES_LIST)
-		{
-			final DM newInstance = DM.getNewInstance();
-			newInstance.setEventStartTime(time);
-			EventsGlobalTask.getInstance().registerNewEventTask(newInstance);
-		}
-	}
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
deleted file mode 100644
index 21f3dee2ac..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.util.EventData;
-
-public class GameEvent
-{
-	protected static final Logger LOGGER = Logger.getLogger(GameEvent.class.getName());
-	
-	public static final Map<Integer, LinkedList<String>> players = new ConcurrentHashMap<>();
-	public static final Map<String, EventData> connectionLossData = new ConcurrentHashMap<>();
-	public static final Map<Integer, String> names = new ConcurrentHashMap<>();
-	public static final List<String> participatingPlayers = new LinkedList<>();
-	public static final List<String> npcs = new LinkedList<>();
-	public static String eventName = "";
-	public static int teamsNumber = 0;
-	public static boolean active = false;
-	public static int id = 12760;
-	
-	public static int getTeamOfPlayer(String name)
-	{
-		for (int i = 1; i <= players.size(); i++)
-		{
-			final LinkedList<String> temp = players.get(i);
-			final Iterator<String> it = temp.iterator();
-			
-			while (it.hasNext())
-			{
-				if (it.next().equals(name))
-				{
-					return i;
-				}
-			}
-		}
-		return 0;
-	}
-	
-	public static String[] getTopNKillers(int n)
-	{
-		// this will return top N players sorted by kills, first element in the array will be the one with more kills
-		final String[] killers = new String[n];
-		String playerTemp = "";
-		int kills = 0;
-		
-		final LinkedList<String> killersTemp = new LinkedList<>();
-		for (int k = 0; k < n; k++)
-		{
-			kills = 0;
-			for (int i = 1; i <= teamsNumber; i++)
-			{
-				final LinkedList<String> temp = players.get(i);
-				final Iterator<String> it = temp.iterator();
-				
-				while (it.hasNext())
-				{
-					try
-					{
-						final PlayerInstance player = World.getInstance().getPlayer(it.next());
-						if (!killersTemp.contains(player.getName()) && (player.kills.size() > kills))
-						{
-							kills = player.kills.size();
-							playerTemp = player.getName();
-						}
-					}
-					catch (Exception e)
-					{
-					}
-				}
-			}
-			
-			killersTemp.add(playerTemp);
-		}
-		
-		for (int i = 0; i < n; i++)
-		{
-			kills = 0;
-			final Iterator<String> it = killersTemp.iterator();
-			
-			while (it.hasNext())
-			{
-				try
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(it.next());
-					if (player.kills.size() > kills)
-					{
-						kills = player.kills.size();
-						playerTemp = player.getName();
-					}
-				}
-				catch (Exception e)
-				{
-				}
-			}
-			
-			killers[i] = playerTemp;
-			killersTemp.remove(playerTemp);
-		}
-		
-		return killers;
-	}
-	
-	public static void showEventHtml(PlayerInstance player, String objectid)
-	{
-		FileInputStream fis = null;
-		BufferedInputStream buff = null;
-		DataInputStream in = null;
-		InputStreamReader isr = null;
-		BufferedReader inbr = null;
-		
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			fis = new FileInputStream("data/events/" + eventName);
-			buff = new BufferedInputStream(fis);
-			in = new DataInputStream(buff);
-			isr = new InputStreamReader(in);
-			inbr = new BufferedReader(isr);
-			
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("<center><font color=\"LEVEL\">" + eventName + "</font><font color=\"FF0000\"> bY " + inbr.readLine() + "</font></center><br>");
-			replyMSG.append("<br>" + inbr.readLine());
-			if (participatingPlayers.contains(player.getName()))
-			{
-				replyMSG.append("<br><center>You are already in the event players list !!</center></body></html>");
-			}
-			else
-			{
-				replyMSG.append("<br><center><button value=\"Participate !! \" action=\"bypass -h npc_" + objectid + "_event_participate\" width=90 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></center></body></html>");
-			}
-			
-			adminReply.setHtml(replyMSG.toString());
-			player.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-		finally
-		{
-			if (inbr != null)
-			{
-				try
-				{
-					inbr.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (isr != null)
-			{
-				try
-				{
-					isr.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (in != null)
-			{
-				try
-				{
-					in.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (buff != null)
-			{
-				try
-				{
-					buff.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-			
-			if (fis != null)
-			{
-				try
-				{
-					fis.close();
-				}
-				catch (Exception e1)
-				{
-					LOGGER.warning(e1.toString());
-				}
-			}
-		}
-	}
-	
-	public static void spawn(PlayerInstance target, int npcid)
-	{
-		final NpcTemplate template1 = NpcTable.getInstance().getTemplate(npcid);
-		
-		try
-		{
-			final Spawn spawn = new Spawn(template1);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
-			spawn.setAmount(1);
-			spawn.setHeading(target.getHeading());
-			spawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(spawn, false);
-			spawn.init();
-			spawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			spawn.getLastSpawn().setName("event inscriptor");
-			spawn.getLastSpawn().setTitle(eventName);
-			spawn.getLastSpawn().isEventMob = true;
-			spawn.getLastSpawn().isAggressive();
-			spawn.getLastSpawn().decayMe();
-			spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ());
-			spawn.getLastSpawn().broadcastPacket(new MagicSkillUse(spawn.getLastSpawn(), spawn.getLastSpawn(), 1034, 1, 1, 1));
-			npcs.add(String.valueOf(spawn.getLastSpawn().getObjectId()));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-	}
-	
-	public static void announceAllPlayers(String text)
-	{
-		final CreatureSay cs = new CreatureSay(0, ChatType.ANNOUNCEMENT, "", text);
-		for (PlayerInstance player : World.getInstance().getAllPlayers())
-		{
-			player.sendPacket(cs);
-		}
-	}
-	
-	public static boolean isOnEvent(PlayerInstance player)
-	{
-		for (int k = 0; k < teamsNumber; k++)
-		{
-			final Iterator<String> it = players.get(k + 1).iterator();
-			boolean temp = false;
-			
-			while (it.hasNext())
-			{
-				temp = player.getName().equalsIgnoreCase(it.next());
-				if (temp)
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public static void inscribePlayer(PlayerInstance player)
-	{
-		try
-		{
-			participatingPlayers.add(player.getName());
-			player.eventKarma = player.getKarma();
-			player.eventX = player.getX();
-			player.eventY = player.getY();
-			player.eventZ = player.getZ();
-			player.eventPkKills = player.getPkKills();
-			player.eventPvpKills = player.getPvpKills();
-			player.eventTitle = player.getTitle();
-			player.kills.clear();
-			player.atEvent = true;
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("error when signing in the event:" + e.getMessage());
-		}
-	}
-	
-	public static void restoreChar(PlayerInstance player)
-	{
-		try
-		{
-			player.eventX = connectionLossData.get(player.getName()).eventX;
-			player.eventY = connectionLossData.get(player.getName()).eventY;
-			player.eventZ = connectionLossData.get(player.getName()).eventZ;
-			player.eventKarma = connectionLossData.get(player.getName()).eventKarma;
-			player.eventPvpKills = connectionLossData.get(player.getName()).eventPvpKills;
-			player.eventPkKills = connectionLossData.get(player.getName()).eventPkKills;
-			player.eventTitle = connectionLossData.get(player.getName()).eventTitle;
-			player.kills = connectionLossData.get(player.getName()).kills;
-			player.eventSitForced = connectionLossData.get(player.getName()).eventSitForced;
-			player.atEvent = true;
-		}
-		catch (Exception e)
-		{
-		}
-	}
-	
-	public static void restoreAndTeleChar(PlayerInstance target)
-	{
-		try
-		{
-			restoreChar(target);
-			target.setTitle(target.eventTitle);
-			target.setKarma(target.eventKarma);
-			target.setPvpKills(target.eventPvpKills);
-			target.setPkKills(target.eventPkKills);
-			target.teleToLocation(target.eventX, target.eventY, target.eventZ);
-			target.kills.clear();
-			target.eventSitForced = false;
-			target.atEvent = false;
-		}
-		catch (Exception e)
-		{
-		}
-	}
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/TvT.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/TvT.java
deleted file mode 100644
index e09c975194..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/TvT.java
+++ /dev/null
@@ -1,2781 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SkillTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.data.xml.DoorData;
-import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.model.siege.Castle;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.Ride;
-import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
-
-public class TvT implements EventTask
-{
-	protected static final Logger LOGGER = Logger.getLogger(TvT.class.getName());
-	
-	protected static String _eventName = "";
-	protected static String _eventDesc = "";
-	protected static String _joiningLocationName = "";
-	private static Spawn _npcSpawn;
-	protected static boolean _joining = false;
-	protected static boolean _teleport = false;
-	protected static boolean _started = false;
-	protected static boolean _aborted = false;
-	protected static boolean _sitForced = false;
-	protected static boolean _inProgress = false;
-	protected static int _npcId = 0;
-	protected static int _npcX = 0;
-	protected static int _npcY = 0;
-	protected static int _npcZ = 0;
-	protected static int _npcHeading = 0;
-	protected static int _rewardId = 0;
-	protected static int _rewardAmount = 0;
-	protected static int _minLevel = 0;
-	protected static int _maxLevel = 0;
-	protected static int _joinTime = 0;
-	protected static int _eventTime = 0;
-	protected static int _minPlayers = 0;
-	protected static int _maxPlayers = 0;
-	protected static long _intervalBetweenMatches = 0;
-	private String startEventTime;
-	private static boolean _teamEvent = true; // TODO to be integrated
-	public static List<PlayerInstance> _players = new ArrayList<>();
-	private static String _topTeam = "";
-	public static List<PlayerInstance> _playersShuffle = new ArrayList<>();
-	public static List<String> _teams = new ArrayList<>();
-	public static List<String> _savePlayers = new ArrayList<>();
-	public static List<String> _savePlayerTeams = new ArrayList<>();
-	public static List<Integer> _teamPlayersCount = new ArrayList<>();
-	public static List<Integer> _teamColors = new ArrayList<>();
-	public static List<Integer> _teamsX = new ArrayList<>();
-	public static List<Integer> _teamsY = new ArrayList<>();
-	public static List<Integer> _teamsZ = new ArrayList<>();
-	public static List<Integer> _teamPointsCount = new ArrayList<>();
-	public static int _topKills = 0;
-	
-	/**
-	 * Instantiates a new tvt.
-	 */
-	private TvT()
-	{
-	}
-	
-	/**
-	 * Gets the new instance.
-	 * @return the new instance
-	 */
-	public static TvT getNewInstance()
-	{
-		return new TvT();
-	}
-	
-	/**
-	 * Gets the _event name.
-	 * @return the _eventName
-	 */
-	public static String getEventName()
-	{
-		return _eventName;
-	}
-	
-	/**
-	 * Set_event name.
-	 * @param eventName the _eventName to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventName(String eventName)
-	{
-		if (!_inProgress)
-		{
-			TvT._eventName = eventName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event desc.
-	 * @return the _eventDesc
-	 */
-	public static String getEventDesc()
-	{
-		return _eventDesc;
-	}
-	
-	/**
-	 * Set_event desc.
-	 * @param eventDesc the _eventDesc to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventDesc(String eventDesc)
-	{
-		if (!_inProgress)
-		{
-			TvT._eventDesc = eventDesc;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _joining location name.
-	 * @return the _joiningLocationName
-	 */
-	public static String getJoiningLocationName()
-	{
-		return _joiningLocationName;
-	}
-	
-	/**
-	 * Set_joining location name.
-	 * @param joiningLocationName the _joiningLocationName to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoiningLocationName(String joiningLocationName)
-	{
-		if (!_inProgress)
-		{
-			TvT._joiningLocationName = joiningLocationName;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc id.
-	 * @return the _npcId
-	 */
-	public static int getNpcId()
-	{
-		return _npcId;
-	}
-	
-	/**
-	 * Set_npc id.
-	 * @param npcId the _npcId to set
-	 * @return true, if successful
-	 */
-	public static boolean setNpcId(int npcId)
-	{
-		if (!_inProgress)
-		{
-			TvT._npcId = npcId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _npc location.
-	 * @return the _npc location
-	 */
-	public static Location getNpcLocation()
-	{
-		return new Location(_npcX, _npcY, _npcZ, _npcHeading);
-	}
-	
-	/**
-	 * Gets the _reward id.
-	 * @return the _rewardId
-	 */
-	public static int getRewardId()
-	{
-		return _rewardId;
-	}
-	
-	/**
-	 * Set_reward id.
-	 * @param rewardId the _rewardId to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardId(int rewardId)
-	{
-		if (!_inProgress)
-		{
-			TvT._rewardId = rewardId;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _reward amount.
-	 * @return the _rewardAmount
-	 */
-	public static int getRewardAmount()
-	{
-		return _rewardAmount;
-	}
-	
-	/**
-	 * Set_reward amount.
-	 * @param rewardAmount the _rewardAmount to set
-	 * @return true, if successful
-	 */
-	public static boolean setRewardAmount(int rewardAmount)
-	{
-		if (!_inProgress)
-		{
-			TvT._rewardAmount = rewardAmount;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _minLevel.
-	 * @return the _minLevel
-	 */
-	public static int getMinLevel()
-	{
-		return _minLevel;
-	}
-	
-	/**
-	 * Set_minLevel.
-	 * @param minLevel the _minLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinlvl(int minLevel)
-	{
-		if (!_inProgress)
-		{
-			TvT._minLevel = minLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _maxLevel.
-	 * @return the _maxLevel
-	 */
-	public static int getMaxLevel()
-	{
-		return _maxLevel;
-	}
-	
-	/**
-	 * Set_maxLevel.
-	 * @param maxLevel the _maxLevel to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxlvl(int maxLevel)
-	{
-		if (!_inProgress)
-		{
-			TvT._maxLevel = maxLevel;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _join time.
-	 * @return the _joinTime
-	 */
-	public static int getJoinTime()
-	{
-		return _joinTime;
-	}
-	
-	/**
-	 * Set_join time.
-	 * @param joinTime the _joinTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setJoinTime(int joinTime)
-	{
-		if (!_inProgress)
-		{
-			TvT._joinTime = joinTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _event time.
-	 * @return the _eventTime
-	 */
-	public static int getEventTime()
-	{
-		return _eventTime;
-	}
-	
-	/**
-	 * Set_event time.
-	 * @param eventTime the _eventTime to set
-	 * @return true, if successful
-	 */
-	public static boolean setEventTime(int eventTime)
-	{
-		if (!_inProgress)
-		{
-			TvT._eventTime = eventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _min players.
-	 * @return the _minPlayers
-	 */
-	public static int getMinPlayers()
-	{
-		return _minPlayers;
-	}
-	
-	/**
-	 * Set_min players.
-	 * @param minPlayers the _minPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMinPlayers(int minPlayers)
-	{
-		if (!_inProgress)
-		{
-			TvT._minPlayers = minPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _max players.
-	 * @return the _maxPlayers
-	 */
-	public static int getMaxPlayers()
-	{
-		return _maxPlayers;
-	}
-	
-	/**
-	 * Set_max players.
-	 * @param maxPlayers the _maxPlayers to set
-	 * @return true, if successful
-	 */
-	public static boolean setMaxPlayers(int maxPlayers)
-	{
-		if (!_inProgress)
-		{
-			TvT._maxPlayers = maxPlayers;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the _interval between matches.
-	 * @return the _intervalBetweenMatches
-	 */
-	public static long getIntervalBetweenMatches()
-	{
-		return _intervalBetweenMatches;
-	}
-	
-	/**
-	 * Set_interval between matches.
-	 * @param intervalBetweenMatches the _intervalBetweenMatches to set
-	 * @return true, if successful
-	 */
-	public static boolean setIntervalBetweenMatches(long intervalBetweenMatches)
-	{
-		if (!_inProgress)
-		{
-			TvT._intervalBetweenMatches = intervalBetweenMatches;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the start event time.
-	 * @return the startEventTime
-	 */
-	public String getStartEventTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the start event time.
-	 * @param startEventTime the startEventTime to set
-	 * @return true, if successful
-	 */
-	public boolean setStartEventTime(String startEventTime)
-	{
-		if (!_inProgress)
-		{
-			this.startEventTime = startEventTime;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks if is _joining.
-	 * @return the _joining
-	 */
-	public static boolean isJoining()
-	{
-		return _joining;
-	}
-	
-	/**
-	 * Checks if is _teleport.
-	 * @return the _teleport
-	 */
-	public static boolean isTeleport()
-	{
-		return _teleport;
-	}
-	
-	/**
-	 * Checks if is _started.
-	 * @return the _started
-	 */
-	public static boolean isStarted()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Checks if is _aborted.
-	 * @return the _aborted
-	 */
-	public static boolean isAborted()
-	{
-		return _aborted;
-	}
-	
-	/**
-	 * Checks if is _sit forced.
-	 * @return the _sitForced
-	 */
-	public static boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	/**
-	 * Checks if is _in progress.
-	 * @return the _inProgress
-	 */
-	public static boolean isInProgress()
-	{
-		return _inProgress;
-	}
-	
-	/**
-	 * Check max level.
-	 * @param maxLevel the maxLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxLevel(int maxLevel)
-	{
-		return _minLevel < maxLevel;
-	}
-	
-	/**
-	 * Check min level.
-	 * @param minLevel the minLevel
-	 * @return true, if successful
-	 */
-	public static boolean checkMinLevel(int minLevel)
-	{
-		return _maxLevel > minLevel;
-	}
-	
-	/**
-	 * returns true if participated players is higher or equal then minimum needed players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMinPlayers(int players)
-	{
-		return _minPlayers <= players;
-	}
-	
-	/**
-	 * returns true if max players is higher or equal then participated players.
-	 * @param players the players
-	 * @return true, if successful
-	 */
-	public static boolean checkMaxPlayers(int players)
-	{
-		return _maxPlayers > players;
-	}
-	
-	/**
-	 * Check start join ok.
-	 * @return true, if successful
-	 */
-	public static boolean checkStartJoinOk()
-	{
-		if (_started || _teleport || _joining || _eventName.equals("") || _joiningLocationName.equals("") || _eventDesc.equals("") || (_npcId == 0) || (_npcX == 0) || (_npcY == 0) || (_npcZ == 0) || (_rewardId == 0) || (_rewardAmount == 0))
-		{
-			return false;
-		}
-		
-		if (_teamEvent)
-		{
-			if (!checkStartJoinTeamInfo())
-			{
-				return false;
-			}
-		}
-		else if (!checkStartJoinPlayerInfo())
-		{
-			return false;
-		}
-		
-		if (!Config.ALLOW_EVENTS_DURING_OLY && Olympiad.getInstance().inCompPeriod())
-		{
-			return false;
-		}
-		
-		for (Castle castle : CastleManager.getInstance().getCastles())
-		{
-			if ((castle != null) && (castle.getSiege() != null) && castle.getSiege().isInProgress())
-			{
-				return false;
-			}
-		}
-		
-		if (!checkOptionalEventStartJoinOk())
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Check start join team info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinTeamInfo()
-	{
-		return (_teams.size() >= 2) && !_teamsX.contains(0) && !_teamsY.contains(0) && !_teamsZ.contains(0);
-	}
-	
-	/**
-	 * Check start join player info.
-	 * @return true, if successful
-	 */
-	private static boolean checkStartJoinPlayerInfo()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Check auto event start join ok.
-	 * @return true, if successful
-	 */
-	protected static boolean checkAutoEventStartJoinOk()
-	{
-		return (_joinTime != 0) && (_eventTime != 0);
-	}
-	
-	/**
-	 * Check optional event start join ok.
-	 * @return true, if successful
-	 */
-	private static boolean checkOptionalEventStartJoinOk()
-	{
-		// TODO be integrated
-		return true;
-	}
-	
-	/**
-	 * Sets the npc pos.
-	 * @param player the new npc pos
-	 */
-	public static void setNpcPos(PlayerInstance player)
-	{
-		_npcX = player.getX();
-		_npcY = player.getY();
-		_npcZ = player.getZ();
-		_npcHeading = player.getHeading();
-	}
-	
-	/**
-	 * Spawn event npc.
-	 */
-	private static void spawnEventNpc()
-	{
-		final NpcTemplate tmpl = NpcTable.getInstance().getTemplate(_npcId);
-		
-		try
-		{
-			_npcSpawn = new Spawn(tmpl);
-			_npcSpawn.setX(_npcX);
-			_npcSpawn.setY(_npcY);
-			_npcSpawn.setZ(_npcZ);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(_npcHeading);
-			_npcSpawn.setRespawnDelay(1);
-			
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_npcSpawn.getLastSpawn().getStatus().setCurrentHp(999999999);
-			_npcSpawn.getLastSpawn().setTitle(_eventName);
-			_npcSpawn.getLastSpawn()._isEventMobTvT = true;
-			_npcSpawn.getLastSpawn().isAggressive();
-			_npcSpawn.getLastSpawn().decayMe();
-			_npcSpawn.getLastSpawn().spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_npcSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_npcSpawn.getLastSpawn(), _npcSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[spawnEventNpc(exception: " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Unspawn event npc.
-	 */
-	private static void unspawnEventNpc()
-	{
-		if ((_npcSpawn == null) || (_npcSpawn.getLastSpawn() == null))
-		{
-			return;
-		}
-		
-		_npcSpawn.getLastSpawn().deleteMe();
-		_npcSpawn.stopRespawn();
-		SpawnTable.getInstance().deleteSpawn(_npcSpawn, true);
-	}
-	
-	/**
-	 * Start join.
-	 * @return true, if successful
-	 */
-	public static boolean startJoin()
-	{
-		if (!checkStartJoinOk())
-		{
-			return false;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		spawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Event " + _eventName + "!");
-		if (Config.TVT_ANNOUNCE_REWARD && (ItemTable.getInstance().getTemplate(_rewardId) != null))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
-		}
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + ".");
-		if (Config.TVT_COMMAND)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Commands .tvtjoin .tvtleave .tvtinfo");
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Start teleport.
-	 * @return true, if successful
-	 */
-	public static boolean startTeleport()
-	{
-		if (!_joining || _started || _teleport)
-		{
-			return false;
-		}
-		
-		removeOfflinePlayers();
-		
-		if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && checkMinPlayers(_playersShuffle.size()))
-		{
-			shuffleTeams();
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && !checkMinPlayers(_playersShuffle.size()))
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-			if (Config.CTF_STATS_LOGGER)
-			{
-				LOGGER.info(_eventName + ":Not enough players for event. Min Requested : " + _minPlayers + ", Participating : " + _playersShuffle.size());
-			}
-			
-			return false;
-		}
-		
-		_joining = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport to team spot in 20 seconds!");
-		setUserData();
-		ThreadPool.schedule(() ->
-		{
-			sit();
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						// Remove Summon's buffs
-						if (Config.TVT_ON_START_UNSUMMON_PET && (player.getPet() != null))
-						{
-							final Summon summon = player.getPet();
-							summon.stopAllEffects();
-							
-							if (summon instanceof PetInstance)
-							{
-								summon.unSummon(player);
-							}
-						}
-						
-						if (Config.TVT_ON_START_REMOVE_ALL_EFFECTS)
-						{
-							player.stopAllEffects();
-						}
-						
-						// Remove player from his party
-						if (player.getParty() != null)
-						{
-							final Party party = player.getParty();
-							party.removePartyMember(player);
-						}
-						
-						player.teleToLocation((_teamsX.get(_teams.indexOf(player._teamNameTvT)) + Rnd.get(201)) - 100, (_teamsY.get(_teams.indexOf(player._teamNameTvT)) + Rnd.get(201)) - 100, _teamsZ.get(_teams.indexOf(player._teamNameTvT)));
-					}
-				}
-			}
-		}, 20000);
-		_teleport = true;
-		return true;
-	}
-	
-	/**
-	 * Start event.
-	 * @return true, if successful
-	 */
-	public static boolean startEvent()
-	{
-		if (!startEventOk())
-		{
-			return false;
-		}
-		
-		_teleport = false;
-		sit();
-		
-		if (Config.TVT_CLOSE_FORT_DOORS)
-		{
-			closeFortDoors();
-		}
-		
-		if (Config.TVT_CLOSE_ADEN_COLOSSEUM_DOORS)
-		{
-			closeAdenColosseumDoors();
-		}
-		
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Started. Go to kill your enemies!");
-		_started = true;
-		return true;
-	}
-	
-	/**
-	 * Restarts Event checks if event was aborted. and if true cancels restart task
-	 */
-	public static synchronized void restartEvent()
-	{
-		LOGGER.info(_eventName + ": Event has been restarted...");
-		_joining = false;
-		_started = false;
-		_inProgress = false;
-		_aborted = false;
-		final long delay = _intervalBetweenMatches;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": joining period will be avaible again in " + _intervalBetweenMatches + " minute(s)!");
-		waiter(delay);
-		
-		try
-		{
-			if (!_aborted)
-			{
-				autoEvent(); // start a new event
-			}
-			else
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": next event aborted!");
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + ": Error While Trying to restart Event... " + e);
-		}
-	}
-	
-	/**
-	 * Finish event.
-	 */
-	public static void finishEvent()
-	{
-		if (!finishEventOk())
-		{
-			return;
-		}
-		
-		_started = false;
-		_aborted = false;
-		unspawnEventNpc();
-		
-		afterFinishOperations();
-		
-		if (_teamEvent)
-		{
-			processTopTeam();
-			synchronized (_players)
-			{
-				final PlayerInstance bestKiller = findBestKiller(_players);
-				final PlayerInstance looser = findLooser(_players);
-				if (_topKills != 0)
-				{
-					playKneelAnimation(_topTeam);
-					
-					if (Config.TVT_ANNOUNCE_TEAM_STATS)
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + " Team Statistics:");
-						for (String team : _teams)
-						{
-							final int _kills = teamKillsCount(team);
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Team: " + team + " - Kills: " + _kills);
-						}
-						
-						if (bestKiller != null)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Top killer: " + bestKiller.getName() + " - Kills: " + bestKiller._countTvTkills);
-						}
-						if ((looser != null) && (!looser.equals(bestKiller)))
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Top looser: " + looser.getName() + " - Dies: " + looser._countTvTdies);
-						}
-					}
-					
-					if (_topTeam != null)
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + _topTeam + "'s win the match! " + _topKills + " kills.");
-					}
-					else
-					{
-						AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: " + _topKills + " kills by each team!");
-					}
-					rewardTeam(_topTeam, bestKiller, looser);
-					if (Config.TVT_STATS_LOGGER)
-					{
-						LOGGER.info("**** " + _eventName + " ****");
-						LOGGER.info(_eventName + " Team Statistics:");
-						for (String team : _teams)
-						{
-							final int _kills = teamKillsCount(team);
-							LOGGER.info("Team: " + team + " - Kills: " + _kills);
-						}
-						
-						if (bestKiller != null)
-						{
-							LOGGER.info("Top killer: " + bestKiller.getName() + " - Kills: " + bestKiller._countTvTkills);
-						}
-						if ((looser != null) && (!looser.equals(bestKiller)))
-						{
-							LOGGER.info("Top looser: " + looser.getName() + " - Dies: " + looser._countTvTdies);
-						}
-						
-						LOGGER.info(_eventName + ": " + _topTeam + "'s win the match! " + _topKills + " kills.");
-					}
-				}
-				else
-				{
-					AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": The event finished with a TIE: No team wins the match(nobody killed)!");
-					if (Config.TVT_STATS_LOGGER)
-					{
-						LOGGER.info(_eventName + ": No team win the match(nobody killed).");
-					}
-					
-					rewardTeam(_topTeam, bestKiller, looser);
-				}
-			}
-		}
-		else
-		{
-			processTopPlayer();
-		}
-		
-		teleportFinish();
-	}
-	
-	/**
-	 * After finish operations.
-	 */
-	private static void afterFinishOperations()
-	{
-		if (Config.TVT_OPEN_FORT_DOORS)
-		{
-			openFortDoors();
-		}
-		
-		if (Config.TVT_OPEN_ADEN_COLOSSEUM_DOORS)
-		{
-			openAdenColosseumDoors();
-		}
-	}
-	
-	/**
-	 * Abort event.
-	 */
-	public static void abortEvent()
-	{
-		if (!_joining && !_teleport && !_started)
-		{
-			return;
-		}
-		
-		if (_joining && !_teleport && !_started)
-		{
-			unspawnEventNpc();
-			cleanTvT();
-			_joining = false;
-			_inProgress = false;
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-			return;
-		}
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_aborted = true;
-		unspawnEventNpc();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Match aborted!");
-		teleportFinish();
-	}
-	
-	/**
-	 * Teleport finish.
-	 */
-	public static void teleportFinish()
-	{
-		sit();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Teleport back to participation NPC in 20 seconds!");
-		ThreadPool.schedule(() ->
-		{
-			synchronized (_players)
-			{
-				for (PlayerInstance player : _players)
-				{
-					if (player != null)
-					{
-						if (player.isOnline())
-						{
-							player.teleToLocation(_npcX, _npcY, _npcZ);
-						}
-						else
-						{
-							try (Connection con = DatabaseFactory.getConnection())
-							{
-								final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=? WHERE char_name=?");
-								statement.setInt(1, _npcX);
-								statement.setInt(2, _npcY);
-								statement.setInt(3, _npcZ);
-								statement.setString(4, player.getName());
-								statement.execute();
-								statement.close();
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning(e.getMessage());
-							}
-						}
-					}
-				}
-			}
-			
-			sit();
-			cleanTvT();
-		}, 20000);
-	}
-	
-	protected static class AutoEventTask implements Runnable
-	{
-		@Override
-		public void run()
-		{
-			LOGGER.info("Starting " + _eventName + "!");
-			LOGGER.info("Matchs Are Restarted At Every: " + getIntervalBetweenMatchs() + " Minutes.");
-			if (checkAutoEventStartJoinOk() && startJoin() && !_aborted)
-			{
-				if (_joinTime > 0)
-				{
-					waiter(_joinTime * 60 * 1000); // minutes for join event
-				}
-				else if (_joinTime <= 0)
-				{
-					LOGGER.info(_eventName + ": join time <=0 aborting event.");
-					abortEvent();
-					return;
-				}
-				if (startTeleport() && !_aborted)
-				{
-					waiter(30 * 1000); // 30 sec wait time until start fight after teleported
-					if (startEvent() && !_aborted)
-					{
-						LOGGER.warning(_eventName + ": waiting.....minutes for event time " + _eventTime);
-						waiter(_eventTime * 60 * 1000); // minutes for event time
-						finishEvent();
-						
-						LOGGER.info(_eventName + ": waiting... delay for final messages ");
-						waiter(60000); // just a give a delay delay for final messages
-						sendFinalMessages();
-						
-						if (!_started && !_aborted) // if is not already started and it's not aborted
-						{
-							LOGGER.info(_eventName + ": waiting.....delay for restart event  " + _intervalBetweenMatches + " minutes.");
-							waiter(60000); // just a give a delay to next restart
-							
-							try
-							{
-								if (!_aborted)
-								{
-									restartEvent();
-								}
-							}
-							catch (Exception e)
-							{
-								LOGGER.warning("Error while tying to Restart Event " + e);
-							}
-						}
-					}
-				}
-				else if (!_aborted)
-				{
-					abortEvent();
-					restartEvent();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Auto event.
-	 */
-	public static void autoEvent()
-	{
-		ThreadPool.execute(new AutoEventTask());
-	}
-	
-	/**
-	 * Event once start.
-	 */
-	public static void eventOnceStart()
-	{
-		if (startJoin() && !_aborted)
-		{
-			if (_joinTime > 0)
-			{
-				waiter(_joinTime * 60 * 1000); // minutes for join event
-			}
-			else if (_joinTime <= 0)
-			{
-				abortEvent();
-				return;
-			}
-			if (startTeleport() && !_aborted)
-			{
-				waiter(1 * 60 * 1000); // 1 min wait time untill start fight after teleported
-				if (startEvent() && !_aborted)
-				{
-					waiter(_eventTime * 60 * 1000); // minutes for event time
-					finishEvent();
-				}
-			}
-			else if (!_aborted)
-			{
-				abortEvent();
-			}
-		}
-	}
-	
-	/**
-	 * Waiter.
-	 * @param interval the interval
-	 */
-	protected static void waiter(long interval)
-	{
-		final long startWaiterTime = Chronos.currentTimeMillis();
-		int seconds = (int) (interval / 1000);
-		
-		while (((startWaiterTime + interval) > Chronos.currentTimeMillis()) && !_aborted)
-		{
-			seconds--; // Here because we don't want to see two time announce at the same time
-			if (_joining || _started || _teleport)
-			{
-				switch (seconds)
-				{
-					case 3600: // 1 hour left
-					{
-						removeOfflinePlayers();
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60 / 60) + " hour(s) till event finish!");
-						}
-						break;
-					}
-					case 1800: // 30 minutes left
-					case 900: // 15 minutes left
-					case 600: // 10 minutes left
-					case 300: // 5 minutes left
-					case 240: // 4 minutes left
-					case 180: // 3 minutes left
-					case 120: // 2 minutes left
-					case 60: // 1 minute left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + "!");
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till registration close!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + (seconds / 60) + " minute(s) till event finish!");
-						}
-						break;
-					}
-					case 30: // 30 seconds left
-					case 15: // 15 seconds left
-					case 10: // 10 seconds left
-					{
-						removeOfflinePlayers();
-						// fallthrough?
-					}
-					case 3: // 3 seconds left
-					case 2: // 2 seconds left
-					case 1: // 1 seconds left
-					{
-						if (_joining)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till registration close!");
-						}
-						else if (_teleport)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " seconds(s) till start fight!");
-						}
-						else if (_started)
-						{
-							AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": " + seconds + " second(s) till event finish!");
-						}
-						break;
-					}
-				}
-			}
-			
-			final long startOneSecondWaiterStartTime = Chronos.currentTimeMillis();
-			
-			// Only the try catch with Thread.sleep(1000) give bad countdown on high wait times
-			while ((startOneSecondWaiterStartTime + 1000) > Chronos.currentTimeMillis())
-			{
-				try
-				{
-					Thread.sleep(1);
-				}
-				catch (InterruptedException e)
-				{
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Sit.
-	 */
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (_sitForced)
-					{
-						player.stopMove(null, false);
-						player.abortAttack();
-						player.abortCast();
-						
-						if (!player.isSitting())
-						{
-							player.sitDown();
-						}
-					}
-					else if (player.isSitting())
-					{
-						player.standUp();
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Removes the offline players.
-	 */
-	public static void removeOfflinePlayers()
-	{
-		try
-		{
-			if ((_playersShuffle == null) || _playersShuffle.isEmpty())
-			{
-				return;
-			}
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player == null)
-				{
-					_playersShuffle.remove(player);
-				}
-				else if (!player.isOnline() || player.isInJail() || player.isInOfflineMode())
-				{
-					removePlayer(player);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-		}
-	}
-	
-	/**
-	 * Start event ok.
-	 * @return true, if successful
-	 */
-	private static boolean startEventOk()
-	{
-		if (_joining || !_teleport || _started)
-		{
-			return false;
-		}
-		
-		if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-		{
-			if (_teamPlayersCount.contains(0))
-			{
-				return false;
-			}
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			final List<PlayerInstance> playersShuffleTemp = new ArrayList<>();
-			int loopCount = 0;
-			loopCount = _playersShuffle.size();
-			for (int i = 0; i < loopCount; i++)
-			{
-				playersShuffleTemp.add(_playersShuffle.get(i));
-			}
-			
-			_playersShuffle = playersShuffleTemp;
-			playersShuffleTemp.clear();
-		}
-		return true;
-	}
-	
-	/**
-	 * Finish event ok.
-	 * @return true, if successful
-	 */
-	private static boolean finishEventOk()
-	{
-		return _started;
-	}
-	
-	/**
-	 * Adds the player ok.
-	 * @param teamName the team name
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	private static boolean addPlayerOk(String teamName, PlayerInstance eventPlayer)
-	{
-		if (eventPlayer.isAio() && !Config.ALLOW_AIO_IN_EVENTS)
-		{
-			eventPlayer.sendMessage("AIO charactes are not allowed to participate in events :/");
-		}
-		if (checkShufflePlayers(eventPlayer) || eventPlayer._inEventTvT)
-		{
-			eventPlayer.sendMessage("You already participated in the event!");
-			return false;
-		}
-		
-		if (eventPlayer._inEventCTF || eventPlayer._inEventDM)
-		{
-			eventPlayer.sendMessage("You already participated in another event!");
-			return false;
-		}
-		
-		if (Olympiad.getInstance().isRegistered(eventPlayer) || eventPlayer.isInOlympiadMode())
-		{
-			eventPlayer.sendMessage("You already participated in Olympiad!");
-			return false;
-		}
-		
-		if ((eventPlayer._activeBoxes > 1) && !Config.ALLOW_DUALBOX_EVENT)
-		{
-			final List<String> playerBoxes = eventPlayer._activeBoxCharacters;
-			if ((playerBoxes != null) && (playerBoxes.size() > 1))
-			{
-				for (String character_name : playerBoxes)
-				{
-					final PlayerInstance player = World.getInstance().getPlayer(character_name);
-					if ((player != null) && player._inEventTvT)
-					{
-						eventPlayer.sendMessage("You already participated in event with another char!");
-						return false;
-					}
-				}
-			}
-		}
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-				else if (player.getName().equalsIgnoreCase(eventPlayer.getName()))
-				{
-					eventPlayer.sendMessage("You already participated in the event!");
-					return false;
-				}
-			}
-			
-			if (_players.contains(eventPlayer))
-			{
-				eventPlayer.sendMessage("You already participated in the event!");
-				return false;
-			}
-		}
-		
-		if (Config.TVT_EVEN_TEAMS.equals("NO"))
-		{
-			return true;
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-		{
-			boolean allTeamsEqual = true;
-			int countBefore = -1;
-			for (int playersCount : _teamPlayersCount)
-			{
-				if (countBefore == -1)
-				{
-					countBefore = playersCount;
-				}
-				
-				if (countBefore != playersCount)
-				{
-					allTeamsEqual = false;
-					break;
-				}
-				
-				countBefore = playersCount;
-			}
-			
-			if (allTeamsEqual)
-			{
-				return true;
-			}
-			
-			countBefore = Integer.MAX_VALUE;
-			for (int teamPlayerCount : _teamPlayersCount)
-			{
-				if (teamPlayerCount < countBefore)
-				{
-					countBefore = teamPlayerCount;
-				}
-			}
-			
-			final List<String> joinableTeams = new ArrayList<>();
-			for (String team : _teams)
-			{
-				if (teamPlayersCount(team) == countBefore)
-				{
-					joinableTeams.add(team);
-				}
-			}
-			
-			if (joinableTeams.contains(teamName))
-			{
-				return true;
-			}
-		}
-		else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			return true;
-		}
-		
-		eventPlayer.sendMessage("Too many players in team \"" + teamName + "\"");
-		return false;
-	}
-	
-	/**
-	 * Sets the user data.
-	 */
-	public static void setUserData()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				player._originalNameColorTvT = player.getAppearance().getNameColor();
-				player._originalKarmaTvT = player.getKarma();
-				player._originalTitleTvT = player.getTitle();
-				player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameTvT)));
-				player.setKarma(0);
-				player.setTitle("Kills: " + player._countTvTkills);
-				if (Config.TVT_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(_teams.indexOf(player._teamNameTvT) + 1);
-				}
-				
-				if (player.isMounted() && player.setMountType(0))
-				{
-					if (player.isFlying())
-					{
-						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
-					}
-					
-					player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));
-					player.setMountObjectID(0);
-				}
-				player.broadcastUserInfo();
-			}
-		}
-	}
-	
-	/**
-	 * Dump data.
-	 */
-	public static void dumpData()
-	{
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		if (!_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (INACTIVE) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (_joining && !_teleport && !_started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (JOINING) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		else if (!_joining && _teleport && !_started)
-		{
-			LOGGER.info("<<---------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (TELEPORT) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^^----->>");
-		}
-		else if (!_joining && !_teleport && _started)
-		{
-			LOGGER.info("<<--------------------------------->>");
-			LOGGER.info(">> " + _eventName + " Engine infos dump (STARTED) <<");
-			LOGGER.info("<<--^----^^-----^----^^------^----->>");
-		}
-		
-		LOGGER.info("Name: " + _eventName);
-		LOGGER.info("Desc: " + _eventDesc);
-		LOGGER.info("Join location: " + _joiningLocationName);
-		LOGGER.info("Min lvl: " + _minLevel);
-		LOGGER.info("Max lvl: " + _maxLevel);
-		LOGGER.info("");
-		LOGGER.info("##########################");
-		LOGGER.info("# _teams(List<String>) #");
-		LOGGER.info("##########################");
-		
-		for (String team : _teams)
-		{
-			LOGGER.info(team + " Kills Done :" + _teamPointsCount.get(_teams.indexOf(team)));
-		}
-		
-		if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-		{
-			LOGGER.info("");
-			LOGGER.info("#########################################");
-			LOGGER.info("# _playersShuffle(List<PlayerInstance>) #");
-			LOGGER.info("#########################################");
-			
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName());
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("##################################");
-		LOGGER.info("# _players(List<PlayerInstance>) #");
-		LOGGER.info("##################################");
-		
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					LOGGER.info("Name: " + player.getName() + "   Team: " + player._teamNameTvT + "  Kills Done:" + player._countTvTkills);
-				}
-			}
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("#####################################################################");
-		LOGGER.info("# _savePlayers(List<String>) and _savePlayerTeams(List<String>) #");
-		LOGGER.info("#####################################################################");
-		
-		for (String player : _savePlayers)
-		{
-			LOGGER.info("Name: " + player + "	Team: " + _savePlayerTeams.get(_savePlayers.indexOf(player)));
-		}
-		
-		LOGGER.info("");
-		LOGGER.info("");
-		
-		dumpLocalEventInfo();
-	}
-	
-	/**
-	 * Dump local event info.
-	 */
-	private static void dumpLocalEventInfo()
-	{
-	}
-	
-	/**
-	 * Load data.
-	 */
-	public static void loadData()
-	{
-		_eventName = "";
-		_eventDesc = "";
-		_joiningLocationName = "";
-		_savePlayers = new ArrayList<>();
-		_players = new ArrayList<>();
-		_topTeam = "";
-		_teams = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_playersShuffle = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamColors = new ArrayList<>();
-		_teamsX = new ArrayList<>();
-		_teamsY = new ArrayList<>();
-		_teamsZ = new ArrayList<>();
-		_joining = false;
-		_teleport = false;
-		_started = false;
-		_sitForced = false;
-		_aborted = false;
-		_inProgress = false;
-		_npcId = 0;
-		_npcX = 0;
-		_npcY = 0;
-		_npcZ = 0;
-		_npcHeading = 0;
-		_rewardId = 0;
-		_rewardAmount = 0;
-		_topKills = 0;
-		_minLevel = 0;
-		_maxLevel = 0;
-		_joinTime = 0;
-		_eventTime = 0;
-		_minPlayers = 0;
-		_maxPlayers = 0;
-		_intervalBetweenMatches = 0;
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			ResultSet rs;
-			statement = con.prepareStatement("Select * from tvt");
-			rs = statement.executeQuery();
-			int teams = 0;
-			
-			while (rs.next())
-			{
-				_eventName = rs.getString("eventName");
-				_eventDesc = rs.getString("eventDesc");
-				_joiningLocationName = rs.getString("joiningLocation");
-				_minLevel = rs.getInt("minLevel");
-				_maxLevel = rs.getInt("maxLevel");
-				_npcId = rs.getInt("npcId");
-				_npcX = rs.getInt("npcX");
-				_npcY = rs.getInt("npcY");
-				_npcZ = rs.getInt("npcZ");
-				_npcHeading = rs.getInt("npcHeading");
-				_rewardId = rs.getInt("rewardId");
-				_rewardAmount = rs.getInt("rewardAmount");
-				teams = rs.getInt("teamsCount");
-				_joinTime = rs.getInt("joinTime");
-				_eventTime = rs.getInt("eventTime");
-				_minPlayers = rs.getInt("minPlayers");
-				_maxPlayers = rs.getInt("maxPlayers");
-				_intervalBetweenMatches = rs.getLong("delayForNextEvent");
-			}
-			statement.close();
-			
-			int index = -1;
-			if (teams > 0)
-			{
-				index = 0;
-			}
-			while ((index < teams) && (index > -1))
-			{
-				statement = con.prepareStatement("Select * from tvt_teams where teamId = ?");
-				statement.setInt(1, index);
-				rs = statement.executeQuery();
-				while (rs.next())
-				{
-					_teams.add(rs.getString("teamName"));
-					_teamPlayersCount.add(0);
-					_teamPointsCount.add(0);
-					_teamColors.add(0);
-					_teamsX.add(0);
-					_teamsY.add(0);
-					_teamsZ.add(0);
-					_teamsX.set(index, rs.getInt("teamX"));
-					_teamsY.set(index, rs.getInt("teamY"));
-					_teamsZ.set(index, rs.getInt("teamZ"));
-					_teamColors.set(index, rs.getInt("teamColor"));
-				}
-				index++;
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: loadData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Save data.
-	 */
-	public static void saveData()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement;
-			statement = con.prepareStatement("Delete from tvt");
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("INSERT INTO tvt (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)");
-			statement.setString(1, _eventName);
-			statement.setString(2, _eventDesc);
-			statement.setString(3, _joiningLocationName);
-			statement.setInt(4, _minLevel);
-			statement.setInt(5, _maxLevel);
-			statement.setInt(6, _npcId);
-			statement.setInt(7, _npcX);
-			statement.setInt(8, _npcY);
-			statement.setInt(9, _npcZ);
-			statement.setInt(10, _npcHeading);
-			statement.setInt(11, _rewardId);
-			statement.setInt(12, _rewardAmount);
-			statement.setInt(13, _teams.size());
-			statement.setInt(14, _joinTime);
-			statement.setInt(15, _eventTime);
-			statement.setInt(16, _minPlayers);
-			statement.setInt(17, _maxPlayers);
-			statement.setLong(18, _intervalBetweenMatches);
-			statement.execute();
-			statement.close();
-			
-			statement = con.prepareStatement("Delete from tvt_teams");
-			statement.execute();
-			statement.close();
-			
-			for (String teamName : _teams)
-			{
-				final int index = _teams.indexOf(teamName);
-				if (index == -1)
-				{
-					con.close();
-					return;
-				}
-				statement = con.prepareStatement("INSERT INTO tvt_teams (teamId ,teamName, teamX, teamY, teamZ, teamColor) VALUES (?, ?, ?, ?, ?, ?)");
-				statement.setInt(1, index);
-				statement.setString(2, teamName);
-				statement.setInt(3, _teamsX.get(index));
-				statement.setInt(4, _teamsY.get(index));
-				statement.setInt(5, _teamsZ.get(index));
-				statement.setInt(6, _teamColors.get(index));
-				statement.execute();
-				statement.close();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Exception: saveData(): " + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Show event html.
-	 * @param eventPlayer the event player
-	 * @param objectId the object id
-	 */
-	public static void showEventHtml(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><title>" + _eventName + "</title><body>");
-			replyMSG.append("<center><img src=\"L2UI_CH3.herotower_deco\" width=256 height=32></center><br1>");
-			replyMSG.append("<center><font color=\"3366CC\">Current event:</font></center><br1>");
-			replyMSG.append("<center>Name:&nbsp;<font color=\"00FF00\">" + _eventName + "</font></center><br1>");
-			replyMSG.append("<center>Description:&nbsp;<font color=\"00FF00\">" + _eventDesc + "</font></center><br><br>");
-			if (!_started && !_joining)
-			{
-				replyMSG.append("<center>Wait till the admin/gm start the participation.</center>");
-			}
-			else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && !checkMaxPlayers(_playersShuffle.size()))
-			{
-				if (!_started)
-				{
-					replyMSG.append("Currently participated: <font color=\"00FF00\">" + _playersShuffle.size() + ".</font><br>");
-					replyMSG.append("Max players: <font color=\"00FF00\">" + _maxPlayers + "</font><br><br>");
-					replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-				}
-			}
-			else if (eventPlayer.isCursedWeaponEquiped() && !Config.TVT_JOIN_CURSED)
-			{
-				replyMSG.append("<font color=\"FFFF00\">You can't participate to this event with a cursed Weapon.</font><br>");
-			}
-			else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
-			{
-				synchronized (_players)
-				{
-					if (_players.contains(eventPlayer) || _playersShuffle.contains(eventPlayer) || checkShufflePlayers(eventPlayer))
-					{
-						if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("You participated already in team <font color=\"LEVEL\">" + eventPlayer._teamNameTvT + "</font><br><br>");
-						}
-						else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center><font color=\"3366CC\">You participated already!</font></center><br><br>");
-						}
-						
-						replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _playersShuffle.size() + "</font></center><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Wait till event start or remove your participation!</font><center>");
-						replyMSG.append("<center><button value=\"Remove\" action=\"bypass -h npc_" + objectId + "_tvt_player_leave\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-					}
-					else
-					{
-						replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
-						replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
-						replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
-						replyMSG.append("<center><font color=\"3366CC\">Teams:</font></center><br>");
-						if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-						{
-							replyMSG.append("<center><table border=\"0\">");
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font>&nbsp;(" + teamPlayersCount(team) + " joined)</td>");
-								replyMSG.append("<center><td width=\"60\"><button value=\"Join\" action=\"bypass -h npc_" + objectId + "_tvt_player_join " + team + "\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center></td></tr>");
-							}
-							replyMSG.append("</table></center>");
-						}
-						else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-						{
-							replyMSG.append("<center>");
-							
-							for (String team : _teams)
-							{
-								replyMSG.append("<tr><td width=\"100\"><font color=\"LEVEL\">" + team + "</font> &nbsp;</td>");
-							}
-							
-							replyMSG.append("</center><br>");
-							
-							replyMSG.append("<center><button value=\"Join Event\" action=\"bypass -h npc_" + objectId + "_tvt_player_join eventShuffle\" width=85 height=21 back=\"L2UI_ch3.Btn1_normalOn\" fore=\"L2UI_ch3.Btn1_normal\"></center>");
-							replyMSG.append("<center><font color=\"3366CC\">Teams will be reandomly generated!</font></center><br>");
-							replyMSG.append("<center>Joined Players:</font> <font color=\"LEVEL\">" + _playersShuffle.size() + "</center></font><br>");
-							replyMSG.append("<center>Reward: <font color=\"LEVEL\">" + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName() + "</center></font>");
-						}
-					}
-				}
-			}
-			else if (_started && !_joining)
-			{
-				replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
-			}
-			else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
-			{
-				replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
-				replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
-				replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
-				replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-			
-			// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-			eventPlayer.sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(_eventName + " Engine[showEventHtlm(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	/**
-	 * Adds the player.
-	 * @param player the player
-	 * @param teamName the team name
-	 */
-	public static void addPlayer(PlayerInstance player, String teamName)
-	{
-		if (!addPlayerOk(teamName, player))
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
-			{
-				player._teamNameTvT = teamName;
-				_players.add(player);
-				setTeamPlayersCount(teamName, teamPlayersCount(teamName) + 1);
-			}
-			else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE"))
-			{
-				_playersShuffle.add(player);
-			}
-		}
-		
-		player._inEventTvT = true;
-		player._countTvTkills = 0;
-		player.sendMessage(_eventName + ": You successfully registered for the event.");
-	}
-	
-	/**
-	 * Removes the player.
-	 * @param player the player
-	 */
-	public static void removePlayer(PlayerInstance player)
-	{
-		if (player._inEventTvT)
-		{
-			if (!_joining)
-			{
-				player.getAppearance().setNameColor(player._originalNameColorTvT);
-				player.setTitle(player._originalTitleTvT);
-				player.setKarma(player._originalKarmaTvT);
-				if (Config.TVT_AURA && (_teams.size() >= 2))
-				{
-					player.setTeam(0); // clear aura :P
-				}
-				player.broadcastUserInfo();
-			}
-			
-			// after remove, all event data must be cleaned in player
-			player._originalNameColorTvT = 0;
-			player._originalTitleTvT = null;
-			player._originalKarmaTvT = 0;
-			player._teamNameTvT = "";
-			player._countTvTkills = 0;
-			player._inEventTvT = false;
-			
-			synchronized (_players)
-			{
-				if ((Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE")) && _players.contains(player))
-				{
-					setTeamPlayersCount(player._teamNameTvT, teamPlayersCount(player._teamNameTvT) - 1);
-					_players.remove(player);
-				}
-				else if (Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && (!_playersShuffle.isEmpty() && _playersShuffle.contains(player)))
-				{
-					_playersShuffle.remove(player);
-				}
-			}
-			
-			player.sendMessage("Your participation in the TvT event has been removed.");
-		}
-	}
-	
-	/**
-	 * Clean tvt.
-	 */
-	public static void cleanTvT()
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					cleanEventPlayer(player);
-					
-					removePlayer(player);
-					if (_savePlayers.contains(player.getName()))
-					{
-						_savePlayers.remove(player.getName());
-					}
-					player._inEventTvT = false;
-				}
-			}
-		}
-		
-		if ((_playersShuffle != null) && !_playersShuffle.isEmpty())
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if (player != null)
-				{
-					player._inEventTvT = false;
-				}
-			}
-		}
-		
-		_topKills = 0;
-		_topTeam = "";
-		_players = new ArrayList<>();
-		_playersShuffle = new ArrayList<>();
-		_savePlayers = new ArrayList<>();
-		_savePlayerTeams = new ArrayList<>();
-		_teamPointsCount = new ArrayList<>();
-		_teamPlayersCount = new ArrayList<>();
-		cleanLocalEventInfo();
-		
-		_inProgress = false;
-		loadData();
-	}
-	
-	/**
-	 * Clean local event info.
-	 */
-	private static void cleanLocalEventInfo()
-	{
-		// nothing
-	}
-	
-	/**
-	 * Clean event player.
-	 * @param player the player
-	 */
-	private static void cleanEventPlayer(PlayerInstance player)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Adds the disconnected player.
-	 * @param player the player
-	 */
-	public static synchronized void addDisconnectedPlayer(PlayerInstance player)
-	{
-		if ((Config.TVT_EVEN_TEAMS.equals("SHUFFLE") && (_teleport || _started)) || (Config.TVT_EVEN_TEAMS.equals("NO") || (Config.TVT_EVEN_TEAMS.equals("BALANCE") && (_teleport || _started))))
-		{
-			if (Config.TVT_ON_START_REMOVE_ALL_EFFECTS)
-			{
-				player.stopAllEffects();
-			}
-			
-			player._teamNameTvT = _savePlayerTeams.get(_savePlayers.indexOf(player.getName()));
-			
-			synchronized (_players)
-			{
-				for (PlayerInstance p : _players)
-				{
-					if (p == null)
-					{
-						continue;
-					}
-					
-					// check by name incase player got new objectId
-					if (p.getName().equals(player.getName()))
-					{
-						player._originalNameColorTvT = player.getAppearance().getNameColor();
-						player._originalTitleTvT = player.getTitle();
-						player._originalKarmaTvT = player.getKarma();
-						player._inEventTvT = true;
-						player._countTvTkills = p._countTvTkills;
-						_players.remove(p); // removing old object id from vector
-						_players.add(player); // adding new objectId to vector
-						break;
-					}
-				}
-			}
-			
-			player.getAppearance().setNameColor(_teamColors.get(_teams.indexOf(player._teamNameTvT)));
-			player.setKarma(0);
-			if (Config.TVT_AURA && (_teams.size() >= 2))
-			{
-				player.setTeam(_teams.indexOf(player._teamNameTvT) + 1);
-			}
-			player.broadcastUserInfo();
-			
-			player.teleToLocation(_teamsX.get(_teams.indexOf(player._teamNameTvT)), _teamsY.get(_teams.indexOf(player._teamNameTvT)), _teamsZ.get(_teams.indexOf(player._teamNameTvT)));
-			afterAddDisconnectedPlayerOperations(player);
-		}
-	}
-	
-	/**
-	 * After add disconnected player operations.
-	 * @param player the player
-	 */
-	private static void afterAddDisconnectedPlayerOperations(PlayerInstance player)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Shuffle teams.
-	 */
-	public static void shuffleTeams()
-	{
-		int teamCount = 0;
-		int playersCount = 0;
-		
-		synchronized (_players)
-		{
-			for (;;)
-			{
-				if (_playersShuffle.isEmpty())
-				{
-					break;
-				}
-				
-				final int playerToAddIndex = Rnd.get(_playersShuffle.size());
-				PlayerInstance player = null;
-				player = _playersShuffle.get(playerToAddIndex);
-				_players.add(player);
-				_players.get(playersCount)._teamNameTvT = _teams.get(teamCount);
-				_savePlayers.add(_players.get(playersCount).getName());
-				_savePlayerTeams.add(_teams.get(teamCount));
-				playersCount++;
-				
-				if (teamCount == (_teams.size() - 1))
-				{
-					teamCount = 0;
-				}
-				else
-				{
-					teamCount++;
-				}
-				
-				_playersShuffle.remove(playerToAddIndex);
-			}
-		}
-	}
-	
-	/**
-	 * Play kneel animation.
-	 * @param teamName the team name
-	 */
-	public static void playKneelAnimation(String teamName)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if (player != null)
-				{
-					if (!player._teamNameTvT.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 7));
-					}
-					else if (player._teamNameTvT.equals(teamName))
-					{
-						player.broadcastPacket(new SocialAction(player.getObjectId(), 3));
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Reward team.
-	 * @param teamName the team name
-	 * @param bestKiller the best killer
-	 * @param looser the looser
-	 */
-	public static void rewardTeam(String teamName, PlayerInstance bestKiller, PlayerInstance looser)
-	{
-		synchronized (_players)
-		{
-			for (PlayerInstance player : _players)
-			{
-				if ((player != null) && player.isOnline() && (player._inEventTvT) && (!player.equals(looser)) && ((player._countTvTkills > 0) || Config.TVT_PRICE_NO_KILLS))
-				{
-					if ((bestKiller != null) && (bestKiller.equals(player)))
-					{
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, _rewardAmount, player, true);
-						player.addItem(_eventName + " Event: " + _eventName, Config.TVT_TOP_KILLER_REWARD, Config.TVT_TOP_KILLER_QTY, player, true);
-					}
-					else if ((teamName != null) && (player._teamNameTvT.equals(teamName)))
-					{
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, _rewardAmount, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team wins the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-					else if (teamName == null)
-					{
-						int minusReward = 0;
-						if (_topKills != 0)
-						{
-							minusReward = _rewardAmount / 2;
-						}
-						else
-						{
-							// nobody killed
-							minusReward = _rewardAmount / 4;
-						}
-						
-						player.addItem(_eventName + " Event: " + _eventName, _rewardId, minusReward, player, true);
-						
-						final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-						final StringBuilder replyMSG = new StringBuilder("");
-						replyMSG.append("<html><body>");
-						replyMSG.append("<font color=\"FFFF00\">Your team had a tie in the event. Look in your inventory for the reward.</font>");
-						replyMSG.append("</body></html>");
-						
-						nhm.setHtml(replyMSG.toString());
-						player.sendPacket(nhm);
-						
-						// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
-						player.sendPacket(ActionFailed.STATIC_PACKET);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Process top player.
-	 */
-	private static void processTopPlayer()
-	{
-		// nothing
-	}
-	
-	/**
-	 * Process top team.
-	 */
-	private static void processTopTeam()
-	{
-		_topTeam = null;
-		for (String team : _teams)
-		{
-			if ((teamKillsCount(team) == _topKills) && (_topKills > 0))
-			{
-				_topTeam = null;
-			}
-			
-			if (teamKillsCount(team) > _topKills)
-			{
-				_topTeam = team;
-				_topKills = teamKillsCount(team);
-			}
-		}
-	}
-	
-	/**
-	 * Adds the team.
-	 * @param teamName the team name
-	 */
-	public static void addTeam(String teamName)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		if (teamName.equals(" "))
-		{
-			return;
-		}
-		
-		_teams.add(teamName);
-		_teamPlayersCount.add(0);
-		_teamPointsCount.add(0);
-		_teamColors.add(0);
-		_teamsX.add(0);
-		_teamsY.add(0);
-		_teamsZ.add(0);
-		
-		addTeamEventOperations(teamName);
-	}
-	
-	/**
-	 * Adds the team event operations.
-	 * @param teamName the team name
-	 */
-	private static void addTeamEventOperations(String teamName)
-	{
-		// nothing
-	}
-	
-	/**
-	 * Removes the team.
-	 * @param teamName the team name
-	 */
-	public static void removeTeam(String teamName)
-	{
-		if (_inProgress || _teams.isEmpty())
-		{
-			return;
-		}
-		
-		if (teamPlayersCount(teamName) > 0)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsZ.remove(index);
-		_teamsY.remove(index);
-		_teamsX.remove(index);
-		_teamColors.remove(index);
-		_teamPointsCount.remove(index);
-		_teamPlayersCount.remove(index);
-		_teams.remove(index);
-		
-		removeTeamEventItems(teamName);
-	}
-	
-	/**
-	 * Removes the team event items.
-	 * @param teamName the team name
-	 */
-	private static void removeTeamEventItems(String teamName)
-	{
-		_teams.indexOf(teamName);
-		
-		//
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param player the player
-	 */
-	public static void setTeamPos(String teamName, PlayerInstance player)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, player.getX());
-		_teamsY.set(index, player.getY());
-		_teamsZ.set(index, player.getZ());
-	}
-	
-	/**
-	 * Sets the team pos.
-	 * @param teamName the team name
-	 * @param x the x
-	 * @param y the y
-	 * @param z the z
-	 */
-	public static void setTeamPos(String teamName, int x, int y, int z)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamsX.set(index, x);
-		_teamsY.set(index, y);
-		_teamsZ.set(index, z);
-	}
-	
-	/**
-	 * Sets the team color.
-	 * @param teamName the team name
-	 * @param color the color
-	 */
-	public static void setTeamColor(String teamName, int color)
-	{
-		if (_inProgress)
-		{
-			return;
-		}
-		
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamColors.set(index, color);
-	}
-	
-	/**
-	 * Team players count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamPlayersCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPlayersCount.get(index);
-	}
-	
-	/**
-	 * Sets the team players count.
-	 * @param teamName the team name
-	 * @param teamPlayersCount the team players count
-	 */
-	public static void setTeamPlayersCount(String teamName, int teamPlayersCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPlayersCount.set(index, teamPlayersCount);
-	}
-	
-	/**
-	 * Check shuffle players.
-	 * @param eventPlayer the event player
-	 * @return true, if successful
-	 */
-	public static boolean checkShufflePlayers(PlayerInstance eventPlayer)
-	{
-		try
-		{
-			for (PlayerInstance player : _playersShuffle)
-			{
-				if ((player == null) || !player.isOnline())
-				{
-					_playersShuffle.remove(player);
-					eventPlayer._inEventTvT = false;
-				}
-				else if (player.getObjectId() == eventPlayer.getObjectId())
-				{
-					eventPlayer._inEventTvT = true;
-					eventPlayer._countTvTkills = 0;
-					return true;
-				}
-				// This 1 is incase player got new objectid after DC or reconnect
-				else if (player.getName().equals(eventPlayer.getName()))
-				{
-					_playersShuffle.remove(player);
-					_playersShuffle.add(eventPlayer);
-					eventPlayer._inEventTvT = true;
-					eventPlayer._countTvTkills = 0;
-					return true;
-				}
-			}
-		}
-		catch (Exception e)
-		{
-		}
-		return false;
-	}
-	
-	/**
-	 * just an announcer to send termination messages.
-	 */
-	public static void sendFinalMessages()
-	{
-		if (!_started && !_aborted)
-		{
-			AnnouncementsTable.getInstance().criticalAnnounceToAll(_eventName + ": Thank you For Participating At, " + _eventName + " Event.");
-		}
-	}
-	
-	/**
-	 * returns the interval between each event.
-	 * @return the interval between matchs
-	 */
-	public static int getIntervalBetweenMatchs()
-	{
-		final long actualTime = Chronos.currentTimeMillis();
-		final long totalTime = actualTime + _intervalBetweenMatches;
-		final long interval = totalTime - actualTime;
-		final int seconds = (int) (interval / 1000);
-		return seconds / 60;
-	}
-	
-	@Override
-	public void run()
-	{
-		LOGGER.info(_eventName + ": Event notification start");
-		eventOnceStart();
-	}
-	
-	@Override
-	public String getEventIdentifier()
-	{
-		return _eventName;
-	}
-	
-	@Override
-	public String getEventStartTime()
-	{
-		return startEventTime;
-	}
-	
-	/**
-	 * Sets the event start time.
-	 * @param newTime the new event start time
-	 */
-	public void setEventStartTime(String newTime)
-	{
-		startEventTime = newTime;
-	}
-	
-	/**
-	 * On disconnect.
-	 * @param player the player
-	 */
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventTvT)
-		{
-			removePlayer(player);
-			player.teleToLocation(_npcX, _npcY, _npcZ);
-		}
-	}
-	
-	/**
-	 * Team kills count.
-	 * @param teamName the team name
-	 * @return the int
-	 */
-	public static int teamKillsCount(String teamName)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return -1;
-		}
-		return _teamPointsCount.get(index);
-	}
-	
-	/**
-	 * Sets the team kills count.
-	 * @param teamName the team name
-	 * @param teamKillsCount the team kills count
-	 */
-	public static void setTeamKillsCount(String teamName, int teamKillsCount)
-	{
-		final int index = _teams.indexOf(teamName);
-		if (index == -1)
-		{
-			return;
-		}
-		
-		_teamPointsCount.set(index, teamKillsCount);
-	}
-	
-	/**
-	 * Kick player from tvt.
-	 * @param playerToKick the player to kick
-	 */
-	public static void kickPlayerFromTvt(PlayerInstance playerToKick)
-	{
-		if (playerToKick == null)
-		{
-			return;
-		}
-		
-		synchronized (_players)
-		{
-			if (_joining)
-			{
-				_playersShuffle.remove(playerToKick);
-				_players.remove(playerToKick);
-				playerToKick._inEventTvT = false;
-				playerToKick._teamNameTvT = "";
-				playerToKick._countTvTkills = 0;
-			}
-		}
-		
-		if (_started || _teleport)
-		{
-			_playersShuffle.remove(playerToKick);
-			removePlayer(playerToKick);
-			if (playerToKick.isOnline())
-			{
-				playerToKick.getAppearance().setNameColor(playerToKick._originalNameColorTvT);
-				playerToKick.setKarma(playerToKick._originalKarmaTvT);
-				playerToKick.setTitle(playerToKick._originalTitleTvT);
-				playerToKick.broadcastUserInfo();
-				playerToKick.sendMessage("You have been kicked from the TvT.");
-				playerToKick.teleToLocation(_npcX, _npcY, _npcZ);
-				playerToKick.teleToLocation((_npcX + Rnd.get(201)) - 100, (_npcY + Rnd.get(201)) - 100, _npcZ);
-			}
-		}
-	}
-	
-	/**
-	 * Find best killer.
-	 * @param players the players
-	 * @return the pc instance
-	 */
-	public static PlayerInstance findBestKiller(List<PlayerInstance> players)
-	{
-		if (players == null)
-		{
-			return null;
-		}
-		PlayerInstance bestKiller = null;
-		for (PlayerInstance player : players)
-		{
-			if ((bestKiller == null) || (bestKiller._countTvTkills < player._countTvTkills))
-			{
-				bestKiller = player;
-			}
-		}
-		return bestKiller;
-	}
-	
-	/**
-	 * Find looser.
-	 * @param players the players
-	 * @return the pc instance
-	 */
-	public static PlayerInstance findLooser(List<PlayerInstance> players)
-	{
-		if (players == null)
-		{
-			return null;
-		}
-		PlayerInstance looser = null;
-		for (PlayerInstance player : players)
-		{
-			if ((looser == null) || (looser._countTvTdies < player._countTvTdies))
-			{
-				looser = player;
-			}
-		}
-		return looser;
-	}
-	
-	/**
-	 * The Class TvTTeam.
-	 */
-	public static class TvTTeam
-	{
-		/** The kill count. */
-		private int killCount = -1;
-		
-		/** The name. */
-		private String name = null;
-		
-		/**
-		 * Instantiates a new tvt team.
-		 * @param name the name
-		 * @param killCount the kill count
-		 */
-		TvTTeam(String name, int killCount)
-		{
-			this.killCount = killCount;
-			this.name = name;
-		}
-		
-		/**
-		 * Gets the kill count.
-		 * @return the kill count
-		 */
-		public int getKillCount()
-		{
-			return killCount;
-		}
-		
-		/**
-		 * Sets the kill count.
-		 * @param killCount the new kill count
-		 */
-		public void setKillCount(int killCount)
-		{
-			this.killCount = killCount;
-		}
-		
-		/**
-		 * Gets the name.
-		 * @return the name
-		 */
-		public String getName()
-		{
-			return name;
-		}
-		
-		/**
-		 * Sets the name.
-		 * @param name the new name
-		 */
-		public void setName(String name)
-		{
-			this.name = name;
-		}
-	}
-	
-	/**
-	 * Close fort doors.
-	 */
-	private static void closeFortDoors()
-	{
-		DoorData.getInstance().getDoor(23170004).closeMe();
-		DoorData.getInstance().getDoor(23170005).closeMe();
-		DoorData.getInstance().getDoor(23170002).closeMe();
-		DoorData.getInstance().getDoor(23170003).closeMe();
-		DoorData.getInstance().getDoor(23170006).closeMe();
-		DoorData.getInstance().getDoor(23170007).closeMe();
-		DoorData.getInstance().getDoor(23170008).closeMe();
-		DoorData.getInstance().getDoor(23170009).closeMe();
-		DoorData.getInstance().getDoor(23170010).closeMe();
-		DoorData.getInstance().getDoor(23170011).closeMe();
-		
-		try
-		{
-			Thread.sleep(20);
-		}
-		catch (InterruptedException ie)
-		{
-			LOGGER.warning("Error, " + ie.getMessage());
-		}
-	}
-	
-	/**
-	 * Open fort doors.
-	 */
-	private static void openFortDoors()
-	{
-		DoorData.getInstance().getDoor(23170004).openMe();
-		DoorData.getInstance().getDoor(23170005).openMe();
-		DoorData.getInstance().getDoor(23170002).openMe();
-		DoorData.getInstance().getDoor(23170003).openMe();
-		DoorData.getInstance().getDoor(23170006).openMe();
-		DoorData.getInstance().getDoor(23170007).openMe();
-		DoorData.getInstance().getDoor(23170008).openMe();
-		DoorData.getInstance().getDoor(23170009).openMe();
-		DoorData.getInstance().getDoor(23170010).openMe();
-		DoorData.getInstance().getDoor(23170011).openMe();
-	}
-	
-	/**
-	 * Close aden colosseum doors.
-	 */
-	private static void closeAdenColosseumDoors()
-	{
-		DoorData.getInstance().getDoor(24190002).closeMe();
-		DoorData.getInstance().getDoor(24190003).closeMe();
-		
-		try
-		{
-			Thread.sleep(20);
-		}
-		catch (InterruptedException ie)
-		{
-			LOGGER.warning("Error, " + ie.getMessage());
-		}
-	}
-	
-	/**
-	 * Open aden colosseum doors.
-	 */
-	private static void openAdenColosseumDoors()
-	{
-		DoorData.getInstance().getDoor(24190002).openMe();
-		DoorData.getInstance().getDoor(24190003).openMe();
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/VIP.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/VIP.java
deleted file mode 100644
index c4560704ed..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/VIP.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
-import org.l2jmobius.gameserver.data.sql.NpcTable;
-import org.l2jmobius.gameserver.data.sql.SpawnTable;
-import org.l2jmobius.gameserver.enums.Race;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
-import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
-import org.l2jmobius.gameserver.model.items.Item;
-import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-
-public class VIP
-{
-	private static final Logger LOGGER = Logger.getLogger(VIP.class.getName());
-	
-	public static String _teamName = "";
-	public static String _joinArea = "";
-	public static int _time = 0;
-	public static int _winners = 0;
-	public static int _vipReward = 0;
-	public static int _vipRewardAmount = 0;
-	public static int _notVipReward = 0;
-	public static int _notVipRewardAmount = 0;
-	public static int _theVipReward = 0;
-	public static int _theVipRewardAmount = 0;
-	public static int _endNPC = 0;
-	public static int _joinNPC = 0;
-	public static int _delay = 0;
-	public static int _endX = 0;
-	public static int _endY = 0;
-	public static int _endZ = 0;
-	public static int _startX = 0;
-	public static int _startY = 0;
-	public static int _startZ = 0;
-	public static int _joinX = 0;
-	public static int _joinY = 0;
-	public static int _joinZ = 0;
-	public static int _team = 0;
-	public static boolean _started = false;
-	public static boolean _joining = false;
-	public static boolean _inProgress = true;
-	public static boolean _sitForced = false;
-	public static Spawn _endSpawn;
-	public static Spawn _joinSpawn;
-	public static List<PlayerInstance> _playersVIP = new ArrayList<>();
-	public static List<PlayerInstance> _playersNotVIP = new ArrayList<>();
-	
-	public static void setTeam(String team, PlayerInstance player)
-	{
-		if (team.equalsIgnoreCase("Human"))
-		{
-			_team = 1;
-			_teamName = "Human";
-		}
-		else if (team.equalsIgnoreCase("Elf"))
-		{
-			_team = 2;
-			_teamName = "Elf";
-		}
-		else if (team.equalsIgnoreCase("Dark"))
-		{
-			_team = 3;
-			_teamName = "Dark Elf";
-		}
-		else if (team.equalsIgnoreCase("Orc"))
-		{
-			_team = 4;
-			_teamName = "Orc";
-		}
-		else if (team.equalsIgnoreCase("Dwarf"))
-		{
-			_team = 5;
-			_teamName = "Dwarf";
-		}
-		else
-		{
-			player.sendMessage("Invalid Team Name: //vip_setteam <human/elf/dark/orc/dwarf>");
-			return;
-		}
-		setLoc();
-	}
-	
-	public static void setRandomTeam(PlayerInstance player)
-	{
-		final int random = Rnd.get(5) + 1; // (0 - 4) + 1
-		LOGGER.info("Random number generated in setRandomTeam(): " + random);
-		
-		switch (random)
-		{
-			case 1:
-			{
-				_team = 1;
-				_teamName = "Human";
-				setLoc();
-				break;
-			}
-			case 2:
-			{
-				_team = 2;
-				_teamName = "Elf";
-				setLoc();
-				break;
-			}
-			case 3:
-			{
-				_team = 3;
-				_teamName = "Dark";
-				setLoc();
-				break;
-			}
-			case 4:
-			{
-				_team = 4;
-				_teamName = "Orc";
-				setLoc();
-				break;
-			}
-			case 5:
-			{
-				_team = 5;
-				_teamName = "Dwarf";
-				setLoc();
-				break;
-			}
-			default:
-			{
-				break;
-			}
-		}
-	}
-	
-	public static void setLoc()
-	{
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement statement = con.prepareStatement("SELECT endx,endy,endz FROM VIPinfo WHERE teamID = " + _team);
-			final ResultSet rset = statement.executeQuery();
-			rset.next();
-			
-			_endX = rset.getInt("endx");
-			_endY = rset.getInt("endy");
-			_endZ = rset.getInt("endz");
-			rset.close();
-			statement.close();
-		}
-		catch (SQLException e)
-		{
-			LOGGER.info("Could not check End LOC for team" + _team + " got: " + e.getMessage());
-		}
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement statement = con.prepareStatement("SELECT startx,starty,startz FROM VIPinfo WHERE teamID = " + _team);
-			final ResultSet rset = statement.executeQuery();
-			rset.next();
-			
-			_startX = rset.getInt("startx");
-			_startY = rset.getInt("starty");
-			_startZ = rset.getInt("startz");
-			rset.close();
-			statement.close();
-		}
-		catch (SQLException e)
-		{
-			LOGGER.info("Could not check Start LOC for team" + _team + " got: " + e.getMessage());
-		}
-	}
-	
-	public static void endNPC(int npcId, PlayerInstance player)
-	{
-		if (_team == 0)
-		{
-			player.sendMessage("Please select a team first");
-			return;
-		}
-		
-		final NpcTemplate npctmp = NpcTable.getInstance().getTemplate(npcId);
-		_endNPC = npcId;
-		
-		try
-		{
-			_endSpawn = new Spawn(npctmp);
-			_endSpawn.setX(_endX);
-			_endSpawn.setY(_endY);
-			_endSpawn.setZ(_endZ);
-			_endSpawn.setAmount(1);
-			_endSpawn.setHeading(player.getHeading());
-			_endSpawn.setRespawnDelay(1);
-		}
-		catch (Exception e)
-		{
-			player.sendMessage("VIP Engine[endNPC(" + player.getName() + ")]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static void joinNPC(int npcId, PlayerInstance player)
-	{
-		if (_joinX == 0)
-		{
-			player.sendMessage("Please set a join x,y,z first");
-			return;
-		}
-		
-		final NpcTemplate npctmp = NpcTable.getInstance().getTemplate(npcId);
-		_joinNPC = npcId;
-		
-		try
-		{
-			_joinSpawn = new Spawn(npctmp);
-			_joinSpawn.setX(_joinX);
-			_joinSpawn.setY(_joinY);
-			_joinSpawn.setZ(_joinZ);
-			_joinSpawn.setAmount(1);
-			_joinSpawn.setHeading(player.getHeading());
-			_joinSpawn.setRespawnDelay(1);
-		}
-		catch (Exception e)
-		{
-			player.sendMessage("VIP Engine[joinNPC(" + player.getName() + ")]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static void spawnEndNPC()
-	{
-		try
-		{
-			SpawnTable.getInstance().addNewSpawn(_endSpawn, false);
-			_endSpawn.init();
-			_endSpawn.getLastSpawn().setCurrentHp(999999999);
-			_endSpawn.getLastSpawn().setTitle("VIP Event Manager");
-			_endSpawn.getLastSpawn().isAggressive();
-			_endSpawn.getLastSpawn().decayMe();
-			_endSpawn.getLastSpawn().spawnMe(_endSpawn.getLastSpawn().getX(), _endSpawn.getLastSpawn().getY(), _endSpawn.getLastSpawn().getZ());
-			_endSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_endSpawn.getLastSpawn(), _endSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP Engine[spawnEndNPC()]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static void spawnJoinNPC()
-	{
-		try
-		{
-			SpawnTable.getInstance().addNewSpawn(_joinSpawn, false);
-			_joinSpawn.init();
-			_joinSpawn.getLastSpawn().setCurrentHp(999999999);
-			_joinSpawn.getLastSpawn().setTitle("VIP Event Manager");
-			_joinSpawn.getLastSpawn().isAggressive();
-			_joinSpawn.getLastSpawn().decayMe();
-			_joinSpawn.getLastSpawn().spawnMe(_joinSpawn.getLastSpawn().getX(), _joinSpawn.getLastSpawn().getY(), _joinSpawn.getLastSpawn().getZ());
-			_joinSpawn.getLastSpawn().broadcastPacket(new MagicSkillUse(_joinSpawn.getLastSpawn(), _joinSpawn.getLastSpawn(), 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP Engine[spawnJoinNPC()]: exception: " + e.getMessage());
-		}
-	}
-	
-	public static String getNPCName(int id, PlayerInstance player)
-	{
-		if (id == 0)
-		{
-			return "";
-		}
-		
-		final NpcTemplate npctmp = NpcTable.getInstance().getTemplate(id);
-		return npctmp.getName();
-	}
-	
-	public static String getItemName(int id, PlayerInstance player)
-	{
-		if (id == 0)
-		{
-			return "";
-		}
-		final Item itemtmp = ItemTable.getInstance().getTemplate(id);
-		return itemtmp.getName();
-	}
-	
-	public static void setJoinLOC(String x, String y, String z)
-	{
-		_joinX = Integer.parseInt(x);
-		_joinY = Integer.parseInt(y);
-		_joinZ = Integer.parseInt(z);
-	}
-	
-	public static void startJoin(PlayerInstance player)
-	{
-		if ((_time == 0) || (_team == 0) || (_endNPC == 0) || (_delay == 0))
-		{
-			player.sendMessage("Cannot initiate join status of event, not all the values are filled in");
-			return;
-		}
-		
-		if (_joining)
-		{
-			player.sendMessage("Players are already allowed to join the event");
-			return;
-		}
-		
-		if (_started)
-		{
-			player.sendMessage("Event already started. Please wait for it to finish or finish it manually");
-			return;
-		}
-		
-		_inProgress = true;
-		_joining = true;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Vip event has started.Use .vipjoin to join or .vipleave to leave.");
-		spawnJoinNPC();
-		
-		ThreadPool.schedule(() ->
-		{
-			_joining = false;
-			_started = true;
-			startEvent();
-		}, _delay);
-	}
-	
-	public static void startEvent()
-	{
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Registration for the VIP event involving " + _teamName + " has ended.");
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Players will be teleported to their locations in 20 seconds.");
-		ThreadPool.schedule(() ->
-		{
-			teleportPlayers();
-			chooseVIP();
-			setUserData();
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("Players have been teleported for the VIP event.");
-			AnnouncementsTable.getInstance().criticalAnnounceToAll("VIP event will start in 20 seconds.");
-			spawnEndNPC();
-			
-			ThreadPool.schedule(() ->
-			{
-				AnnouncementsTable.getInstance().criticalAnnounceToAll("VIP event has started. " + _teamName + "'s VIP must get to the starter city and talk with " + getNPCName(_endNPC, null) + ". The opposing team must kill the VIP. All players except the VIP will respawn at their current locations.");
-				AnnouncementsTable.getInstance().criticalAnnounceToAll("VIP event will end if the " + _teamName + " team makes it to their town or when " + (_time / 1000 / 60) + " mins have elapsed.");
-				VIP.sit();
-				
-				ThreadPool.schedule(VIP::endEventTime, _time);
-			}, 20000);
-		}, 20000);
-	}
-	
-	public static void vipDied()
-	{
-		if (!_started)
-		{
-			LOGGER.info("Could not finish the event. Event not started or event ended prematurly.");
-			return;
-		}
-		
-		_started = false;
-		unspawnEventNpcs();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("The VIP has died. The opposing team has won.");
-		rewardNotVIP();
-		teleportFinish();
-	}
-	
-	public static void endEventTime()
-	{
-		if (!_started)
-		{
-			LOGGER.info("Could not finish the event. Event not started or event ended prematurly (VIP died)");
-			return;
-		}
-		
-		_started = false;
-		unspawnEventNpcs();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("The time has run out and the " + _teamName + "'s have not made it to their goal. Everybody on the opposing team wins.");
-		rewardNotVIP();
-		teleportFinish();
-	}
-	
-	public static void unspawnEventNpcs()
-	{
-		if (_endSpawn != null)
-		{
-			_endSpawn.getLastSpawn().deleteMe();
-			_endSpawn.stopRespawn();
-			SpawnTable.getInstance().deleteSpawn(_endSpawn, true);
-		}
-		
-		if (_joinSpawn != null)
-		{
-			_joinSpawn.getLastSpawn().deleteMe();
-			_joinSpawn.stopRespawn();
-			SpawnTable.getInstance().deleteSpawn(_joinSpawn, true);
-		}
-	}
-	
-	public static void showEndHTML(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("VIP (End NPC)<br><br>");
-			replyMSG.append("Current event...<br1>");
-			replyMSG.append("Team:&nbsp;<font color=\"FFFFFF\">" + _teamName + "</font><br><br>");
-			if (!_started)
-			{
-				replyMSG.append("<center>Please wait until the admin/gm starts the joining period.</center>");
-			}
-			else if (eventPlayer._isTheVIP)
-			{
-				replyMSG.append("You have made it to the end. All you have to do is hit the finish button to reward yourself and your team. Congrats!<br>");
-				replyMSG.append("<center>");
-				replyMSG.append("<button value=\"Finish\" action=\"bypass -h npc_" + objectId + "_vip_finishVIP\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-				replyMSG.append("</center>");
-			}
-			else
-			{
-				replyMSG.append("I am the character the VIP has to reach in order to win the event.<br>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP(showJoinHTML(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	public static void vipWin(PlayerInstance player)
-	{
-		if (!_started)
-		{
-			LOGGER.info("Could not finish the event. Event not started or event ended prematurly");
-			return;
-		}
-		
-		_started = false;
-		unspawnEventNpcs();
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("The VIP has made it to the goal. " + _teamName + " has won. Everybody on that team wins.");
-		rewardVIP();
-		teleportFinish();
-	}
-	
-	public static void rewardNotVIP()
-	{
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			if (player != null)
-			{
-				final PlayerInventory inv = player.getInventory();
-				if (ItemTable.getInstance().createDummyItem(_notVipReward).isStackable())
-				{
-					inv.addItem("VIP Event: ", _notVipReward, _notVipRewardAmount, player, null);
-				}
-				else
-				{
-					for (int i = 0; i <= (_notVipRewardAmount - 1); i++)
-					{
-						inv.addItem("VIP Event: ", _notVipReward, 1, player, null);
-					}
-				}
-				
-				SystemMessage sm;
-				if (_notVipRewardAmount > 1)
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-					sm.addItemName(_notVipReward);
-					sm.addNumber(_notVipRewardAmount);
-					player.sendPacket(sm);
-				}
-				else
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-					sm.addItemName(_notVipReward);
-					player.sendPacket(sm);
-				}
-				
-				final StatusUpdate su = new StatusUpdate(player.getObjectId());
-				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
-				player.sendPacket(su);
-				
-				final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-				final StringBuilder replyMSG = new StringBuilder("");
-				replyMSG.append("<html><body>Your team has won the event. Your inventory now contains your reward.</body></html>");
-				nhm.setHtml(replyMSG.toString());
-				player.sendPacket(nhm);
-			}
-		}
-	}
-	
-	public static void rewardVIP()
-	{
-		for (PlayerInstance player : _playersVIP)
-		{
-			if ((player != null) && !player._isTheVIP)
-			{
-				final PlayerInventory inv = player.getInventory();
-				if (ItemTable.getInstance().createDummyItem(_vipReward).isStackable())
-				{
-					inv.addItem("VIP Event: ", _vipReward, _vipRewardAmount, player, null);
-				}
-				else
-				{
-					for (int i = 0; i <= (_vipRewardAmount - 1); i++)
-					{
-						inv.addItem("VIP Event: ", _vipReward, 1, player, null);
-					}
-				}
-				
-				SystemMessage sm;
-				if (_vipRewardAmount > 1)
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-					sm.addItemName(_vipReward);
-					sm.addNumber(_vipRewardAmount);
-					player.sendPacket(sm);
-				}
-				else
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-					sm.addItemName(_vipReward);
-					player.sendPacket(sm);
-				}
-				
-				final StatusUpdate su = new StatusUpdate(player.getObjectId());
-				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
-				player.sendPacket(su);
-				
-				final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-				final StringBuilder replyMSG = new StringBuilder("");
-				replyMSG.append("<html><body>Your team has won the event. Your inventory now contains your reward.</body></html>");
-				nhm.setHtml(replyMSG.toString());
-				player.sendPacket(nhm);
-			}
-			else if ((player != null) && player._isTheVIP)
-			{
-				final PlayerInventory inv = player.getInventory();
-				if (ItemTable.getInstance().createDummyItem(_theVipReward).isStackable())
-				{
-					inv.addItem("VIP Event: ", _theVipReward, _theVipRewardAmount, player, null);
-				}
-				else
-				{
-					for (int i = 0; i <= (_theVipRewardAmount - 1); i++)
-					{
-						inv.addItem("VIP Event: ", _theVipReward, 1, player, null);
-					}
-				}
-				
-				SystemMessage sm;
-				if (_theVipRewardAmount > 1)
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-					sm.addItemName(_theVipReward);
-					sm.addNumber(_theVipRewardAmount);
-					player.sendPacket(sm);
-				}
-				else
-				{
-					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-					sm.addItemName(_theVipReward);
-					player.sendPacket(sm);
-				}
-				
-				final StatusUpdate su = new StatusUpdate(player.getObjectId());
-				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
-				player.sendPacket(su);
-				
-				final NpcHtmlMessage nhm = new NpcHtmlMessage(5);
-				final StringBuilder replyMSG = new StringBuilder("");
-				replyMSG.append("<html><body>You team have won the event. Your inventory now contains your reward.</body></html>");
-				nhm.setHtml(replyMSG.toString());
-				player.sendPacket(nhm);
-			}
-		}
-	}
-	
-	public static void teleportFinish()
-	{
-		AnnouncementsTable.getInstance().criticalAnnounceToAll("Teleporting VIP players back to the Registration area in 20 seconds.");
-		ThreadPool.schedule(() ->
-		{
-			for (PlayerInstance player1 : _playersVIP)
-			{
-				if (player1 != null)
-				{
-					player1.teleToLocation(_joinX, _joinY, _joinZ);
-				}
-			}
-			
-			for (PlayerInstance player2 : _playersNotVIP)
-			{
-				if (player2 != null)
-				{
-					player2.teleToLocation(_joinX, _joinY, _joinZ);
-				}
-			}
-			
-			VIP.clean();
-		}, 20000);
-	}
-	
-	public static void clean()
-	{
-		_time = _winners = _endNPC = _joinNPC = _delay = _endX = _endY = _endZ = _startX = _startY = _startZ = _joinX = _joinY = _joinZ = _team = 0;
-		_vipReward = _vipRewardAmount = _notVipReward = _notVipRewardAmount = _theVipReward = _theVipRewardAmount = 0;
-		_started = _joining = _sitForced = false;
-		_inProgress = false;
-		_teamName = _joinArea = "";
-		for (PlayerInstance player : _playersVIP)
-		{
-			player.getAppearance().setNameColor(player._originalNameColourVIP);
-			player.setKarma(player._originalKarmaVIP);
-			player.broadcastUserInfo();
-			player._inEventVIP = false;
-			player._isTheVIP = false;
-			player._isNotVIP = false;
-			player._isVIP = false;
-		}
-		
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			player.getAppearance().setNameColor(player._originalNameColourVIP);
-			player.setKarma(player._originalKarmaVIP);
-			player.broadcastUserInfo();
-			player._inEventVIP = false;
-			player._isTheVIP = false;
-			player._isNotVIP = false;
-			player._isVIP = false;
-		}
-		
-		_playersVIP = new ArrayList<>();
-		_playersNotVIP = new ArrayList<>();
-	}
-	
-	public static void chooseVIP()
-	{
-		final int size = _playersVIP.size();
-		LOGGER.info("Size of players on VIP: " + size);
-		
-		final int random = Rnd.get(size);
-		LOGGER.info("Random number chosen in VIP: " + random);
-		
-		final PlayerInstance vip = _playersVIP.get(random);
-		vip._isTheVIP = true;
-	}
-	
-	public static void teleportPlayers()
-	{
-		sit();
-		
-		for (PlayerInstance player : _playersVIP)
-		{
-			if (player != null)
-			{
-				player.teleToLocation(_startX, _startY, _startZ);
-			}
-		}
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			if (player != null)
-			{
-				player.teleToLocation(_endX, _endY, _endZ);
-			}
-		}
-	}
-	
-	public static void sit()
-	{
-		if (_sitForced)
-		{
-			_sitForced = false;
-		}
-		else
-		{
-			_sitForced = true;
-		}
-		
-		for (PlayerInstance player : _playersVIP)
-		{
-			if (player != null)
-			{
-				if (_sitForced)
-				{
-					player.stopMove(null, false);
-					player.abortAttack();
-					player.abortCast();
-					
-					if (!player.isSitting())
-					{
-						player.sitDown();
-					}
-				}
-				else if (player.isSitting())
-				{
-					player.standUp();
-				}
-			}
-		}
-		
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			if (player != null)
-			{
-				if (_sitForced)
-				{
-					player.stopMove(null, false);
-					player.abortAttack();
-					player.abortCast();
-					
-					if (!player.isSitting())
-					{
-						player.sitDown();
-					}
-				}
-				else if (player.isSitting())
-				{
-					player.standUp();
-				}
-			}
-		}
-	}
-	
-	public static void setUserData()
-	{
-		for (PlayerInstance player : _playersVIP)
-		{
-			if (player._isTheVIP)
-			{
-				player.getAppearance().setNameColor(255, 255, 0);
-			}
-			else
-			{
-				player.getAppearance().setNameColor(255, 0, 0);
-			}
-			
-			player.setKarma(0);
-			player.broadcastUserInfo();
-		}
-		for (PlayerInstance player : _playersNotVIP)
-		{
-			player.getAppearance().setNameColor(0, 255, 0);
-			player.setKarma(0);
-			player.broadcastUserInfo();
-		}
-	}
-	
-	public static void showJoinHTML(PlayerInstance eventPlayer, String objectId)
-	{
-		try
-		{
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
-			final StringBuilder replyMSG = new StringBuilder("<html><body>");
-			replyMSG.append("VIP (Join NPC)<br><br>");
-			replyMSG.append("Current event...<br1>");
-			replyMSG.append("	... Team:&nbsp;<font color=\"FFFFFF\">" + _teamName + "</font><br><br>");
-			if (!_joining && !_started)
-			{
-				replyMSG.append("<center>Please wait until the admin/gm starts the joining period.</center>");
-			}
-			else if (_joining && !_started)
-			{
-				// Joining period
-				if (_playersVIP.contains(eventPlayer) || _playersNotVIP.contains(eventPlayer))
-				{
-					replyMSG.append("You are already on a team<br><br>");
-				}
-				else
-				{
-					replyMSG.append("You want to participate in the event?<br><br>");
-					if ((eventPlayer.getRace() == Race.HUMAN) && (_team == 1))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.ELF) && (_team == 2))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.DARK_ELF) && (_team == 3))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.ORC) && (_team == 4))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else if ((eventPlayer.getRace() == Race.DWARF) && (_team == 5))
-					{
-						replyMSG.append("It seems you are on the VIP race! Be prepared to protect the VIP when it is decided<br1>");
-						replyMSG.append("The VIP will be decided on when the event starts. It's completely random.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-					else
-					{
-						replyMSG.append("It seems you are not on the part of the VIP race.<br>");
-						replyMSG.append("When the event starts you will be teleported to the " + _teamName + " town<br1>");
-						replyMSG.append("Be sure to cooperate with your team to destroy the VIP.<br1>");
-						replyMSG.append("The VIP will be announced when the event starts.<br>");
-						replyMSG.append("<center>");
-						replyMSG.append("<button value=\"Join\" action=\"bypass -h npc_" + objectId + "_vip_joinNotVIPTeam\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-						replyMSG.append("</center>");
-					}
-				}
-			}
-			else if (_started)
-			{
-				replyMSG.append("<center>The event is already taking place. Please sign up for the next event.</center>");
-			}
-			
-			replyMSG.append("</body></html>");
-			adminReply.setHtml(replyMSG.toString());
-			eventPlayer.sendPacket(adminReply);
-		}
-		catch (Exception e)
-		{
-			LOGGER.info("VIP(showJoinHTML(" + eventPlayer.getName() + ", " + objectId + ")]: exception" + e.getMessage());
-		}
-	}
-	
-	public static void addPlayerVIP(PlayerInstance player)
-	{
-		player._isVIP = true;
-		_playersVIP.add(player);
-		player._originalNameColourVIP = player.getAppearance().getNameColor();
-		player._originalKarmaVIP = player.getKarma();
-		player._inEventVIP = true;
-	}
-	
-	public static void addPlayerNotVIP(PlayerInstance player)
-	{
-		player._isNotVIP = true;
-		_playersNotVIP.add(player);
-		player._originalNameColourVIP = player.getAppearance().getNameColor();
-		player._originalKarmaVIP = player.getKarma();
-		player._inEventVIP = true;
-	}
-	
-	public static void onDisconnect(PlayerInstance player)
-	{
-		if (player._inEventTvT)
-		{
-			player.getAppearance().setNameColor(player._originalNameColourVIP);
-			player.setKarma(player._originalKarmaVIP);
-			player.broadcastUserInfo();
-			player._inEventVIP = false;
-			player._isTheVIP = false;
-			player._isNotVIP = false;
-			player._isVIP = false;
-			player.teleToLocation(_startX, _startY, _startZ);
-		}
-	}
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java
index 4ecf8dd76f..cc5762ccb6 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java
@@ -22,16 +22,12 @@ import java.sql.SQLException;
 import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -351,21 +347,6 @@ public class CursedWeapon
 			}
 		}
 		
-		if ((player._inEventTvT && !Config.TVT_JOIN_CURSED) && player._inEventTvT)
-		{
-			TvT.removePlayer(player);
-		}
-		
-		if ((player._inEventCTF && !Config.CTF_JOIN_CURSED) && player._inEventCTF)
-		{
-			CTF.removePlayer(player);
-		}
-		
-		if ((player._inEventDM && !Config.DM_JOIN_CURSED) && player._inEventDM)
-		{
-			DM.removePlayer(player);
-		}
-		
 		_isActivated = true;
 		
 		// Player holding it data
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Radar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Radar.java
index 34152f520f..00cd2d259f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Radar.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Radar.java
@@ -122,7 +122,7 @@ public class Radar
 					return;
 				}
 				_me.sendPacket(new RadarControl(1, 1, _me.getX(), _me.getY(), _me.getZ()));
-				if ((_myTarget == null) || !_myTarget.isOnline() || !_myTarget._haveFlagCTF)
+				if ((_myTarget == null) || !_myTarget.isOnline())
 				{
 					return;
 				}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
index f26689d689..f517fcaebc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
@@ -24,15 +24,11 @@ import java.util.List;
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.SkillTreeTable;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Playable;
@@ -1768,9 +1764,8 @@ public abstract class Skill
 								{
 									continue;
 								}
-								// if src is in event and trg not OR viceversa:
-								// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-								if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+								// if src is in event and trg not or viceversa
+								if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 								{
 									continue;
 								}
@@ -1782,9 +1777,8 @@ public abstract class Skill
 								{
 									continue;
 								}
-								// if src is in event and trg not OR viceversa:
-								// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-								if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+								// if src is in event and trg not or viceversa
+								if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 								{
 									continue;
 								}
@@ -1913,9 +1907,8 @@ public abstract class Skill
 							{
 								continue;
 							}
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+							// if src is in event and trg not or viceversa
+							if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 							{
 								continue;
 							}
@@ -1927,9 +1920,8 @@ public abstract class Skill
 							{
 								continue;
 							}
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+							// if src is in event and trg not or viceversa
+							if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 							{
 								continue;
 							}
@@ -1980,30 +1972,11 @@ public abstract class Skill
 					final List<PlayerInstance> partyList = creature.getParty().getPartyMembers();
 					for (PlayerInstance partyMember : partyList)
 					{
-						if (partyMember == null)
+						if ((partyMember == null) || (partyMember == player))
 						{
 							continue;
 						}
-						if (partyMember == player)
-						{
-							continue;
-						}
-						// check if allow interference is allowed if player is not on event but target is on event
-						if (((TvT.isStarted() && !Config.TVT_ALLOW_INTERFERENCE) || (CTF.isStarted() && !Config.CTF_ALLOW_INTERFERENCE) || (DM.hasStarted() && !Config.DM_ALLOW_INTERFERENCE))/* && !player.isGM() */)
-						{
-							if ((partyMember._inEventTvT && !player._inEventTvT) || (!partyMember._inEventTvT && player._inEventTvT))
-							{
-								continue;
-							}
-							if ((partyMember._inEventCTF && !player._inEventCTF) || (!partyMember._inEventCTF && player._inEventCTF))
-							{
-								continue;
-							}
-							if ((partyMember._inEventDM && !player._inEventDM) || (!partyMember._inEventDM && player._inEventDM))
-							{
-								continue;
-							}
-						}
+						
 						if (!partyMember.isDead() && Util.checkIfInRange(_skillRadius, creature, partyMember, true))
 						{
 							PlayerInstance src = null;
@@ -2016,12 +1989,12 @@ public abstract class Skill
 								src = ((Summon) creature).getOwner();
 							}
 							final PlayerInstance trg = partyMember;
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if ((src != null) && (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP))))
+							// if src is in event and trg not or viceversa
+							if ((src != null) && ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent())))
 							{
 								continue;
 							}
+							
 							targetList.add(partyMember);
 							if ((partyMember.getPet() != null) && !partyMember.getPet().isDead())
 							{
@@ -2149,12 +2122,12 @@ public abstract class Skill
 							
 							final PlayerInstance trg = newTarget;
 							final PlayerInstance src = player;
-							// if src is in event and trg not OR viceversa:
-							// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-							if (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)))
+							// if src is in event and trg not or viceversa
+							if ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent()))
 							{
 								continue;
 							}
+							
 							final Summon pet = newTarget.getPet();
 							if ((pet != null) && Util.checkIfInRange(radius, creature, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.TARGET_CORPSE_CLAN) && pet.isDead()) || ((_targetType == SkillTargetType.TARGET_CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this))
 							{
@@ -2393,17 +2366,18 @@ public abstract class Skill
 								}
 							}
 						}
-						// check for Events
+						
 						if (trg == src)
 						{
 							continue;
 						}
-						// if src is in event and trg not OR viceversa:
-						// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-						if ((src != null) && (trg != null) && (((src._inEvent || src._inEventCTF || src._inEventDM || src._inEventTvT || src._inEventVIP) && (!trg._inEvent && !trg._inEventCTF && !trg._inEventDM && !trg._inEventTvT && !trg._inEventVIP)) || ((trg._inEvent || trg._inEventCTF || trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP))))
+						
+						// if src is in event and trg not or viceversa
+						if ((src != null) && (trg != null) && ((src.isOnCustomEvent() && !trg.isOnCustomEvent()) || (trg.isOnCustomEvent() && !src.isOnCustomEvent())))
 						{
 							continue;
 						}
+						
 						targetList.add((Creature) obj);
 					}
 				}
@@ -2877,24 +2851,24 @@ public abstract class Skill
 			}
 			
 			// if src is in event and trg not OR viceversa, the target must be not attackable
-			// to be fixed for mixed events status (in TvT joining phase, someone can attack a partecipating CTF player with area attack)
-			if (((activeCh._inEvent || activeCh._inEventCTF || activeCh._inEventDM || activeCh._inEventTvT || activeCh._inEventVIP) && (!targetChar._inEvent && !targetChar._inEventCTF && !targetChar._inEventDM && !targetChar._inEventTvT && !targetChar._inEventVIP)) || ((targetChar._inEvent || targetChar._inEventCTF || targetChar._inEventDM || targetChar._inEventTvT || targetChar._inEventVIP) && (!activeCh._inEvent && !activeCh._inEventCTF && !activeCh._inEventDM && !activeCh._inEventTvT && !activeCh._inEventVIP)))
+			if ((activeCh.isOnCustomEvent() && !targetChar.isOnCustomEvent()) || (targetChar.isOnCustomEvent() && !activeCh.isOnCustomEvent()))
 			{
 				return true;
 			}
 			
-			if ((activeCh._inEvent && targetChar._inEvent) || (activeCh._inEventDM && targetChar._inEventDM) || (activeCh._inEventTvT && targetChar._inEventTvT) || (activeCh._inEventCTF && targetChar._inEventCTF) || (activeCh._inEventVIP && targetChar._inEventVIP))
+			if (activeCh.isOnCustomEvent() && targetChar.isOnCustomEvent())
 			{
 				return false;
 			}
 			
-			if ((activeCh.getParty() != null) && (targetChar.getParty() != null) && // Is in the same party???
-				(activeCh.getParty().getPartyLeaderOID() == targetChar.getParty().getPartyLeaderOID()))
+			// Is in the same party?
+			if ((activeCh.getParty() != null) && (targetChar.getParty() != null) && (activeCh.getParty().getPartyLeaderOID() == targetChar.getParty().getPartyLeaderOID()))
 			{
 				return true;
 			}
-			if ((activeCh.getClan() != null) && (targetChar.getClan() != null) && // Is in the same clan???
-				(activeCh.getClan().getClanId() == targetChar.getClan().getClanId()))
+			
+			// Is in the same clan?
+			if ((activeCh.getClan() != null) && (targetChar.getClan() != null) && (activeCh.getClan().getClanId() == targetChar.getClan().getClanId()))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 4fd1a32166..badb2283a8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -448,11 +448,6 @@ public class Attackable extends NpcInstance
 			}
 		}
 		
-		if (isEventMob)
-		{
-			return;
-		}
-		
 		// Add damage and hate to the attacker AggroInfo of the Attackable _aggroList
 		if (attacker != null)
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 3b0859e31b..c8ea90a00e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -40,7 +40,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.NpcTable;
 import org.l2jmobius.gameserver.data.xml.MapRegionData;
-import org.l2jmobius.gameserver.data.xml.ZoneData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.ISkillHandler;
@@ -50,11 +49,6 @@ import org.l2jmobius.gameserver.instancemanager.DimensionalRiftManager;
 import org.l2jmobius.gameserver.instancemanager.DuelManager;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.ChanceSkillList;
 import org.l2jmobius.gameserver.model.Duel;
 import org.l2jmobius.gameserver.model.Effect;
@@ -106,7 +100,6 @@ import org.l2jmobius.gameserver.model.skills.funcs.Func;
 import org.l2jmobius.gameserver.model.skills.holders.ISkillsHolder;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.model.zone.type.BossZone;
-import org.l2jmobius.gameserver.model.zone.type.TownZone;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.Attack;
@@ -523,27 +516,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		// default implementation
 	}
 	
-	/** The _in town war. */
-	private boolean _inTownWar;
-	
-	/**
-	 * Checks if is in town war.
-	 * @return true, if is in town war
-	 */
-	public boolean isinTownWar()
-	{
-		return _inTownWar;
-	}
-	
-	/**
-	 * Sets the in town war.
-	 * @param value the new in town war
-	 */
-	public void setInTownWar(boolean value)
-	{
-		_inTownWar = value;
-	}
-	
 	/**
 	 * Teleport a Creature and its pet if necessary.<br>
 	 * <br>
@@ -559,22 +531,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 */
 	public void teleToLocation(int xValue, int yValue, int zValue, boolean allowRandomOffset)
 	{
-		if (Config.TW_DISABLE_GK)
-		{
-			final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-			if ((town != null) && _inTownWar)
-			{
-				if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-				{
-					return;
-				}
-				else if (Config.TW_ALL_TOWNS)
-				{
-					return;
-				}
-			}
-		}
-		
 		// Abort any client actions, casting and remove target.
 		stopMove(null, false);
 		abortAttack();
@@ -1861,31 +1817,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		}
 		else if (this instanceof PlayerInstance)
 		{
-			final PlayerInstance player = (PlayerInstance) this;
-			
-			// to avoid Event Remove buffs on die
-			if (player._inEventDM && DM.hasStarted())
-			{
-				if (Config.DM_REMOVE_BUFFS_ON_DIE)
-				{
-					stopAllEffects();
-				}
-			}
-			else if (player._inEventTvT && TvT.isStarted())
-			{
-				if (Config.TVT_REMOVE_BUFFS_ON_DIE)
-				{
-					stopAllEffects();
-				}
-			}
-			else if (player._inEventCTF && CTF.isStarted())
-			{
-				if (Config.CTF_REMOVE_BUFFS_ON_DIE)
-				{
-					stopAllEffects();
-				}
-			}
-			else if (Config.LEAVE_BUFFS_ON_DIE) // this means that the player is not in event
+			if (Config.LEAVE_BUFFS_ON_DIE)
 			{
 				stopAllEffects();
 			}
@@ -5329,29 +5261,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 */
 	protected void moveToLocation(WorldObject target, int xValue, int yValue, int zValue, int offsetValue)
 	{
-		// Block movement during Event start
-		if (isPlayer())
-		{
-			if (GameEvent.active && getActingPlayer().eventSitForced)
-			{
-				getActingPlayer().sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-				getActingPlayer().getClient().sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if ((TvT.isSitForced() && getActingPlayer()._inEventTvT) || (CTF.isSitForced() && getActingPlayer()._inEventCTF) || (DM.isSitForced() && getActingPlayer()._inEventDM))
-			{
-				getActingPlayer().sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-				getActingPlayer().getClient().sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if (VIP._sitForced && getActingPlayer()._inEventVIP)
-			{
-				getActingPlayer().sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-				getActingPlayer().sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-		}
-		
 		// Get the Move Speed of the Creature
 		final float speed = getStat().getMoveSpeed();
 		if ((speed <= 0) || isMovementDisabled())
@@ -5911,7 +5820,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a PlayerInstance)
-		if ((target == null) || isAlikeDead() || ((this instanceof NpcInstance) && ((NpcInstance) this).isEventMob))
+		if ((target == null) || isAlikeDead())
 		{
 			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
 			return;
@@ -6431,24 +6340,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 				return false;
 			}
 			
-			if (dst.isInFunEvent() && src.isInFunEvent())
+			if (dst.isOnCustomEvent() && src.isOnCustomEvent())
 			{
-				if (src.isInStartedTVTEvent() && dst.isInStartedTVTEvent())
-				{
-					return false;
-				}
-				else if (src.isInStartedDMEvent() && dst.isInStartedDMEvent())
-				{
-					return false;
-				}
-				else if (src.isInStartedCTFEvent() && dst.isInStartedCTFEvent())
-				{
-					return false;
-				}
-				else if (src.isInStartedVIPEvent() && dst.isInStartedVIPEvent())
-				{
-					return false;
-				}
+				return false;
 			}
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java
index 2a32f6ff7a..1fb084b738 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java
@@ -445,14 +445,9 @@ public abstract class Playable extends Creature
 		_lastCharmOfLuckEffect = null;
 	}
 	
-	/**
-	 * Checks if is in fun event.
-	 * @return true, if is in fun event
-	 */
-	public boolean isInFunEvent()
+	public boolean isOnCustomEvent()
 	{
-		final PlayerInstance player = getActingPlayer();
-		return (player != null) && player.isInFunEvent();
+		return false;
 	}
 	
 	/**
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 1606d96cc4..c9acf398df 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -818,6 +818,12 @@ public abstract class Summon extends Playable
 		}
 	}
 	
+	@Override
+	public boolean isOnCustomEvent()
+	{
+		return (_owner != null) && _owner.isOnCustomEvent();
+	}
+	
 	@Override
 	public PlayerInstance getActingPlayer()
 	{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index b4f332a294..bf1a1c3bb7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -88,11 +88,7 @@ public class MonsterInstance extends Attackable
 	@Override
 	public boolean isAutoAttackable(Creature attacker)
 	{
-		if (attacker instanceof MonsterInstance)
-		{
-			return false;
-		}
-		return !isEventMob;
+		return !(attacker instanceof MonsterInstance);
 	}
 	
 	/**
@@ -102,7 +98,7 @@ public class MonsterInstance extends Attackable
 	@Override
 	public boolean isAggressive()
 	{
-		return (getTemplate().getAggroRange() > 0) && !isEventMob;
+		return getTemplate().getAggroRange() > 0;
 	}
 	
 	@Override
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index 2d811dea6c..5862221279 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -42,11 +42,6 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.instancemanager.games.Lottery;
 import org.l2jmobius.gameserver.model.DropCategory;
 import org.l2jmobius.gameserver.model.DropData;
@@ -118,17 +113,8 @@ public class NpcInstance extends Creature
 	private boolean _isSpoil = false;
 	private int _castleIndex = -2;
 	private int _fortIndex = -2;
-	public boolean isEventMob = false;
-	public boolean _isEventMobTvT = false;
-	public boolean _isEventVIPNPC = false;
-	public boolean _isEventVIPNPCEnd = false;
-	public boolean _isEventMobDM = false;
-	public boolean _isEventMobCTF = false;
-	public boolean _isCTF_throneSpawn = false;
-	public boolean _isCTF_Flag = false;
 	private boolean _isInTown = false;
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
-	public String _CTF_FlagTeamName;
 	private int _isSpoiledBy = 0;
 	private long _lastSocialBroadcast = 0;
 	private static final int MINIMUM_SOCIAL_INTERVAL = 6000;
@@ -706,51 +692,17 @@ public class NpcInstance extends Creature
 					
 					// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance to display a social action of the NpcInstance on their client
 					broadcastSocialAction(Rnd.get(8));
-					// Open a chat window on client with the text of the NpcInstance
-					if (isEventMob)
+					
+					final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
+					if (questList.size() == 1)
 					{
-						GameEvent.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventMobTvT)
-					{
-						TvT.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventMobDM)
-					{
-						DM.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventMobCTF)
-					{
-						CTF.showEventHtml(player, String.valueOf(getObjectId()));
-					}
-					else if (_isCTF_Flag && player._inEventCTF)
-					{
-						CTF.showFlagHtml(player, String.valueOf(getObjectId()), _CTF_FlagTeamName);
-					}
-					else if (_isCTF_throneSpawn)
-					{
-						CTF.checkRestoreFlags();
-					}
-					else if (_isEventVIPNPC)
-					{
-						VIP.showJoinHTML(player, String.valueOf(getObjectId()));
-					}
-					else if (_isEventVIPNPCEnd)
-					{
-						VIP.showEndHTML(player, String.valueOf(getObjectId()));
+						questList.get(0).notifyFirstTalk(this, player);
 					}
 					else
 					{
-						final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
-						if (questList.size() == 1)
-						{
-							questList.get(0).notifyFirstTalk(this, player);
-						}
-						else
-						{
-							showChatWindow(player, 0);
-						}
+						showChatWindow(player, 0);
 					}
+					
 					// Like L2OFF player must rotate to the Npc
 					player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, this);
 				}
@@ -995,50 +947,15 @@ public class NpcInstance extends Creature
 						
 						// Send a Server->Client packet SocialAction to the all PlayerInstance on the _knownPlayer of the NpcInstance to display a social action of the NpcInstance on their client
 						broadcastSocialAction(Rnd.get(8));
-						// Open a chat window on client with the text of the NpcInstance
-						if (isEventMob)
+						
+						final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
+						if (questList.size() == 1)
 						{
-							GameEvent.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventMobTvT)
-						{
-							TvT.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventMobDM)
-						{
-							DM.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventMobCTF)
-						{
-							CTF.showEventHtml(player, String.valueOf(getObjectId()));
-						}
-						else if (_isCTF_Flag && player._inEventCTF)
-						{
-							CTF.showFlagHtml(player, String.valueOf(getObjectId()), _CTF_FlagTeamName);
-						}
-						else if (_isCTF_throneSpawn)
-						{
-							CTF.checkRestoreFlags();
-						}
-						else if (_isEventVIPNPC)
-						{
-							VIP.showJoinHTML(player, String.valueOf(getObjectId()));
-						}
-						else if (_isEventVIPNPCEnd)
-						{
-							VIP.showEndHTML(player, String.valueOf(getObjectId()));
+							questList.get(0).notifyFirstTalk(this, player);
 						}
 						else
 						{
-							final List<Quest> questList = getTemplate().getEventQuests(EventType.NPC_FIRST_TALK);
-							if (questList.size() == 1)
-							{
-								questList.get(0).notifyFirstTalk(this, player);
-							}
-							else
-							{
-								showChatWindow(player, 0);
-							}
+							showChatWindow(player, 0);
 						}
 					}
 					
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
index ce00abde6d..07ada4c532 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
@@ -52,9 +52,9 @@ public class ObservationInstance extends FolkInstance
 			return;
 		}
 		
-		if (player._inEventTvT || player._inEventDM || player._inEventCTF)
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("You already participated in Event!");
+			player.sendMessage("You already participate in an event!");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
index cb461bd6d1..5caeab9b0c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
@@ -107,9 +107,9 @@ public class OlympiadManagerInstance extends FolkInstance
 				}
 				case 4:
 				{
-					if (player.isRegisteredInFunEvent())
+					if (player.isRegisteredOnCustomEvent())
 					{
-						player.sendMessage("You are already registered to another Event");
+						player.sendMessage("You are already registered in an event.");
 						return;
 					}
 					Olympiad.getInstance().registerNoble(player, false);
@@ -117,9 +117,9 @@ public class OlympiadManagerInstance extends FolkInstance
 				}
 				case 5:
 				{
-					if (player.isRegisteredInFunEvent())
+					if (player.isRegisteredOnCustomEvent())
 					{
-						player.sendMessage("You are already registered to another Event");
+						player.sendMessage("You are already registered in an event.");
 						return;
 					}
 					Olympiad.getInstance().registerNoble(player, true);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index c9996d3d82..65e9c74a7b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -19,13 +19,11 @@ package org.l2jmobius.gameserver.model.actor.instance;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -85,11 +83,6 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.RebirthManager;
 import org.l2jmobius.gameserver.instancemanager.RecipeManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.AccessLevel;
 import org.l2jmobius.gameserver.model.BlockList;
 import org.l2jmobius.gameserver.model.Duel;
@@ -167,7 +160,6 @@ import org.l2jmobius.gameserver.model.skills.handlers.SkillSummon;
 import org.l2jmobius.gameserver.model.variables.AccountVariables;
 import org.l2jmobius.gameserver.model.variables.PlayerVariables;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.type.TownZone;
 import org.l2jmobius.gameserver.model.zone.type.WaterZone;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -199,7 +191,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ObservationMode;
 import org.l2jmobius.gameserver.network.serverpackets.ObservationReturn;
 import org.l2jmobius.gameserver.network.serverpackets.PartySmallWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetInventoryUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
 import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete;
 import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
@@ -276,12 +267,6 @@ public class PlayerInstance extends Playable
 	public static final int STORE_PRIVATE_MANUFACTURE = 5;
 	public static final int STORE_PRIVATE_PACKAGE_SELL = 8;
 	
-	public boolean _isVIP = false;
-	public boolean _inEventVIP = false;
-	public boolean _isNotVIP = false;
-	public boolean _isTheVIP = false;
-	public int _originalNameColourVIP;
-	public int _originalKarmaVIP;
 	private PlayerStatsHolder savedStatus = null;
 	private final long _instanceLoginTime;
 	protected long _toggleUse = 0;
@@ -321,43 +306,6 @@ public class PlayerInstance extends Playable
 	private boolean _isAio = false;
 	private long _aioEndTime = 0;
 	private boolean _expGain = true;
-	
-	public int eventX;
-	public int eventY;
-	public int eventZ;
-	public int eventKarma;
-	public int eventPvpKills;
-	public int eventPkKills;
-	public String eventTitle;
-	public List<String> kills = new LinkedList<>();
-	public boolean eventSitForced = false;
-	public boolean atEvent = false;
-	public String _teamNameTvT;
-	public String _originalTitleTvT;
-	public int _originalNameColorTvT = 0;
-	public int _countTvTkills;
-	public int _countTvTdies;
-	public int _originalKarmaTvT;
-	public boolean _inEventTvT = false;
-	public String _teamNameCTF;
-	public String _teamNameHaveFlagCTF;
-	public String _originalTitleCTF;
-	public int _originalNameColorCTF = 0;
-	public int _originalKarmaCTF;
-	public int _countCTFflags;
-	public boolean _inEventCTF = false;
-	public boolean _haveFlagCTF = false;
-	public Future<?> _posCheckerCTF = null;
-	public String _originalTitleDM;
-	public int _originalNameColorDM = 0;
-	public int _countDMkills;
-	public int _originalKarmaDM;
-	public boolean _inEventDM = false;
-	public int _originalNameColor;
-	public int _countKills;
-	public int _originalKarma;
-	public int _eventKills;
-	public boolean _inEvent = false;
 	private boolean _inOlympiadMode = false;
 	private boolean _olympiadStart = false;
 	private int[] _olympiadPosition;
@@ -463,6 +411,8 @@ public class PlayerInstance extends Playable
 	private final int[] _loto = new int[5];
 	private final int[] _race = new int[2];
 	private final BlockList _blockList = new BlockList(this);
+	private boolean _isRegisteredOnCustomEvent = false;
+	private boolean _isOnCustomEvent = false;
 	private int _team = 0;
 	private int _alliedVarkaKetra = 0;
 	private int _hasCoupon = 0;
@@ -508,7 +458,6 @@ public class PlayerInstance extends Playable
 	private int _engageid = 0;
 	private boolean _marryrequest = false;
 	private boolean _marryaccepted = false;
-	private int quakeSystem = 0;
 	private boolean _isLocked = false;
 	private boolean _isStored = false;
 	private int _masteryWeapPenalty = 0;
@@ -663,13 +612,6 @@ public class PlayerInstance extends Playable
 				return;
 			}
 			
-			// during teleport phase, players cant do any attack
-			if ((TvT.isTeleport() && _inEventTvT) || (CTF.isTeleport() && _inEventCTF) || (DM.isTeleport() && _inEventDM))
-			{
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
 			// Pk protection config
 			if (Config.ALLOW_CHAR_KILL_PROTECT && !isGM() && target.isPlayer() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getKarma() == 0))
 			{
@@ -717,13 +659,6 @@ public class PlayerInstance extends Playable
 				return;
 			}
 			
-			// during teleport phase, players cant do any attack
-			if ((TvT.isTeleport() && _inEventTvT) || (CTF.isTeleport() && _inEventCTF) || (DM.isTeleport() && _inEventDM))
-			{
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			
 			super.doCast(skill);
 			
 			if (!skill.isOffensive())
@@ -1191,13 +1126,6 @@ public class PlayerInstance extends Playable
 	 */
 	public void logout(boolean kicked)
 	{
-		// prevent from player disconnect when in Event
-		if (atEvent)
-		{
-			sendMessage("A superior power doesn't allow you to leave the event.");
-			sendPacket(ActionFailed.STATIC_PACKET);
-		}
-		
 		_kicked = kicked;
 		closeNetConnection();
 	}
@@ -3210,19 +3138,7 @@ public class PlayerInstance extends Playable
 			stopFakeDeath(null);
 		}
 		
-		if (GameEvent.active && eventSitForced)
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up ...");
-		}
-		else if ((TvT.isSitForced() && _inEventTvT) || (CTF.isSitForced() && _inEventCTF) || (DM.isSitForced() && _inEventDM))
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-		}
-		else if (VIP._sitForced && _inEventVIP)
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-		}
-		else if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
+		if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
 		{
 			if (_relax)
 			{
@@ -4412,25 +4328,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public void onAction(PlayerInstance player)
 	{
-		// no Interaction with not participant to events
-		if (((TvT.isStarted() || TvT.isTeleport()) && !Config.TVT_ALLOW_INTERFERENCE) || ((CTF.isStarted() || CTF.isTeleport()) && !Config.CTF_ALLOW_INTERFERENCE) || ((DM.hasStarted() || DM.isTeleport()) && !Config.DM_ALLOW_INTERFERENCE))
-		{
-			if ((_inEventTvT && !player._inEventTvT) || (!_inEventTvT && player._inEventTvT))
-			{
-				player.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if ((_inEventCTF && !player._inEventCTF) || (!_inEventCTF && player._inEventCTF))
-			{
-				player.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-			else if ((_inEventDM && !player._inEventDM) || (!_inEventDM && player._inEventDM))
-			{
-				player.sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-		}
 		// Check if the PlayerInstance is confused
 		if (player.isOutOfControl())
 		{
@@ -4530,25 +4427,6 @@ public class PlayerInstance extends Playable
 		}
 		else // Like L2OFF set the target of the PlayerInstance player
 		{
-			if (((TvT.isStarted() || TvT.isTeleport()) && !Config.TVT_ALLOW_INTERFERENCE) || ((CTF.isStarted() || CTF.isTeleport()) && !Config.CTF_ALLOW_INTERFERENCE) || ((DM.hasStarted() || DM.isTeleport()) && !Config.DM_ALLOW_INTERFERENCE))
-			{
-				if ((_inEventTvT && !player._inEventTvT) || (!_inEventTvT && player._inEventTvT))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-				else if ((_inEventCTF && !player._inEventCTF) || (!_inEventCTF && player._inEventCTF))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-				else if ((_inEventDM && !player._inEventDM) || (!_inEventDM && player._inEventDM))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-			}
-			
 			// Check if the PlayerInstance is confused
 			if (player.isOutOfControl())
 			{
@@ -4671,61 +4549,6 @@ public class PlayerInstance extends Playable
 		}
 	}
 	
-	@Override
-	public boolean isInFunEvent()
-	{
-		return (atEvent || isInStartedTVTEvent() || isInStartedDMEvent() || isInStartedCTFEvent() || isInStartedVIPEvent());
-	}
-	
-	public boolean isInStartedTVTEvent()
-	{
-		return (TvT.isStarted() && _inEventTvT);
-	}
-	
-	public boolean isRegisteredInTVTEvent()
-	{
-		return _inEventTvT;
-	}
-	
-	public boolean isInStartedDMEvent()
-	{
-		return (DM.hasStarted() && _inEventDM);
-	}
-	
-	public boolean isRegisteredInDMEvent()
-	{
-		return _inEventDM;
-	}
-	
-	public boolean isInStartedCTFEvent()
-	{
-		return (CTF.isStarted() && _inEventCTF);
-	}
-	
-	public boolean isRegisteredInCTFEvent()
-	{
-		return _inEventCTF;
-	}
-	
-	public boolean isInStartedVIPEvent()
-	{
-		return (VIP._started && _inEventVIP);
-	}
-	
-	public boolean isRegisteredInVIPEvent()
-	{
-		return _inEventVIP;
-	}
-	
-	/**
-	 * Checks if is registered in fun event.
-	 * @return true, if is registered in fun event
-	 */
-	public boolean isRegisteredInFunEvent()
-	{
-		return (atEvent || (_inEventTvT) || (_inEventDM) || (_inEventCTF) || (_inEventVIP) || Olympiad.getInstance().isRegistered(this));
-	}
-	
 	/**
 	 * Are player offensive skills locked.
 	 * @return true, if successful
@@ -5783,21 +5606,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean doDie(Creature killer)
 	{
-		if (Config.TW_RESS_ON_DIE)
-		{
-			final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-			if ((town != null) && isinTownWar())
-			{
-				if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-				{
-					reviveRequest(this, null, false);
-				}
-				else if (Config.TW_ALL_TOWNS)
-				{
-					reviveRequest(this, null, false);
-				}
-			}
-		}
 		// Kill the PlayerInstance
 		if (!super.doDie(killer))
 		{
@@ -5817,142 +5625,6 @@ public class PlayerInstance extends Playable
 		if (killer != null)
 		{
 			final PlayerInstance pk = killer.getActingPlayer();
-			if (pk != null)
-			{
-				if (Config.ENABLE_PK_INFO)
-				{
-					doPkInfo(pk);
-				}
-				
-				if (atEvent)
-				{
-					pk.kills.add(getName());
-				}
-				
-				if (_inEventTvT && pk._inEventTvT)
-				{
-					if (TvT.isTeleport() || TvT.isStarted())
-					{
-						if (!(pk._teamNameTvT.equals(_teamNameTvT)))
-						{
-							_countTvTdies++;
-							pk._countTvTkills++;
-							pk.setTitle("Kills: " + pk._countTvTkills);
-							pk.sendPacket(new PlaySound(0, "ItemSound.quest_itemget", this));
-							pk.broadcastUserInfo();
-							TvT.setTeamKillsCount(pk._teamNameTvT, TvT.teamKillsCount(pk._teamNameTvT) + 1);
-							pk.broadcastUserInfo();
-						}
-						else
-						{
-							pk.sendMessage("You are a teamkiller !!! Teamkills not counting.");
-						}
-						sendMessage("You will be revived and teleported to team spot in " + (Config.TVT_REVIVE_DELAY / 1000) + " seconds!");
-						ThreadPool.schedule(() ->
-						{
-							teleToLocation((TvT._teamsX.get(TvT._teams.indexOf(_teamNameTvT)) + Rnd.get(201)) - 100, (TvT._teamsY.get(TvT._teams.indexOf(_teamNameTvT)) + Rnd.get(201)) - 100, TvT._teamsZ.get(TvT._teams.indexOf(_teamNameTvT)));
-							doRevive();
-						}, Config.TVT_REVIVE_DELAY);
-					}
-				}
-				else if (_inEventTvT)
-				{
-					if (TvT.isTeleport() || TvT.isStarted())
-					{
-						sendMessage("You will be revived and teleported to team spot in " + (Config.TVT_REVIVE_DELAY / 1000) + " seconds!");
-						ThreadPool.schedule(() ->
-						{
-							teleToLocation(TvT._teamsX.get(TvT._teams.indexOf(_teamNameTvT)), TvT._teamsY.get(TvT._teams.indexOf(_teamNameTvT)), TvT._teamsZ.get(TvT._teams.indexOf(_teamNameTvT)));
-							doRevive();
-							broadcastPacket(new SocialAction(getObjectId(), 15));
-						}, Config.TVT_REVIVE_DELAY);
-					}
-				}
-				else if (_inEventCTF)
-				{
-					if (CTF.isTeleport() || CTF.isStarted())
-					{
-						sendMessage("You will be revived and teleported to team flag in 20 seconds!");
-						if (_haveFlagCTF)
-						{
-							removeCTFFlagOnDie();
-						}
-						ThreadPool.schedule(() ->
-						{
-							teleToLocation(CTF._teamsX.get(CTF._teams.indexOf(_teamNameCTF)), CTF._teamsY.get(CTF._teams.indexOf(_teamNameCTF)), CTF._teamsZ.get(CTF._teams.indexOf(_teamNameCTF)));
-							doRevive();
-						}, 20000);
-					}
-				}
-				else if (_inEventDM && pk._inEventDM)
-				{
-					if (DM.isTeleport() || DM.hasStarted())
-					{
-						pk._countDMkills++;
-						pk.setTitle("Kills: " + pk._countDMkills);
-						pk.sendPacket(new PlaySound(0, "ItemSound.quest_itemget", this));
-						pk.broadcastUserInfo();
-						
-						if (Config.DM_ENABLE_KILL_REWARD)
-						{
-							final Item reward = ItemTable.getInstance().getTemplate(Config.DM_KILL_REWARD_ID);
-							pk.getInventory().addItem("DM Kill Reward", Config.DM_KILL_REWARD_ID, Config.DM_KILL_REWARD_AMOUNT, this, null);
-							pk.sendMessage("You have earned " + Config.DM_KILL_REWARD_AMOUNT + " item(s) of ID " + reward.getName() + ".");
-						}
-						
-						sendMessage("You will be revived and teleported to spot in 20 seconds!");
-						ThreadPool.schedule(() ->
-						{
-							final Location ploc = DM.getPlayersSpawnLocation();
-							teleToLocation(ploc.getX(), ploc.getY(), ploc.getZ());
-							doRevive();
-						}, Config.DM_REVIVE_DELAY);
-					}
-				}
-				else if (_inEventDM)
-				{
-					if (DM.isTeleport() || DM.hasStarted())
-					{
-						sendMessage("You will be revived and teleported to spot in 20 seconds!");
-						ThreadPool.schedule(() ->
-						{
-							final Location ploc = DM.getPlayersSpawnLocation();
-							teleToLocation(ploc.getX(), ploc.getY(), ploc.getZ());
-							doRevive();
-						}, 20000);
-					}
-				}
-				else if (_inEventVIP && VIP._started)
-				{
-					if (_isTheVIP && !pk._inEventVIP)
-					{
-						AnnouncementsTable.getInstance().announceToAll("VIP Killed by non-event character. VIP going back to initial spawn.");
-						doRevive();
-						teleToLocation(VIP._startX, VIP._startY, VIP._startZ);
-					}
-					else if (_isTheVIP && pk._inEventVIP)
-					{
-						VIP.vipDied();
-					}
-					else
-					{
-						sendMessage("You will be revived and teleported to team spot in 20 seconds!");
-						ThreadPool.schedule(() ->
-						{
-							doRevive();
-							if (_isVIP)
-							{
-								teleToLocation(VIP._startX, VIP._startY, VIP._startZ);
-							}
-							else
-							{
-								teleToLocation(VIP._endX, VIP._endY, VIP._endZ);
-							}
-						}, 20000);
-					}
-					broadcastUserInfo();
-				}
-			}
 			
 			// Clear resurrect xp calculation
 			setExpBeforeDeath(0);
@@ -6022,14 +5694,13 @@ public class PlayerInstance extends Playable
 		
 		stopRentPet();
 		stopWaterTask();
-		quakeSystem = 0;
 		
 		// leave war legend aura if enabled
 		_heroConsecutiveKillCount = 0;
 		if (Config.WAR_LEGEND_AURA && !_hero && _isPvpHero)
 		{
 			setHeroAura(false);
-			sendMessage("You leaved War Legend State");
+			sendMessage("War Legend state removed.");
 		}
 		
 		// Refresh focus force like L2OFF
@@ -6037,26 +5708,13 @@ public class PlayerInstance extends Playable
 		return true;
 	}
 	
-	/**
-	 * Removes the ctf flag on die.
-	 */
-	public void removeCTFFlagOnDie()
-	{
-		CTF._flagsTaken.set(CTF._teams.indexOf(_teamNameHaveFlagCTF), false);
-		CTF.spawnFlag(_teamNameHaveFlagCTF);
-		CTF.removeFlagFromPlayer(this);
-		broadcastUserInfo();
-		_haveFlagCTF = false;
-		AnnouncementsTable.getInstance().criticalAnnounceToAll(CTF.getEventName() + "(CTF): " + _teamNameHaveFlagCTF + "'s flag returned.");
-	}
-	
 	/**
 	 * On die drop item.
 	 * @param killer the killer
 	 */
 	private void onDieDropItem(Creature killer)
 	{
-		if (atEvent || (TvT.isStarted() && _inEventTvT) || (DM.hasStarted() && _inEventDM) || (CTF.isStarted() && _inEventCTF) || (VIP._started && _inEventVIP) || (killer == null))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6178,7 +5836,7 @@ public class PlayerInstance extends Playable
 			return;
 		}
 		
-		if ((_inEventCTF && CTF.isStarted()) || (_inEventTvT && TvT.isStarted()) || (_inEventVIP && VIP._started) || (_inEventDM && DM.hasStarted()))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6270,7 +5928,7 @@ public class PlayerInstance extends Playable
 			}
 			
 			// 'No war' or 'One way war' -> 'Normal PK'
-			if ((!_inEventTvT || !TvT.isStarted()) || (!_inEventCTF || !CTF.isStarted()) || (!_inEventVIP || !VIP._started) || (!_inEventDM || !DM.hasStarted()))
+			if (!isOnCustomEvent())
 			{
 				if (targetPlayer.getKarma() > 0) // Target player has karma
 				{
@@ -6299,7 +5957,7 @@ public class PlayerInstance extends Playable
 			AnnouncementsTable.getInstance().announceToAll("Player " + getName() + " killed Player " + target.getName());
 		}
 		
-		if (_inEventDM && DM.hasStarted())
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6447,22 +6105,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void increasePvpKills()
 	{
-		final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-		if ((town != null) && isinTownWar())
-		{
-			if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-			else if (Config.TW_ALL_TOWNS)
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-		}
-		
-		if ((TvT.isStarted() && _inEventTvT) || (DM.hasStarted() && _inEventDM) || (CTF.isStarted() && _inEventCTF) || (VIP._started && _inEventVIP))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6497,230 +6140,17 @@ public class PlayerInstance extends Playable
 		updatePvPColor(getPvpKills());
 		broadcastUserInfo();
 		
-		if (Config.ALLOW_QUAKE_SYSTEM)
-		{
-			QuakeSystem();
-		}
-		
 		// Send a Server->Client UserInfo packet to attacker with its Karma and PK Counter
 		sendPacket(new UserInfo(this));
 	}
 	
-	public void QuakeSystem()
-	{
-		quakeSystem++;
-		switch (quakeSystem)
-		{
-			case 5:
-			{
-				if (Config.ENABLE_ANTI_PVP_FARM_MSG)
-				{
-					final CreatureSay cs12 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " 5 consecutive kill! Only Gm."); // 8D
-					for (PlayerInstance player : World.getInstance().getAllPlayers())
-					{
-						if ((player != null) && player.isOnline() && player.isGM())
-						{
-							player.sendPacket(cs12);
-						}
-					}
-				}
-				break;
-			}
-			case 6:
-			{
-				final CreatureSay cs = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is Dominating!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs);
-					}
-				}
-				break;
-			}
-			case 9:
-			{
-				final CreatureSay cs2 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Rampage!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs2);
-					}
-				}
-				break;
-			}
-			case 14:
-			{
-				final CreatureSay cs3 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Killing Spree!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs3);
-					}
-				}
-				break;
-			}
-			case 18:
-			{
-				final CreatureSay cs4 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Monster Kill!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs4);
-					}
-				}
-				break;
-			}
-			case 22:
-			{
-				final CreatureSay cs5 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is Unstoppable!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs5);
-					}
-				}
-				break;
-			}
-			case 25:
-			{
-				final CreatureSay cs6 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on an Ultra Kill!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs6);
-					}
-				}
-				break;
-			}
-			case 28:
-			{
-				final CreatureSay cs7 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " God Blessed!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs7);
-					}
-				}
-				break;
-			}
-			case 32:
-			{
-				final CreatureSay cs8 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is Wicked Sick!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs8);
-					}
-				}
-				break;
-			}
-			case 35:
-			{
-				final CreatureSay cs9 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is on a Ludricrous Kill!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs9);
-					}
-				}
-				break;
-			}
-			case 40:
-			{
-				final CreatureSay cs10 = new CreatureSay(0, ChatType.PARTYROOM_COMMANDER, "", getName() + " is GodLike!"); // 8D
-				for (PlayerInstance player : World.getInstance().getAllPlayers())
-				{
-					if ((player != null) && player.isOnline())
-					{
-						player.sendPacket(cs10);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Get info on pk's from pk table.
-	 * @param playerWhoKilled the player who killed
-	 */
-	public void doPkInfo(PlayerInstance playerWhoKilled)
-	{
-		final String killer = playerWhoKilled.getName();
-		final String killed = getName();
-		int killCount = 0;
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			final PreparedStatement statement = con.prepareStatement("SELECT kills FROM pkkills WHERE killerId=? AND killedId=?");
-			statement.setString(1, killer);
-			statement.setString(2, killed);
-			final ResultSet rset = statement.executeQuery();
-			if (rset.next())
-			{
-				killCount = rset.getInt("kills");
-			}
-			rset.close();
-			statement.close();
-		}
-		catch (SQLException e)
-		{
-			LOGGER.warning(e.toString());
-		}
-		
-		if (killCount >= 1)
-		{
-			killCount++;
-			try (Connection con = DatabaseFactory.getConnection())
-			{
-				final PreparedStatement statement = con.prepareStatement("UPDATE pkkills SET kills=? WHERE killerId=? AND killedId=?");
-				statement.setInt(1, killCount);
-				statement.setString(2, killer);
-				statement.setString(3, killed);
-				statement.execute();
-				statement.close();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.info("Could not update pkKills, got: " + e.getMessage());
-			}
-			sendMessage("You have been killed " + kills + " times by " + playerWhoKilled.getName() + ".");
-			playerWhoKilled.sendMessage("You have killed " + getName() + " " + kills + " times.");
-		}
-		else
-		{
-			try (Connection con = DatabaseFactory.getConnection())
-			{
-				final PreparedStatement statement = con.prepareStatement("INSERT INTO pkkills (killerId,killedId,kills) VALUES (?,?,?)");
-				statement.setString(1, killer);
-				statement.setString(2, killed);
-				statement.setInt(3, 1);
-				statement.execute();
-				statement.close();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.info("Could not add pkKills, got: " + e.getMessage());
-			}
-			sendMessage("This is the first time you have been killed by " + playerWhoKilled.getName() + ".");
-			playerWhoKilled.sendMessage("You have killed " + getName() + " for the first time.");
-		}
-	}
-	
 	/**
 	 * Increase pk count, karma and send the info to the player.
 	 * @param targLVL : level of the killed player
 	 */
 	public void increasePkKillsAndKarma(int targLVL)
 	{
-		if ((TvT.isStarted() && _inEventTvT) || (DM.hasStarted() && _inEventDM) || (CTF.isStarted() && _inEventCTF) || (VIP._started && _inEventVIP))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6787,26 +6217,6 @@ public class PlayerInstance extends Playable
 		// Add karma to attacker and increase its PK counter
 		setPkKills(getPkKills() + 1);
 		
-		final TownZone town = ZoneData.getInstance().getZone(getX(), getY(), getZ(), TownZone.class);
-		if ((town == null) || (isinTownWar() && Config.TW_ALLOW_KARMA))
-		{
-			setKarma(getKarma() + newKarma);
-		}
-		
-		if ((town != null) && isinTownWar())
-		{
-			if ((town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS)
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-			else if (Config.TW_ALL_TOWNS && (town.getTownId() != 0))
-			{
-				getInventory().addItem("TownWar", Config.TW_ITEM_ID, Config.TW_ITEM_AMOUNT, this, this);
-				sendMessage("You received your prize for a town war kill!");
-			}
-		}
-		
 		if (Config.PVP_PK_TITLE)
 		{
 			updateTitle();
@@ -6861,7 +6271,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void updatePvPStatus()
 	{
-		if ((TvT.isStarted() && _inEventTvT) || (CTF.isStarted() && _inEventCTF) || (DM.hasStarted() && _inEventDM) || (VIP._started && _inEventVIP))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6899,12 +6309,7 @@ public class PlayerInstance extends Playable
 			return;
 		}
 		
-		if ((TvT.isStarted() && _inEventTvT && targetPlayer._inEventTvT) || (DM.hasStarted() && _inEventDM && targetPlayer._inEventDM) || (CTF.isStarted() && _inEventCTF && targetPlayer._inEventCTF) || (VIP._started && _inEventVIP && targetPlayer._inEventVIP))
-		{
-			return;
-		}
-		
-		if (isInDuel() && (targetPlayer.getDuelId() == getDuelId()))
+		if (isOnCustomEvent())
 		{
 			return;
 		}
@@ -6986,7 +6391,7 @@ public class PlayerInstance extends Playable
 		
 		// Calculate the Experience loss
 		long lostExp = 0;
-		if (!atEvent && (!_inEventTvT || !TvT.isStarted()) && (!_inEventDM || !DM.hasStarted()) && (!_inEventCTF || !CTF.isStarted()) && (!_inEventVIP || !VIP._started))
+		if (!isOnCustomEvent())
 		{
 			final byte maxLevel = ExperienceData.getInstance().getMaxLevel();
 			if (lvl < maxLevel)
@@ -7047,7 +6452,6 @@ public class PlayerInstance extends Playable
 		stopRentPet();
 		stopPvpRegTask();
 		stopPunishTask(true);
-		quakeSystem = 0;
 	}
 	
 	/**
@@ -9685,7 +9089,7 @@ public class PlayerInstance extends Playable
 			}
 		}
 		
-		if ((attacker instanceof Playable) && isInFunEvent())
+		if ((attacker instanceof Playable) && isOnCustomEvent())
 		{
 			PlayerInstance player = null;
 			if (attacker instanceof PlayerInstance)
@@ -9700,9 +9104,9 @@ public class PlayerInstance extends Playable
 			if (player != null)
 			{
 				// checks for events
-				if (player.isInFunEvent())
+				if (player.isOnCustomEvent())
 				{
-					return (_inEventTvT && player._inEventTvT && TvT.isStarted() && !_teamNameTvT.equals(player._teamNameTvT)) || (_inEventCTF && player._inEventCTF && CTF.isStarted() && !_teamNameCTF.equals(player._teamNameCTF)) || (_inEventDM && player._inEventDM && DM.hasStarted()) || (_inEventVIP && player._inEventVIP && VIP._started);
+					return (isOnCustomEvent() && player.isOnCustomEvent() && (getTeam() != player.getTeam()));
 				}
 				return false;
 			}
@@ -10238,10 +9642,6 @@ public class PlayerInstance extends Playable
 			// Check if a Forced ATTACK is in progress on non-attackable target
 			if (!target.isAutoAttackable(this) //
 				&& (!forceUse && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262 /* Double Heart Shot */))) //
-				&& (!_inEventTvT || !TvT.isStarted()) //
-				&& (!_inEventDM || !DM.hasStarted()) //
-				&& (!_inEventCTF || !CTF.isStarted()) //
-				&& (!_inEventVIP || !VIP._started) //
 				&& (skillTargetType != SkillTargetType.TARGET_AURA) //
 				&& (skillTargetType != SkillTargetType.TARGET_CLAN) //
 				&& (skillTargetType != SkillTargetType.TARGET_ALLY) //
@@ -10473,16 +9873,9 @@ public class PlayerInstance extends Playable
 		WorldObject target = worldObject;
 		
 		// Check if player and target are in events and on the same team.
-		if (target instanceof PlayerInstance)
+		if ((target instanceof PlayerInstance) && isOnCustomEvent() && skill.isOffensive())
 		{
-			if ((skill.isOffensive() && (_inEventTvT && target.getActingPlayer()._inEventTvT && TvT.isStarted() && !_teamNameTvT.equals(target.getActingPlayer()._teamNameTvT))) || (_inEventCTF && target.getActingPlayer()._inEventCTF && CTF.isStarted() && !_teamNameCTF.equals(target.getActingPlayer()._teamNameCTF)) || (_inEventDM && target.getActingPlayer()._inEventDM && DM.hasStarted()) || (_inEventVIP && target.getActingPlayer()._inEventVIP && VIP._started))
-			{
-				return true;
-			}
-			else if (isInFunEvent() && skill.isOffensive()) // same team return false
-			{
-				return false;
-			}
+			return target.getActingPlayer().isOnCustomEvent() && (getTeam() != target.getActingPlayer().getTeam());
 		}
 		
 		// check for PC->PC Pvp status
@@ -11896,6 +11289,27 @@ public class PlayerInstance extends Playable
 		return _lvlJoinedAcademy > 0;
 	}
 	
+	public boolean isRegisteredOnCustomEvent()
+	{
+		return _isRegisteredOnCustomEvent || _isOnCustomEvent;
+	}
+	
+	public void setRegisteredOnCustomEvent(boolean value)
+	{
+		_isRegisteredOnCustomEvent = value;
+	}
+	
+	@Override
+	public boolean isOnCustomEvent()
+	{
+		return _isOnCustomEvent;
+	}
+	
+	public void setOnCustomEvent(boolean value)
+	{
+		_isOnCustomEvent = value;
+	}
+	
 	/**
 	 * Sets the team.
 	 * @param team the new team
@@ -12803,7 +12217,7 @@ public class PlayerInstance extends Playable
 			getParty().getDimensionalRift().memberRessurected(this);
 		}
 		
-		if ((_inEventTvT && TvT.isStarted() && Config.TVT_REVIVE_RECOVERY) || (_inEventCTF && CTF.isStarted() && Config.CTF_REVIVE_RECOVERY) || (_inEventDM && DM.hasStarted() && Config.DM_REVIVE_RECOVERY))
+		if (isOnCustomEvent())
 		{
 			getStatus().setCurrentHp(getMaxHp());
 			getStatus().setCurrentMp(getMaxMp());
@@ -15051,26 +14465,6 @@ public class PlayerInstance extends Playable
 		_saymode = say;
 	}
 	
-	/**
-	 * Save event stats.
-	 */
-	public void saveEventStats()
-	{
-		_originalNameColor = getAppearance().getNameColor();
-		_originalKarma = getKarma();
-		_eventKills = 0;
-	}
-	
-	/**
-	 * Restore event stats.
-	 */
-	public void restoreEventStats()
-	{
-		getAppearance().setNameColor(_originalNameColor);
-		setKarma(_originalKarma);
-		_eventKills = 0;
-	}
-	
 	/**
 	 * Gets the current skill world position.
 	 * @return the current skill world position
@@ -15523,7 +14917,7 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean isFalling(int z)
 	{
-		if (isDead() || isFlying() || isInFunEvent() || isInsideZone(ZoneId.WATER))
+		if (isDead() || isFlying() || isInsideZone(ZoneId.WATER))
 		{
 			return false;
 		}
@@ -15872,22 +15266,6 @@ public class PlayerInstance extends Playable
 					sendMessage("You are in jail for " + (delayInMilliseconds / 60000) + " minutes.");
 				}
 				
-				if (_inEventCTF)
-				{
-					CTF.onDisconnect(this);
-				}
-				else if (_inEventDM)
-				{
-					DM.onDisconnect(this);
-				}
-				else if (_inEventTvT)
-				{
-					TvT.onDisconnect(this);
-				}
-				else if (_inEventVIP)
-				{
-					VIP.onDisconnect(this);
-				}
 				if (Olympiad.getInstance().isRegisteredInComp(this))
 				{
 					Olympiad.getInstance().removeDisconnectedCompetitor(this);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 73f6f7c731..520d3c324c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -328,8 +328,10 @@ public class VillageMasterInstance extends FolkInstance
 					{
 						return;
 					}
+					
 					player.setLocked(true);
 					boolean allowAddition = true;
+					
 					// Subclass exploit fix during add subclass
 					if (!player.getFloodProtectors().getSubclass().tryPerformAction("add subclass"))
 					{
@@ -337,19 +339,22 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
-					// You can't add Subclass when you are registered in Events (TVT, CTF, DM)
-					if (player._inEventTvT || player._inEventCTF || player._inEventDM)
+					
+					// You can't add subclass when you are registered in an event.
+					if (player.isRegisteredOnCustomEvent())
 					{
 						player.sendMessage("You can't add a subclass while in an event.");
 						player.setLocked(false);
 						return;
 					}
+					
 					// Check player level
 					if (player.getLevel() < 75)
 					{
 						player.sendMessage("You may not add a new sub class before you are level 75 on your previous class.");
 						allowAddition = false;
 					}
+					
 					// You can't add Subclass when you are registered in Olympiad
 					if (Olympiad.getInstance().isRegisteredInComp(player) || (player.getOlympiadGameId() > 0))
 					{
@@ -357,6 +362,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					if (allowAddition && !player.getSubClasses().isEmpty())
 					{
 						for (Iterator<SubClass> subList = iterSubClasses(player); subList.hasNext();)
@@ -370,6 +376,7 @@ public class VillageMasterInstance extends FolkInstance
 							}
 						}
 					}
+					
 					// If quest checking is enabled, verify if the character has completed the Mimir's Elixir (Path to Subclass) and Fate's Whisper (A Grade Weapon) quests by checking for instances of their unique reward items.
 					// If they both exist, remove both unique items and continue with adding the sub-class.
 					if (!Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS)
@@ -389,6 +396,7 @@ public class VillageMasterInstance extends FolkInstance
 							return;
 						}
 					}
+					
 					if (allowAddition)
 					{
 						final String className = PlayerTemplateData.getInstance().getClassNameById(paramOne);
@@ -422,7 +430,9 @@ public class VillageMasterInstance extends FolkInstance
 					{
 						return;
 					}
+					
 					player.setLocked(true);
+					
 					// Subclass exploit fix during change subclass
 					if (!player.getFloodProtectors().getSubclass().tryPerformAction("change subclass"))
 					{
@@ -430,13 +440,15 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
-					// You can't change Subclass when you are registered in Events (TVT, CTF, DM)
-					if (player._inEventTvT || player._inEventCTF || player._inEventDM)
+					
+					// You can't change subclass when you are registered in an event.
+					if (player.isRegisteredOnCustomEvent())
 					{
 						player.sendMessage("You can't change subclass while in an event.");
 						player.setLocked(false);
 						return;
 					}
+					
 					// You can't change Subclass when you are registered in Olympiad
 					if (Olympiad.getInstance().isRegisteredInComp(player) || (player.getOlympiadGameId() > 0))
 					{
@@ -444,6 +456,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					player.setActiveClass(paramOne);
 					content.append("Change Subclass:<br>Your active sub class is now a <font color=\"LEVEL\">" + PlayerTemplateData.getInstance().getClassNameById(player.getActiveClass()) + "</font>.");
 					player.sendPacket(SystemMessageId.THE_TRANSFER_OF_SUB_CLASS_HAS_BEEN_COMPLETED); // Transfer completed.
@@ -478,7 +491,9 @@ public class VillageMasterInstance extends FolkInstance
 					{
 						return;
 					}
+					
 					player.setLocked(true);
+					
 					// Subclass exploit fix during delete subclass
 					if (!player.getFloodProtectors().getSubclass().tryPerformAction("delete subclass"))
 					{
@@ -486,13 +501,15 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
-					// You can't delete Subclass when you are registered in Events (TVT, CTF, DM)
-					if (player._inEventTvT || player._inEventCTF || player._inEventDM)
+					
+					// You can't delete subclass when you are registered in an event.
+					if (player.isRegisteredOnCustomEvent())
 					{
 						player.sendMessage("You can't delete a subclass while in an event.");
 						player.setLocked(false);
 						return;
 					}
+					
 					// You can't delete Subclass when you are registered in Olympiad
 					if (Olympiad.getInstance().isRegisteredInComp(player) || (player.getOlympiadGameId() > 0))
 					{
@@ -500,6 +517,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					if (player.modifySubClass(paramOne, paramTwo))
 					{
 						player.setActiveClass(paramOne);
@@ -520,6 +538,7 @@ public class VillageMasterInstance extends FolkInstance
 						player.setLocked(false);
 						return;
 					}
+					
 					player.setLocked(false);
 					break;
 				}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index a106aab97f..0d37d0f97a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -20,7 +20,6 @@ import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.ExperienceData;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.SubClass;
 import org.l2jmobius.gameserver.model.actor.instance.ClassMasterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
@@ -214,15 +213,6 @@ public class PlayerStat extends PlayableStat
 			getActiveChar().sendPacket(SystemMessageId.YOUR_LEVEL_HAS_INCREASED);
 		}
 		
-		if (getActiveChar().isInFunEvent())
-		{
-			if (getActiveChar()._inEventTvT && (TvT.getMaxLevel() == getLevel()) && !TvT.isStarted())
-			{
-				TvT.removePlayer(getActiveChar());
-			}
-			getActiveChar().sendMessage("Your event sign up was canceled.");
-		}
-		
 		getActiveChar().rewardSkills(); // Give Expertise skill of this level
 		if (getActiveChar().getClan() != null)
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
index a0d90a8a6b..4677bd6fa3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1041,9 +1041,10 @@ public class Olympiad
 			spectator.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_GRAND_OLYMPIAD_GAMES_MATCH_WHILE_YOU_ARE_ON_THE_WAITING_LIST);
 			return;
 		}
-		if (spectator.isRegisteredInFunEvent())
+		
+		if (spectator.isRegisteredOnCustomEvent())
 		{
-			spectator.sendMessage("You are already registered to an Event");
+			spectator.sendMessage("You are already registered in an event.");
 			return;
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java
index 159c199f58..06a837afcd 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -42,11 +42,6 @@ import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
 import org.l2jmobius.gameserver.data.SkillTable;
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.data.sql.OfflineTraderTable;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -57,7 +52,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
 import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import org.l2jmobius.gameserver.util.EventData;
 import org.l2jmobius.gameserver.util.FloodProtectors;
 
 import io.netty.channel.Channel;
@@ -590,29 +584,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 				final PlayerInstance player = _player;
 				if (player != null) // this should only happen on connection loss
 				{
-					// we store all data from players who are disconnected while in an event in order to restore it in the next login
-					if (player.atEvent)
-					{
-						final EventData data = new EventData(player.eventX, player.eventY, player.eventZ, player.eventKarma, player.eventPvpKills, player.eventPkKills, player.eventTitle, player.kills, player.eventSitForced);
-						GameEvent.connectionLossData.put(player.getName(), data);
-					}
-					else if (player._inEventCTF)
-					{
-						CTF.onDisconnect(player);
-					}
-					else if (player._inEventDM)
-					{
-						DM.onDisconnect(player);
-					}
-					else if (player._inEventTvT)
-					{
-						TvT.onDisconnect(player);
-					}
-					else if (player._inEventVIP)
-					{
-						VIP.onDisconnect(player);
-					}
-					
 					if (player.isFlying())
 					{
 						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
@@ -671,29 +642,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 				final PlayerInstance player = _player;
 				if (player != null) // this should only happen on connection loss
 				{
-					// we store all data from players who are disconnected while in an event in order to restore it in the next login
-					if (player.atEvent)
-					{
-						final EventData data = new EventData(player.eventX, player.eventY, player.eventZ, player.eventKarma, player.eventPvpKills, player.eventPkKills, player.eventTitle, player.kills, player.eventSitForced);
-						GameEvent.connectionLossData.put(player.getName(), data);
-					}
-					else if (player._inEventCTF)
-					{
-						CTF.onDisconnect(player);
-					}
-					else if (player._inEventDM)
-					{
-						DM.onDisconnect(player);
-					}
-					else if (player._inEventTvT)
-					{
-						TvT.onDisconnect(player);
-					}
-					else if (player._inEventVIP)
-					{
-						VIP.onDisconnect(player);
-					}
-					
 					if (player.isFlying())
 					{
 						player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
@@ -713,7 +661,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 					if (!player.isKicked() //
 						&& !Olympiad.getInstance().isRegistered(player) //
 						&& !player.isInOlympiadMode() //
-						&& !player.isInFunEvent() //
 						&& ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) //
 							|| (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE)))
 					{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
index fcfc95e327..04afff2b36 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
@@ -18,9 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -100,19 +97,12 @@ public class AttackRequest implements IClientIncomingPacket
 			return;
 		}
 		
-		// During teleport phase, players cant do any attack
-		if ((TvT.isTeleport() && player._inEventTvT) || (CTF.isTeleport() && player._inEventCTF) || (DM.isTeleport() && player._inEventDM))
-		{
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
-		// No attacks to same team in Event
-		if (TvT.isStarted())
+		// No attacks to same team in event
+		if (player.isOnCustomEvent())
 		{
 			if (target instanceof PlayerInstance)
 			{
-				if ((player._inEventTvT && ((PlayerInstance) target)._inEventTvT) && player._teamNameTvT.equals(((PlayerInstance) target)._teamNameTvT))
+				if (player.getTeam() == ((PlayerInstance) target).getTeam())
 				{
 					player.sendPacket(ActionFailed.STATIC_PACKET);
 					return;
@@ -120,28 +110,7 @@ public class AttackRequest implements IClientIncomingPacket
 			}
 			else if (target instanceof SummonInstance)
 			{
-				if ((player._inEventTvT && ((SummonInstance) target).getOwner()._inEventTvT) && player._teamNameTvT.equals(((SummonInstance) target).getOwner()._teamNameTvT))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-			}
-		}
-		
-		// No attacks to same team in Event
-		if (CTF.isStarted())
-		{
-			if (target instanceof PlayerInstance)
-			{
-				if ((player._inEventCTF && ((PlayerInstance) target)._inEventCTF) && player._teamNameCTF.equals(((PlayerInstance) target)._teamNameCTF))
-				{
-					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-			}
-			else if (target instanceof SummonInstance)
-			{
-				if ((player._inEventCTF && ((SummonInstance) target).getOwner()._inEventCTF) && player._teamNameCTF.equals(((SummonInstance) target).getOwner()._teamNameCTF))
+				if (player.getTeam() == ((SummonInstance) target).getOwner().getTeam())
 				{
 					player.sendPacket(ActionFailed.STATIC_PACKET);
 					return;
@@ -153,8 +122,7 @@ public class AttackRequest implements IClientIncomingPacket
 		{
 			target.onAction(player);
 		}
-		else if ((target.getObjectId() != player.getObjectId()) && (player.getPrivateStoreType() == 0)
-		/* && activeChar.getActiveRequester() ==null */)
+		else if ((target.getObjectId() != player.getObjectId()) && (player.getPrivateStoreType() == 0) /* && activeChar.getActiveRequester() ==null */)
 		{
 			target.onForcedAttack(player);
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 914dae58b4..ca51a5c581 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -43,10 +43,6 @@ import org.l2jmobius.gameserver.instancemanager.PetitionManager;
 import org.l2jmobius.gameserver.instancemanager.RebirthManager;
 import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Wedding;
@@ -231,15 +227,6 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply death penalty
 		player.restoreDeathPenaltyBuffLevel();
 		
-		if (GameEvent.active && GameEvent.connectionLossData.containsKey(player.getName()) && GameEvent.isOnEvent(player))
-		{
-			GameEvent.restoreChar(player);
-		}
-		else if (GameEvent.connectionLossData.containsKey(player.getName()))
-		{
-			GameEvent.restoreAndTeleChar(player);
-		}
-		
 		// SECURE FIX - Anti Overenchant Cheat!!
 		if (Config.MAX_ITEM_ENCHANT_KICK > 0)
 		{
@@ -426,21 +413,6 @@ public class EnterWorld implements IClientIncomingPacket
 			RebirthManager.getInstance().grantRebirthSkills(player);
 		}
 		
-		if (TvT._savePlayers.contains(player.getName()))
-		{
-			TvT.addDisconnectedPlayer(player);
-		}
-		
-		if (CTF._savePlayers.contains(player.getName()))
-		{
-			CTF.addDisconnectedPlayer(player);
-		}
-		
-		if (DM._savePlayers.contains(player.getName()))
-		{
-			DM.addDisconnectedPlayer(player);
-		}
-		
 		// Means that it's not ok multiBox situation, so logout.
 		if (!player.canMultiBox())
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
index 452d6ee796..d4f0d1f398 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
@@ -50,9 +50,9 @@ public class Logout implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player.isInFunEvent() && !player.isGM())
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("You cannot logout while in registered in an event.");
+			player.sendMessage("You cannot logout while registered in an event.");
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
@@ -87,12 +87,6 @@ public class Logout implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player.atEvent)
-		{
-			player.sendPacket(SystemMessage.sendString("A superior power doesn't allow you to leave the event."));
-			return;
-		}
-		
 		if (player.isInOlympiadMode() || Olympiad.getInstance().isRegistered(player))
 		{
 			player.sendMessage("You can't Logout in Olympiad mode.");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index ec0436f48c..4c95b8673b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -177,17 +177,20 @@ public class RequestActionUse implements IClientIncomingPacket
 							return;
 						}
 					}
+					
 					if (player.isInOlympiadMode() && !player.isOlympiadStart())
 					{
 						// if PlayerInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
 						player.sendPacket(ActionFailed.STATIC_PACKET);
 						return;
 					}
-					if ((target instanceof PlayerInstance) && !player.getAccessLevel().allowPeaceAttack() && Creature.isInsidePeaceZone(pet, target) && (!player.isInFunEvent() || !((PlayerInstance) target).isInFunEvent()))
+					
+					if ((target instanceof PlayerInstance) && !player.getAccessLevel().allowPeaceAttack() && Creature.isInsidePeaceZone(pet, target) && (!player.isOnCustomEvent() || !((PlayerInstance) target).isOnCustomEvent()))
 					{
 						player.sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE);
 						return;
 					}
+					
 					if (target.isAutoAttackable(player) || _ctrlPressed)
 					{
 						if (target instanceof DoorInstance)
@@ -274,7 +277,7 @@ public class RequestActionUse implements IClientIncomingPacket
 						// A strider cannot be ridden while in battle
 						player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
 					}
-					else if (player.isInFunEvent())
+					else if (player.isOnCustomEvent())
 					{
 						// A strider cannot be ridden while in event
 						player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 59d94ef9e4..5813b9427e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -24,11 +24,6 @@ import org.l2jmobius.gameserver.data.xml.AdminData;
 import org.l2jmobius.gameserver.handler.AdminCommandHandler;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.RebirthManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
-import org.l2jmobius.gameserver.instancemanager.events.VIP;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -156,99 +151,6 @@ public class RequestBypassToServer implements IClientIncomingPacket
 				
 				try
 				{
-					if (_command.substring(endOfId + 1).startsWith("event_participate"))
-					{
-						GameEvent.inscribePlayer(player);
-					}
-					else if (_command.substring(endOfId + 1).startsWith("tvt_player_join "))
-					{
-						final String teamName = _command.substring(endOfId + 1).substring(16);
-						if (TvT.isJoining())
-						{
-							TvT.addPlayer(player, teamName);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can not join now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("tvt_player_leave"))
-					{
-						if (TvT.isJoining())
-						{
-							TvT.removePlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can not leave now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("dmevent_player_join"))
-					{
-						if (DM.isJoining())
-						{
-							DM.addPlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't join now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("dmevent_player_leave"))
-					{
-						if (DM.isJoining())
-						{
-							DM.removePlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't leave now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("ctf_player_join "))
-					{
-						final String teamName = _command.substring(endOfId + 1).substring(16);
-						if (CTF.isJoining())
-						{
-							CTF.addPlayer(player, teamName);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't join now!");
-						}
-					}
-					else if (_command.substring(endOfId + 1).startsWith("ctf_player_leave"))
-					{
-						if (CTF.isJoining())
-						{
-							CTF.removePlayer(player);
-						}
-						else
-						{
-							player.sendMessage("The event is already started. You can't leave now!");
-						}
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("vip_joinVIPTeam"))
-					{
-						VIP.addPlayerVIP(player);
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("vip_joinNotVIPTeam"))
-					{
-						VIP.addPlayerNotVIP(player);
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("vip_finishVIP"))
-					{
-						VIP.vipWin(player);
-					}
-					
-					if (_command.substring(endOfId + 1).startsWith("event_participate"))
-					{
-						GameEvent.inscribePlayer(player);
-					}
-					
 					final WorldObject object = World.getInstance().findObject(Integer.parseInt(id));
 					if ((Config.ALLOW_CLASS_MASTERS && Config.ALLOW_REMOTE_CLASS_MASTERS && (object instanceof ClassMasterInstance)) //
 						|| ((object instanceof NpcInstance) && (endOfId > 0) && player.isInsideRadius2D(object, NpcInstance.INTERACTION_DISTANCE)))
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index dbd0296b5b..2e9c53f47d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
@@ -17,9 +17,6 @@
 package org.l2jmobius.gameserver.network.clientpackets;
 
 import org.l2jmobius.commons.network.PacketReader;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.BlockList;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
@@ -54,7 +51,7 @@ public class RequestJoinParty implements IClientIncomingPacket
 		
 		if (!client.getFloodProtectors().getPartyInvitation().tryPerformAction("PartyInvitation"))
 		{
-			requestor.sendMessage("You Cannot Invite into Party So Fast!");
+			requestor.sendMessage("You cannot invite into party so fast!");
 			return;
 		}
 		
@@ -64,18 +61,6 @@ public class RequestJoinParty implements IClientIncomingPacket
 			return;
 		}
 		
-		if ((requestor._inEventDM && (DM.isTeleport() || DM.hasStarted())) || (target._inEventDM && (DM.isTeleport() || DM.hasStarted())))
-		{
-			requestor.sendMessage("You can't invite that player in party!");
-			return;
-		}
-		
-		if ((requestor._inEventTvT && !target._inEventTvT && (TvT.isStarted() || TvT.isTeleport())) || (!requestor._inEventTvT && target._inEventTvT && (TvT.isStarted() || TvT.isTeleport())) || (requestor._inEventCTF && !target._inEventCTF && (CTF.isStarted() || CTF.isTeleport())) || (!requestor._inEventCTF && target._inEventCTF && (CTF.isStarted() || CTF.isTeleport())))
-		{
-			requestor.sendMessage("You can't invite that player in party: you or your target are in Event");
-			return;
-		}
-		
 		if (target.isInParty())
 		{
 			final SystemMessage msg = new SystemMessage(SystemMessageId.S1_IS_A_MEMBER_OF_ANOTHER_PARTY_AND_CANNOT_BE_INVITED);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 442d2d98bd..37652e1724 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -117,10 +117,10 @@ public class RequestRestart implements IClientIncomingPacket
 			}
 		}
 		
-		// Check if player is in Event
-		if (player._inEventCTF || player._inEventDM || player._inEventTvT || player._inEventVIP)
+		// Check if player is in an event.
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("You can't restart during Event.");
+			player.sendMessage("You can't restart while registered in an event.");
 			player.sendPacket(RestartResponse.valueOf(false));
 			return;
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
index a4246e2bff..5ef9b69037 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
@@ -24,12 +24,11 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
+import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.residences.ClanHall;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
@@ -74,6 +73,19 @@ public class RequestRestartPoint implements IClientIncomingPacket
 			return;
 		}
 		
+		// Custom event resurrection management.
+		if (player.isOnCustomEvent())
+		{
+			// This is an example, replace EventScriptName with proper event script name.
+			final Quest eventScript = QuestManager.getInstance().getQuest("EventScriptName");
+			if (eventScript != null)
+			{
+				// Notify onAdvEvent ResurrectPlayer event.
+				eventScript.notifyEvent("ResurrectPlayer", null, player);
+				return;
+			}
+		}
+		
 		final Castle castle = CastleManager.getInstance().getCastle(player.getX(), player.getY(), player.getZ());
 		if ((castle != null) && castle.getSiege().isInProgress() && (player.getClan() != null) && castle.getSiege().checkIsAttacker(player.getClan()))
 		{
@@ -99,9 +111,9 @@ public class RequestRestartPoint implements IClientIncomingPacket
 		@Override
 		public void run()
 		{
-			if ((_player._inEventTvT && TvT.isStarted()) || (_player._inEventDM && DM.hasStarted()) || (_player._inEventCTF && CTF.isStarted()))
+			if (_player.isOnCustomEvent())
 			{
-				_player.sendMessage("You cannot restart while participating in an event!");
+				_player.sendMessage("You cannot do that while participating in an event!");
 				return;
 			}
 			
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index ac0deeb041..4107f6c2fb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -52,12 +52,6 @@ public class RequestUnEquipItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player._haveFlagCTF)
-		{
-			player.sendMessage("You can't unequip a CTF flag.");
-			return;
-		}
-		
 		final ItemInstance item = player.getInventory().getPaperdollItemByItemId(_slot);
 		if ((item != null) && item.isWear())
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index e8f79c9aa7..4e1b934d1a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -106,13 +106,6 @@ public class TradeRequest implements IClientIncomingPacket
 			return;
 		}
 		
-		if (partner.isInFunEvent())
-		{
-			player.sendMessage("You can't request a trade when partner in event.");
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
 		if (partner.getActiveEnchantItem() != null)
 		{
 			player.sendMessage("You can't request a trade when partner is enchanting.");
@@ -176,13 +169,6 @@ public class TradeRequest implements IClientIncomingPacket
 			return;
 		}
 		
-		if (player.isInFunEvent())
-		{
-			player.sendMessage("You can't request a trade when you are in event.");
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
 		if (player.getActiveEnchantItem() != null)
 		{
 			player.sendMessage("You can't request a trade when you enchanting.");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index ab93fba780..c1c01cb45a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -308,16 +308,9 @@ public class UseItem implements IClientIncomingPacket
 			int bodyPart = item.getItem().getBodyPart();
 			
 			// Like L2OFF you can't use equips while you are casting
-			if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted() || (player._inEventCTF && player._haveFlagCTF)))
+			if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted()))
 			{
-				if (player._inEventCTF && player._haveFlagCTF)
-				{
-					player.sendMessage("This item can not be equipped when you have the flag.");
-				}
-				else
-				{
-					player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_EQUIP_ITEMS_WHILE_CASTING_OR_PERFORMING_A_SKILL));
-				}
+				player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_EQUIP_ITEMS_WHILE_CASTING_OR_PERFORMING_A_SKILL));
 				return;
 			}
 			
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
index f80fab7d58..5885c22337 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -19,9 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
-import org.l2jmobius.gameserver.instancemanager.events.CTF;
-import org.l2jmobius.gameserver.instancemanager.events.DM;
-import org.l2jmobius.gameserver.instancemanager.events.TvT;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -49,7 +46,7 @@ public class Die implements IClientOutgoingPacket
 			final PlayerInstance player = creature.getActingPlayer();
 			_allowFixedRes = player.getAccessLevel().allowFixedRes();
 			_clan = player.getClan();
-			_canTeleport = ((!TvT.isStarted() || !player._inEventTvT) && (!DM.hasStarted() || !player._inEventDM) && (!CTF.isStarted() || !player._inEventCTF) && !player.isInFunEvent() && !player.isPendingRevive());
+			_canTeleport = !player.isPendingRevive();
 		}
 		_objectId = creature.getObjectId();
 		_fake = !creature.isDead();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml
index 13e7f217e1..56d9d3e280 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml
@@ -216,32 +216,6 @@
 	<admin command="admin_setbe" accessLevel="100" />
 	<admin command="admin_enchant" accessLevel="100" />
 
-	<!-- ADMIN EVENT ENGINE -->
-	<admin command="admin_event" accessLevel="100" />
-	<admin command="admin_event_new" accessLevel="100" />
-	<admin command="admin_event_choose" accessLevel="100" />
-	<admin command="admin_event_store" accessLevel="100" />
-	<admin command="admin_event_set" accessLevel="100" />
-	<admin command="admin_event_change_teams_number" accessLevel="100" />
-	<admin command="admin_event_announce" accessLevel="100" />
-	<admin command="admin_event_panel" accessLevel="100" />
-	<admin command="admin_event_control_begin" accessLevel="100" />
-	<admin command="admin_event_control_teleport" accessLevel="100" />
-	<admin command="admin_add" accessLevel="100" />
-	<admin command="admin_event_see" accessLevel="100" />
-	<admin command="admin_event_del" accessLevel="100" />
-	<admin command="admin_delete_buffer" accessLevel="100" />
-	<admin command="admin_event_control_sit" accessLevel="100" />
-	<admin command="admin_event_name" accessLevel="100" />
-	<admin command="admin_event_control_kill" accessLevel="100" />
-	<admin command="admin_event_control_res" accessLevel="100" />
-	<admin command="admin_event_control_transform" accessLevel="100" />
-	<admin command="admin_event_control_untransform" accessLevel="100" />
-	<admin command="admin_event_control_prize" accessLevel="100" />
-	<admin command="admin_event_control_chatban" accessLevel="100" />
-	<admin command="admin_event_control_kick" accessLevel="100" />
-	<admin command="admin_event_control_finish" accessLevel="100" />
-
 	<!-- ADMIN EVENTS -->
 	<admin command="admin_event_menu" accessLevel="100" />
 	<admin command="admin_event_start" accessLevel="100" />
@@ -584,11 +558,6 @@
 	<admin command="admin_stats" accessLevel="100" />
 	<admin command="admin_skill_test" accessLevel="100" />
 
-	<!-- ADMIN TVT EVENT -->
-	<admin command="admin_tvt_add" accessLevel="100" />
-	<admin command="admin_tvt_remove" accessLevel="100" />
-	<admin command="admin_tvt_advance" accessLevel="100" />
-
 	<!-- ADMIN VITALITY -->
 	<admin command="admin_set_vitality" accessLevel="100" />
 	<admin command="admin_set_vitality_level" accessLevel="100" />
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/TeamVersusTeam.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/TeamVersusTeam.ini
deleted file mode 100644
index eef2428b89..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/TeamVersusTeam.ini
+++ /dev/null
@@ -1,116 +0,0 @@
-# ---------------------------------------------------------------------------
-# Team vs. Team Event Engine (by HorridoJoho)
-# ---------------------------------------------------------------------------
-
-# <u><b><font color="red">WARNING: this mod require custom NPC table support turned on !</font></b></u>
-# CustomNpcTable = True in General.properties
-# ---------------------------------------------------------------------------
-# Enable/Disable TvTEvent System
-# Default: False
-TvTEventEnabled = False
-
-# TvT in instance
-# Default: False
-TvTEventInInstance = False
-
-# Id of the instance template for TvT
-# Default: 3049 (coliseum.xml)
-TvTEventInstanceId = 3049
-
-# Times TvT will occur (24h format).
-# Default: 9:00,15:00,21:00,3:00
-TvTEventInterval = 9:00,15:00,21:00,3:00
-
-# Registration timer from start of event (in minutes).
-# Default: 30
-TvTEventParticipationTime = 30
-
-# Event running time (in minutes).
-# Default: 20
-TvTEventRunningTime = 20
-
-# TvT Event NPC (create a custom npc of type L2TvTEventNpc).
-# Default: 70010
-TvTEventParticipationNpcId = 70010
-
-# TvT Event Participation Fee (itemId, number). Fee is not returned.
-# Example: 57,100000
-# Default: 0,0
-TvTEventParticipationFee = 0,0
-
-# Location for TvTEvent NPC to spawn in form x,y,z[,heading]
-# Default: 83425,148585,-3406
-TvTEventParticipationNpcCoordinates = 83425,148585,-3406
-
-# Minimum amount of players allowed in each team.
-# Default: 1
-TvTEventMinPlayersInTeams = 1
-# Maximum amount of players allowed in each team.
-# Default: 20
-TvTEventMaxPlayersInTeams = 20
-
-# Minimum level of players that may join the event.
-# Default: 1
-TvTEventMinPlayerLevel = 1
-# Maximum level of players that may join the event.
-# Default: 85
-TvTEventMaxPlayerLevel = 85
-
-# Respawn delay timer (in seconds).
-# Default: 10
-TvTEventRespawnTeleportDelay = 10
-# Exit delay timer (in seconds).
-# Default: 10
-TvTEventStartLeaveTeleportDelay = 10
-
-# First Team - Name, Start/Death x,y,z location.
-TvTEventTeam1Name = Team1
-TvTEventTeam1Coordinates = 148695,46725,-3414
-
-# Second Team - Name, Start/Death x,y,z location.
-TvTEventTeam2Name = Team2
-TvTEventTeam2Coordinates = 149999,46728,-3414
-
-# Reward for winning team.
-# Example: TvTEventReward = itemId,amount;itemId,amount;itemId,amount
-TvTEventReward = 57,100000
-
-# TvTEvent Rules
-TvTEventTargetTeamMembersAllowed = True
-TvTEventScrollsAllowed = False
-TvTEventPotionsAllowed = False
-TvTEventSummonByItemAllowed = False
-
-# Door ID's to open/close on start/end.
-# Not supported in instance, use xml template for defining doors.
-# Example: TvTDoorsToOpen = 1;2;3;4;5;6
-TvTDoorsToOpen = 
-TvTDoorsToClose = 
-
-# Should both teams get reward if there's a tie?
-TvTRewardTeamTie = False
-
-# Participant's effects handling on teleport/death.
-# Effects lasting through death never removed.
-# 0 - always remove all effects.
-# 1 - remove all effects only during port to event (noblesse blessing can be used)
-# 2 - never remove any effect
-# Default: 0
-TvTEventEffectsRemoval = 0
-
-# Fighter-class participants will be buffed with those buffs each respawn
-# Format: skill1Id,skill1Level;skill2Id,skill2Level...
-# Example: 1504,1;1501,1;1502,1;1499,1
-TvTEventFighterBuffs =
-
-# Mage-class participants will be buffed with those buffs each respawn
-# Format: skill1Id,skill1Level;skill2Id,skill2Level...
-# Example: 1504,1;1500,1;1501,1;1085,3
-TvTEventMageBuffs =
-
-# Maximum number of allowed participants per IP address (dualbox check)
-# Default: 0 (no limits)
-TvTEventMaxParticipantsPerIP = 0
-
-# Voiced command (.tvt) working during TVT event to get information about event status
-TvTAllowVoicedInfoCommand = false
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/help/l2jmod/tvt.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/help/l2jmod/tvt.htm
deleted file mode 100644
index 798f8dd795..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/help/l2jmod/tvt.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><title>Mods Help</title><body>
-<table width=260><tr>
-<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=180><center>Mod Help Page</center></td>
-<td width=40><button value="Back" action="bypass -h admin_admin5" width=40 height=15 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
-<font color="LEVEL"><table width=260><tr>
-<td width 90>GM commands page:</td><td><a action="bypass -h admin_html admhelp.htm">Index</a></td><td><a action="bypass -h admin_html help/gmcommands.htm">1</a></td><td><a action="bypass -h admin_html help/gmcommands2.htm">2</a></td><td><a action="bypass -h admin_html help/gmcommands3.htm">3</a></td>
-</tr></table></font>
-<br>
-<font color="FF9933">These are the available settings for this mod.</font><br>
-(When a parameter is required, it must be written in the quickbox without leading nor trailing spaces)<br1>
-Mandatory parameters will appear <font color="FF0000">&lt;ike this&gt;</font><br1>
-Optional parameters will appear <font color="00FF00">[like that]</font><br>
-<!-- Mod writers should change from here -->
-<font color="LEVEL">Enable</font> - Enable this mod<br>
-<font color="LEVEL">Interval</font> <font color="FF0000">&lt;minutes&gt;</font> - Time between events.<br>
-<font color="LEVEL">PartTime</font> <font color="FF0000">&lt;minutes&gt;</font> - Time allowed for application.<br>
-<font color="LEVEL">RunnTime</font> <font color="FF0000">&lt;minutes&gt;</font> - Event duration<br>
-<br>
-<font color="LEVEL">Disable</font> - Disable this mod.<br>
-<font color="LEVEL">EventNpc</font> <font color="FF0000">&lt;integer&gt;</font> - NpcId to be used as event manager.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/mods_menu.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/mods_menu.htm
index 3e96953b5d..6d4cb3ae09 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/mods_menu.htm
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/mods_menu.htm
@@ -57,20 +57,5 @@
 </tr>
 </table>
 <br>
-<font color="LEVEL">TvT EVENT MOD
-<a action="bypass -h admin_html help/l2jmod/tvt.htm">Help</a></font>
-<table width=240 border=0 bgcolor="666666">
-<tr>
-<td><button value="Enable" action="bypass -h admin_set_mod TvTEventEnabled=true" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Interval" action="bypass -h admin_set_mod TvTEventInterval=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="PartTime" action="bypass -h admin_set_mod TvTEventParticipationTime=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="RunnTime" action="bypass -h admin_set_mod TvTEventRunningTime=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td><button value="Disable" action="bypass -h admin_set_mod TvTEventEnabled=false" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="EventNpc" action="bypass -h admin_set_mod TvTEventParticipationNpcId=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-</table>
-<br>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/mods/EventEngine/Participating.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/mods/EventEngine/Participating.htm
deleted file mode 100644
index 4724f31677..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/mods/EventEngine/Participating.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><body scroll="no">
-<table cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
-<tr><td valign="top" align="center">
-	<table width=96% cellpadding=0 cellspacing=0>
-		<tr><td height=30></td></tr>
-		<tr><td align=center><font color="LEVEL">%eventName%</font> by %eventCreator%</td></tr>
-		<tr><td height=20></td></tr>
-		<tr><td align=center>%eventInfo%</td></tr>
-		<tr><td height=34></td></tr>
-		<tr><td align=center><button value="Unregister" action="bypass -h npc_%objectId%_event_unregister" width=120 height=32 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
-		<tr><td height=34></td></tr>
-	</table>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/mods/EventEngine/Participation.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/mods/EventEngine/Participation.htm
deleted file mode 100644
index 93445c87d9..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/mods/EventEngine/Participation.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><body scroll="no">
-<table cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
-<tr><td valign="top" align="center">
-	<table width=96% cellpadding=0 cellspacing=0>
-		<tr><td height=30></td></tr>
-		<tr><td align=center><font color="LEVEL">%eventName%</font> by %eventCreator%</td></tr>
-		<tr><td height=20></td></tr>
-		<tr><td align=center>%eventInfo%</td></tr>
-		<tr><td height=34></td></tr>
-		<tr><td align=center><button value="Participate" action="bypass -h npc_%objectId%_event_participate" width=120 height=32 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
-		<tr><td height=34></td></tr>
-	</table>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/instances/custom/coliseum.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/instances/custom/coliseum.xml
deleted file mode 100644
index 36a1d93870..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/instances/custom/coliseum.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<instance id="3049" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
-	<PvPInstance val="true" />
-	<doorlist>
-		<door id="24190001" />
-		<door id="24190002" />
-		<door id="24190003" />
-		<door id="24190004" />
-	</doorlist>
-</instance>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
index 1a60c7100f..acb63b1d0d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
@@ -95,7 +95,7 @@ public class Warpgate extends AbstractNpcAI
 		if (creature.isPlayer())
 		{
 			final PlayerInstance player = creature.getActingPlayer();
-			if (!canEnter(player) && !player.canOverrideCond(PlayerCondOverride.ZONE_CONDITIONS) && !player.isOnEvent())
+			if (!canEnter(player) && !player.canOverrideCond(PlayerCondOverride.ZONE_CONDITIONS) && !player.isOnCustomEvent())
 			{
 				startQuestTimer("TELEPORT", 1000, null, player);
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/CursedWeaponEquipped.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/CursedWeaponEquipped.html
deleted file mode 100644
index 77e95f28cb..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/CursedWeaponEquipped.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Cursed weapon holders are not allowed to participate.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/IPRestriction.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/IPRestriction.html
deleted file mode 100644
index 74d580f126..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/IPRestriction.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Maximum of %max% participant(s) per IP address is allowed.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Karma.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Karma.html
deleted file mode 100644
index 4ad6698e5b..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Karma.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Chaotic players are not allowed to participate.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Level.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Level.html
deleted file mode 100644
index 5d1e0d71a5..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Level.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Only players from level %min% to level %max% are allowed to participate.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Olympiad.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Olympiad.html
deleted file mode 100644
index b4829288c9..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Olympiad.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You can not participate while registered for Olympiad.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Participation.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Participation.html
deleted file mode 100644
index 65db8d24bc..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Participation.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Registration for TvT Event:<br>
-		<center>
-			%playercount% players in.<br>
-			Participation Fee: %fee%<br>
-			<button action="bypass -h Quest TvTManager join" value="Participate" width="200" height="31" back="L2UI_CT1.OlympiadWnd_DF_Apply_Down" fore="L2UI_CT1.OlympiadWnd_DF_Apply">
-		</center>
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/ParticipationFee.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/ParticipationFee.html
deleted file mode 100644
index 9aea7de607..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/ParticipationFee.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You need %fee% for participation.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Registered.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Registered.html
deleted file mode 100644
index f6eb819966..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Registered.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You are registered for a TvT Event.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/RemoveParticipation.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/RemoveParticipation.html
deleted file mode 100644
index 110efb0f54..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/RemoveParticipation.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-	<head>
-		</head><title>TvT Event</title>
-	</head>
-	<body>
-		Cancel registration for TvT Event:<br>
-		You are already registered for this event. Do you wish to cancel your participation in this Event?<br>
-		<center>
-			Participation fee is not returned!<br>
-			<button action="bypass -h Quest TvTManager remove" msg="1480" value="Cancel" width="200" height="31" back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back">
-		</center>
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Reward.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Reward.html
deleted file mode 100644
index be404a4c22..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Reward.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		<font color="LEVEL">Your team won the event!</font><br>
-		Look in your inventory, there should be your reward.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Status.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Status.html
deleted file mode 100644
index 9da25b6062..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Status.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Status:<br>
-		<center>
-			%team1name% with %team1playercount% players and %team1points% points.<br>
-			%team2name% with %team2playercount% players and %team2points% points.
-		</center>
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TeamsFull.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TeamsFull.html
deleted file mode 100644
index 311707217f..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TeamsFull.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		The event is full! Only %max% players are allowed per team.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
deleted file mode 100644
index 006fd40404..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package custom.events.TvT.TvTManager;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.handler.VoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-
-import ai.AbstractNpcAI;
-
-/**
- * TvT Manager AI.
- * @author Zoey76
- */
-public class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler
-{
-	private static final int MANAGER_ID = 70010;
-	private static final String[] COMMANDS =
-	{
-		"tvt",
-		"tvtjoin",
-		"tvtleave"
-	};
-	
-	public TvTManager()
-	{
-		addFirstTalkId(MANAGER_ID);
-		addTalkId(MANAGER_ID);
-		addStartNpc(MANAGER_ID);
-		
-		if (Config.TVT_ALLOW_VOICED_COMMAND)
-		{
-			VoicedCommandHandler.getInstance().registerHandler(this);
-		}
-	}
-	
-	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
-	{
-		if ((player == null) || !TvTEvent.isParticipating())
-		{
-			return super.onAdvEvent(event, npc, player);
-		}
-		
-		String htmltext = null;
-		switch (event)
-		{
-			case "join":
-			{
-				final int playerLevel = player.getLevel();
-				final int team1Count = TvTEvent.getTeamsPlayerCounts()[0];
-				final int team2Count = TvTEvent.getTeamsPlayerCounts()[1];
-				if (player.isCursedWeaponEquipped())
-				{
-					htmltext = getHtm(player, "CursedWeaponEquipped.html");
-				}
-				else if (Olympiad.getInstance().isRegistered(player))
-				{
-					htmltext = getHtm(player, "Olympiad.html");
-				}
-				else if (player.getKarma() > 0)
-				{
-					htmltext = getHtm(player, "Karma.html");
-				}
-				else if ((playerLevel < Config.TVT_EVENT_MIN_LEVEL) || (playerLevel > Config.TVT_EVENT_MAX_LEVEL))
-				{
-					htmltext = getHtm(player, "Level.html");
-					htmltext = htmltext.replace("%min%", String.valueOf(Config.TVT_EVENT_MIN_LEVEL));
-					htmltext = htmltext.replace("%max%", String.valueOf(Config.TVT_EVENT_MAX_LEVEL));
-				}
-				else if ((team1Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS) && (team2Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS))
-				{
-					htmltext = getHtm(player, "TeamsFull.html");
-					htmltext = htmltext.replace("%max%", String.valueOf(Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS));
-				}
-				else if ((Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.TVT_ID, player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP))
-				{
-					htmltext = getHtm(player, "IPRestriction.html");
-					htmltext = htmltext.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP)));
-				}
-				else if (TvTEvent.needParticipationFee() && !TvTEvent.hasParticipationFee(player))
-				{
-					htmltext = getHtm(player, "ParticipationFee.html");
-					htmltext = htmltext.replace("%fee%", TvTEvent.getParticipationFee());
-				}
-				else if (TvTEvent.addParticipant(player))
-				{
-					htmltext = getHtm(player, "Registered.html");
-				}
-				break;
-			}
-			case "remove":
-			{
-				if (TvTEvent.removeParticipant(player.getObjectId()))
-				{
-					if (Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP > 0)
-					{
-						AntiFeedManager.getInstance().removePlayer(AntiFeedManager.TVT_ID, player);
-					}
-					htmltext = getHtm(player, "Unregistered.html");
-				}
-				else
-				{
-					player.sendMessage("You cannot unregister to this event.");
-				}
-				break;
-			}
-		}
-		return htmltext;
-	}
-	
-	@Override
-	public String onFirstTalk(Npc npc, PlayerInstance player)
-	{
-		String htmltext = null;
-		if (TvTEvent.isParticipating())
-		{
-			final boolean isParticipant = TvTEvent.isPlayerParticipant(player.getObjectId());
-			final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
-			htmltext = getHtm(player, (!isParticipant ? "Participation.html" : "RemoveParticipation.html"));
-			htmltext = htmltext.replace("%objectId%", String.valueOf(npc.getObjectId()));
-			htmltext = htmltext.replace("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
-			htmltext = htmltext.replace("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
-			htmltext = htmltext.replace("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
-			htmltext = htmltext.replace("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
-			htmltext = htmltext.replace("%playercount%", String.valueOf(teamsPlayerCounts[0] + teamsPlayerCounts[1]));
-			if (!isParticipant)
-			{
-				htmltext = htmltext.replace("%fee%", TvTEvent.getParticipationFee());
-			}
-		}
-		else if (TvTEvent.isStarting() || TvTEvent.isStarted())
-		{
-			htmltext = getTvTStatus(player);
-		}
-		return htmltext;
-	}
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance player, String params)
-	{
-		String html = null;
-		switch (command)
-		{
-			case "tvt":
-			{
-				if (TvTEvent.isStarting() || TvTEvent.isStarted())
-				{
-					html = getTvTStatus(player);
-				}
-				else
-				{
-					html = "The event has not started.";
-				}
-				break;
-			}
-			case "tvtjoin":
-			{
-				html = onAdvEvent("join", null, player);
-				break;
-			}
-			case "tvtleave":
-			{
-				html = onAdvEvent("remove", null, player);
-				break;
-			}
-		}
-		
-		if (html != null)
-		{
-			player.sendPacket(new NpcHtmlMessage(html));
-		}
-		return true;
-	}
-	
-	private String getTvTStatus(PlayerInstance player)
-	{
-		final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
-		final int[] teamsPointsCounts = TvTEvent.getTeamsPoints();
-		String htmltext = getHtm(player, "Status.html");
-		htmltext = htmltext.replace("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
-		htmltext = htmltext.replace("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
-		htmltext = htmltext.replace("%team1points%", String.valueOf(teamsPointsCounts[0]));
-		htmltext = htmltext.replace("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
-		htmltext = htmltext.replace("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
-		htmltext = htmltext.replace("%team2points%", String.valueOf(teamsPointsCounts[1]));
-		return htmltext;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return COMMANDS;
-	}
-	
-	public static void main(String[] args)
-	{
-		new TvTManager();
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Unregistered.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Unregistered.html
deleted file mode 100644
index 0223caff93..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/Unregistered.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You have been unregistered from the TvT Event.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java
index ea01008c6d..01d3d336e0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java
@@ -72,7 +72,6 @@ import handlers.admincommandhandlers.AdminEditChar;
 import handlers.admincommandhandlers.AdminEffects;
 import handlers.admincommandhandlers.AdminElement;
 import handlers.admincommandhandlers.AdminEnchant;
-import handlers.admincommandhandlers.AdminEventEngine;
 import handlers.admincommandhandlers.AdminEvents;
 import handlers.admincommandhandlers.AdminExpSp;
 import handlers.admincommandhandlers.AdminFakePlayers;
@@ -130,7 +129,6 @@ import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTerritoryWar;
 import handlers.admincommandhandlers.AdminTest;
 import handlers.admincommandhandlers.AdminTransform;
-import handlers.admincommandhandlers.AdminTvTEvent;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
 import handlers.admincommandhandlers.AdminZones;
@@ -139,7 +137,6 @@ import handlers.bypasshandlers.Buy;
 import handlers.bypasshandlers.BuyShadowItem;
 import handlers.bypasshandlers.ChatLink;
 import handlers.bypasshandlers.ClanWarehouse;
-import handlers.bypasshandlers.EventEngine;
 import handlers.bypasshandlers.Festival;
 import handlers.bypasshandlers.FindPvP;
 import handlers.bypasshandlers.Freight;
@@ -370,7 +367,6 @@ public class MasterHandler
 			AdminEffects.class,
 			AdminElement.class,
 			AdminEnchant.class,
-			AdminEventEngine.class,
 			AdminEvents.class,
 			AdminExpSp.class,
 			AdminFakePlayers.class,
@@ -428,7 +424,6 @@ public class MasterHandler
 			AdminTerritoryWar.class,
 			AdminTest.class,
 			AdminTransform.class,
-			AdminTvTEvent.class,
 			AdminVitality.class,
 			AdminZone.class,
 		},
@@ -439,7 +434,6 @@ public class MasterHandler
 			BuyShadowItem.class,
 			ChatLink.class,
 			ClanWarehouse.class,
-			EventEngine.class,
 			Festival.class,
 			FindPvP.class,
 			Freight.class,
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java
index 453ced23d8..beac3ccfdf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java
@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.IActionHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
@@ -115,25 +114,19 @@ public class NpcAction implements IActionHandler
 					}
 					
 					// Open a chat window on client with the text of the Npc
-					if (npc.isEventMob())
+					if (npc.hasListener(EventType.ON_NPC_QUEST_START))
 					{
-						GameEvent.showEventHtml(player, String.valueOf(target.getObjectId()));
+						player.setLastQuestNpcObject(target.getObjectId());
+					}
+					if (npc.hasListener(EventType.ON_NPC_FIRST_TALK))
+					{
+						EventDispatcher.getInstance().notifyEventAsync(new OnNpcFirstTalk(npc, player), npc);
 					}
 					else
 					{
-						if (npc.hasListener(EventType.ON_NPC_QUEST_START))
-						{
-							player.setLastQuestNpcObject(target.getObjectId());
-						}
-						if (npc.hasListener(EventType.ON_NPC_FIRST_TALK))
-						{
-							EventDispatcher.getInstance().notifyEventAsync(new OnNpcFirstTalk(npc, player), npc);
-						}
-						else
-						{
-							npc.showChatWindow(player);
-						}
+						npc.showChatWindow(player);
 					}
+					
 					if (Config.PLAYER_MOVEMENT_BLOCK_TIME > 0)
 					{
 						player.updateNotMoveUntil();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java
index 7b5d34e705..a05efe7db2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java
@@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.PrivateStoreType;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.IActionHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -51,12 +50,6 @@ public class PlayerInstanceAction implements IActionHandler
 	@Override
 	public boolean action(PlayerInstance player, WorldObject target, boolean interact)
 	{
-		// See description in TvTEvent.java
-		if (!TvTEvent.onAction(player, target.getObjectId()))
-		{
-			return false;
-		}
-		
 		// Check if the PlayerInstance is confused
 		if (player.isOutOfControl())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
deleted file mode 100644
index 68924bc16d..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.admincommandhandlers;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.xml.AdminData;
-import org.l2jmobius.gameserver.data.xml.TransformData;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent.EventState;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import org.l2jmobius.gameserver.util.Broadcast;
-
-/**
- * This class handles following admin commands: - admin = shows menu
- * @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/04/11 10:06:06 $
- */
-public class AdminEventEngine implements IAdminCommandHandler
-{
-	private static final Logger LOGGER = Logger.getLogger(AdminEventEngine.class.getName());
-	
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_event",
-		"admin_event_new",
-		"admin_event_choose",
-		"admin_event_store",
-		"admin_event_set",
-		"admin_event_change_teams_number",
-		"admin_event_announce",
-		"admin_event_panel",
-		"admin_event_control_begin",
-		"admin_event_control_teleport",
-		"admin_add",
-		"admin_event_see",
-		"admin_event_del",
-		"admin_delete_buffer",
-		"admin_event_control_sit",
-		"admin_event_name",
-		"admin_event_control_kill",
-		"admin_event_control_res",
-		"admin_event_control_transform",
-		"admin_event_control_untransform",
-		"admin_event_control_prize",
-		"admin_event_control_chatban",
-		"admin_event_control_kick",
-		"admin_event_control_finish"
-	};
-	
-	private static String tempBuffer = "";
-	private static String tempName = "";
-	private static boolean npcsDeleted = false;
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		StringTokenizer st = new StringTokenizer(command);
-		final String actualCommand = st.nextToken();
-		try
-		{
-			if (actualCommand.equals("admin_event"))
-			{
-				if (GameEvent.eventState != EventState.OFF)
-				{
-					showEventControl(activeChar);
-				}
-				else
-				{
-					showMainPage(activeChar);
-				}
-			}
-			
-			else if (actualCommand.equals("admin_event_new"))
-			{
-				showNewEventPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_add"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event info.
-				tempBuffer += command.substring(10);
-				showNewEventPage(activeChar);
-				
-			}
-			else if (actualCommand.startsWith("admin_event_see"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				final String eventName = command.substring(16);
-				try
-				{
-					final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-					final DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(Config.DATAPACK_ROOT + "/data/events/" + eventName)));
-					final BufferedReader inbr = new BufferedReader(new InputStreamReader(in));
-					adminReply.setFile(null, "data/html/mods/EventEngine/Participation.htm");
-					adminReply.replace("%eventName%", eventName);
-					adminReply.replace("%eventCreator%", inbr.readLine());
-					adminReply.replace("%eventInfo%", inbr.readLine());
-					adminReply.replace("npc_%objectId%_event_participate", "admin_event"); // Weird, but nice hack, isnt it? :)
-					adminReply.replace("button value=\"Participate\"", "button value=\"Back\"");
-					activeChar.sendPacket(adminReply);
-					inbr.close();
-				}
-				catch (Exception e)
-				{
-					LOGGER.warning("Problem with AdminEventEngine: " + e.getMessage());
-				}
-			}
-			else if (actualCommand.startsWith("admin_event_del"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				final String eventName = command.substring(16);
-				final File file = new File(Config.DATAPACK_ROOT + "/data/events/" + eventName);
-				file.delete();
-				showMainPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_name"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				tempName += command.substring(17);
-				showNewEventPage(activeChar);
-			}
-			else if (actualCommand.equalsIgnoreCase("admin_delete_buffer"))
-			{
-				tempBuffer = "";
-				showNewEventPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_store"))
-			{
-				try
-				{
-					final FileOutputStream file = new FileOutputStream(new File(Config.DATAPACK_ROOT, "data/events/" + tempName));
-					final PrintStream p = new PrintStream(file);
-					p.println(activeChar.getName());
-					p.println(tempBuffer);
-					file.close();
-					p.close();
-				}
-				catch (Exception e)
-				{
-					LOGGER.warning("Problem with AdminEventEngine: " + e.getMessage());
-				}
-				
-				tempBuffer = "";
-				tempName = "";
-				showMainPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_set"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				GameEvent._eventName = command.substring(16);
-				showEventParameters(activeChar, 2);
-			}
-			else if (actualCommand.startsWith("admin_event_change_teams_number"))
-			{
-				showEventParameters(activeChar, Integer.parseInt(st.nextToken()));
-			}
-			else if (actualCommand.startsWith("admin_event_panel"))
-			{
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_announce"))
-			{
-				GameEvent._npcId = Integer.parseInt(st.nextToken());
-				GameEvent._teamsNumber = Integer.parseInt(st.nextToken());
-				String temp = " ";
-				String temp2 = "";
-				while (st.hasMoreElements())
-				{
-					temp += st.nextToken() + " ";
-				}
-				
-				st = new StringTokenizer(temp, "-");
-				Integer i = 1;
-				
-				while (st.hasMoreElements())
-				{
-					temp2 = st.nextToken();
-					if (!temp2.equals(" "))
-					{
-						GameEvent._teamNames.put(i++, temp2.substring(1, temp2.length() - 1));
-					}
-				}
-				
-				activeChar.sendMessage(GameEvent.startEventParticipation());
-				Broadcast.toAllOnlinePlayers(activeChar.getName() + " has started an event. You will find a participation NPC somewhere around you.");
-				
-				final PlaySound snd = new PlaySound(1, "B03_F", 0, 0, 0, 0, 0);
-				activeChar.sendPacket(snd);
-				activeChar.broadcastPacket(snd);
-				
-				final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-				final String replyMSG = "<html><title>[ EVENT ENGINE ]</title><body><br><center>The event <font color=\"LEVEL\">" + GameEvent._eventName + "</font> has been announced, now you can type //event_panel to see the event panel control</center><br></body></html>";
-				adminReply.setHtml(replyMSG);
-				activeChar.sendPacket(adminReply);
-			}
-			else if (actualCommand.startsWith("admin_event_control_begin"))
-			{
-				// Starts the event and sends a message of the result
-				activeChar.sendMessage(GameEvent.startEvent());
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_finish"))
-			{
-				// Finishes the event and sends a message of the result
-				activeChar.sendMessage(GameEvent.finishEvent());
-			}
-			else if (actualCommand.startsWith("admin_event_control_teleport"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					final int teamId = Integer.parseInt(st.nextToken());
-					for (PlayerInstance player : GameEvent._teams.get(teamId))
-					{
-						player.setTitle(GameEvent._teamNames.get(teamId));
-						player.teleToLocation(activeChar.getLocation(), true);
-						player.setInstanceId(activeChar.getInstanceId());
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_sit"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					// Integer.parseInt(st.nextToken()) == teamId
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						if (player.getEventStatus() == null)
-						{
-							continue;
-						}
-						
-						player.getEventStatus().setSitForced(!player.getEventStatus().isSitForced());
-						if (player.getEventStatus().isSitForced())
-						{
-							player.sitDown();
-						}
-						else
-						{
-							player.standUp();
-						}
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_kill"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.reduceCurrentHp(player.getMaxHp() + player.getMaxCp() + 1, activeChar, null);
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_res"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						if ((player == null) || !player.isDead())
-						{
-							continue;
-						}
-						player.restoreExp(100.0);
-						player.doRevive();
-						player.setCurrentHpMp(player.getMaxHp(), player.getMaxMp());
-						player.setCurrentCp(player.getMaxCp());
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_transform"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final int[] transIds = new int[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a transform ID
-				{
-					transIds[i++] = Integer.parseInt(st.nextToken());
-				}
-				
-				for (PlayerInstance player : GameEvent._teams.get(teamId))
-				{
-					final int transId = transIds[Rnd.get(transIds.length)];
-					if (!TransformData.getInstance().transformPlayer(transId, player))
-					{
-						AdminData.getInstance().broadcastMessageToGMs("EventEngine: Unknow transformation id: " + transId);
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_untransform"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.stopTransformation(true);
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_kick"))
-			{
-				if (st.hasMoreElements()) // If has next token, it should be player name.
-				{
-					while (st.hasMoreElements())
-					{
-						final PlayerInstance player = World.getInstance().getPlayer(st.nextToken());
-						if (player != null)
-						{
-							GameEvent.removeAndResetPlayer(player);
-						}
-					}
-				}
-				else
-				{
-					if ((activeChar.getTarget() != null) && (activeChar.getTarget().isPlayer()))
-					{
-						GameEvent.removeAndResetPlayer((PlayerInstance) activeChar.getTarget());
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_prize"))
-			{
-				final int[] teamIds = new int[st.countTokens() - 2];
-				int i = 0;
-				while ((st.countTokens() - 2) > 0) // The last 2 tokens are used for "n" and "item id"
-				{
-					teamIds[i++] = Integer.parseInt(st.nextToken());
-				}
-				
-				final String[] n = st.nextToken().split("\\*");
-				final int itemId = Integer.parseInt(st.nextToken());
-				for (int teamId : teamIds)
-				{
-					rewardTeam(activeChar, teamId, Integer.parseInt(n[0]), itemId, n.length == 2 ? n[1] : "");
-				}
-				showEventControl(activeChar);
-			}
-		}
-		catch (Exception e)
-		{
-			AdminData.getInstance().broadcastMessageToGMs("EventEngine: Error! Possible blank boxes while executing a command which requires a value in the box?");
-		}
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	private String showStoredEvents()
-	{
-		final File dir = new File(Config.DATAPACK_ROOT, "/data/events");
-		if (dir.isFile())
-		{
-			return "<font color=\"FF0000\">The directory '" + dir.getAbsolutePath() + "' is a file or is corrupted!</font><br>";
-		}
-		
-		String note = "";
-		if (!dir.exists())
-		{
-			note = "<font color=\"FF0000\">The directory '" + dir.getAbsolutePath() + "' does not exist!</font><br><font color=\"0099FF\">Trying to create it now...<br></font><br>";
-			if (dir.mkdirs())
-			{
-				note += "<font color=\"006600\">The directory '" + dir.getAbsolutePath() + "' has been created!</font><br>";
-			}
-			else
-			{
-				note += "<font color=\"FF0000\">The directory '" + dir.getAbsolutePath() + "' hasn't been created!</font><br>";
-				return note;
-			}
-		}
-		
-		final String[] files = dir.list();
-		final StringBuilder result = new StringBuilder(files.length * 500);
-		result.append("<table>");
-		for (String fileName : files)
-		{
-			result.append("<tr><td align=center>");
-			result.append(fileName);
-			result.append(" </td></tr><tr><td><table cellspacing=0><tr><td><button value=\"Select Event\" action=\"bypass -h admin_event_set ");
-			result.append(fileName);
-			result.append("\" width=90 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"View Event\" action=\"bypass -h admin_event_see ");
-			result.append(fileName);
-			result.append("\" width=90 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Delete Event\" action=\"bypass -h admin_event_del ");
-			result.append(fileName);
-			result.append("\" width=90 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr>");
-		}
-		
-		result.append("</table>");
-		
-		return note + result;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final String replyMSG = "<html><title>[ L2J EVENT ENGINE ]</title><body><br><center><button value=\"Create NEW event \" action=\"bypass -h admin_event_new\" width=150 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><center><br><font color=LEVEL>Stored Events:</font><br></center>" + showStoredEvents() + "</body></html>";
-		adminReply.setHtml(replyMSG);
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showNewEventPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final StringBuilder replyMSG = new StringBuilder(512);
-		replyMSG.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><br><center><font color=LEVEL>Event name:</font><br>");
-		if (tempName.isEmpty())
-		{
-			replyMSG.append("You can also use //event_name text to insert a new title");
-			replyMSG.append("<center><multiedit var=\"name\" width=260 height=24> <button value=\"Set Event Name\" action=\"bypass -h admin_event_name $name\" width=120 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		}
-		else
-		{
-			replyMSG.append(tempName);
-		}
-		
-		replyMSG.append("<br><br><font color=LEVEL>Event description:</font><br></center>");
-		if (tempBuffer.isEmpty())
-		{
-			replyMSG.append("You can also use //add text to add text or //delete_buffer to remove the text.");
-		}
-		else
-		{
-			replyMSG.append(tempBuffer);
-		}
-		
-		replyMSG.append("<center><multiedit var=\"txt\" width=270 height=100> <button value=\"Add text\" action=\"bypass -h admin_add $txt\" width=120 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		replyMSG.append("<button value=\"Remove text\" action=\"bypass -h admin_delete_buffer\" width=120 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		if (!(tempName.isEmpty() && tempBuffer.isEmpty()))
-		{
-			replyMSG.append("<br><button value=\"Store Event Data\" action=\"bypass -h admin_event_store\" width=160 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		}
-		
-		replyMSG.append("</center></body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showEventParameters(PlayerInstance activeChar, int teamnumbers)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><body><title>[ L2J EVENT ENGINE ]</title><br><center> Current event: <font color=\"LEVEL\">");
-		sb.append(GameEvent._eventName);
-		sb.append("</font></center><br>INFO: To start an event, you must first set the number of teams, then type their names in the boxes and finally type the NPC ID that will be the event manager (can be any existing npc) next to the \"Announce Event!\" button.<br><table width=100%>");
-		sb.append("<tr><td><button value=\"Announce Event!\" action=\"bypass -h admin_event_announce $event_npcid ");
-		sb.append(teamnumbers);
-		sb.append(" ");
-		for (int i = 1; (i - 1) < teamnumbers; i++) // Event announce params
-		{
-			sb.append("$event_teams_name");
-			sb.append(i);
-			sb.append(" - ");
-		}
-		sb.append("\" width=140 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
-		sb.append("<td><edit var=\"event_npcid\" width=100 height=20></td></tr>");
-		sb.append("<tr><td><button value=\"Set number of teams\" action=\"bypass -h admin_event_change_teams_number $event_teams_number\" width=140 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
-		sb.append("<td><edit var=\"event_teams_number\" width=100 height=20></td></tr>");
-		sb.append("</table><br><center><br><br>");
-		sb.append("<font color=\"LEVEL\">Teams' names:</font><br><table width=100% cellspacing=8>");
-		for (int i = 1; (i - 1) < teamnumbers; i++) // Team names params
-		{
-			sb.append("<tr><td align=center>Team #");
-			sb.append(i);
-			sb.append(" name:</td><td><edit var=\"event_teams_name");
-			sb.append(i);
-			sb.append("\" width=150 height=15></td></tr>");
-		}
-		sb.append("</table></body></html>");
-		
-		adminReply.setHtml(sb.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	private void showEventControl(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
-		sb.append(GameEvent._eventName);
-		sb.append("</font></center><br><table cellspacing=-1 width=280><tr><td align=center>Type the team ID(s) that will be affected by the commands. Commands with '*' work with only 1 team ID in the field, while '!' - none.</td></tr><tr><td align=center><edit var=\"team_number\" width=100 height=15></td></tr>");
-		sb.append("<tr><td>&nbsp;</td></tr><tr><td><table width=200>");
-		if (!npcsDeleted)
-		{
-			sb.append("<tr><td><button value=\"Start!\" action=\"bypass -h admin_event_control_begin\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Destroys all event npcs so no more people can't participate now on</font></td></tr>");
-		}
-		
-		sb.append("<tr><td>&nbsp;</td></tr><tr><td><button value=\"Teleport\" action=\"bypass -h admin_event_control_teleport $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Teleports the specified team to your position</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"Sit/Stand\" action=\"bypass -h admin_event_control_sit $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Sits/Stands up the team</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"Kill\" action=\"bypass -h admin_event_control_kill $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Finish with the life of all the players in the selected team</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"Resurrect\" action=\"bypass -h admin_event_control_res $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Resurrect Team's members</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><table cellspacing=-1><tr><td><button value=\"Transform*\" action=\"bypass -h admin_event_control_transform $team_number $transf_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"transf_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Transforms the team into the transformation with the ID specified. Multiple IDs result in randomly chosen one for each player.</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"UnTransform\" action=\"bypass -h admin_event_control_untransform $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Untransforms the team</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><table cellspacing=-1><tr><td><button value=\"Give Item\" action=\"bypass -h admin_event_control_prize $team_number $n $id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table><table><tr><td width=32>Num</td><td><edit var=\"n\" width=60 height=15></td></tr><tr><td>ID</td><td><edit var=\"id\" width=60 height=15></td></tr></table></td><td><font color=\"LEVEL\">Give the specified item id to every single member of the team, you can put 5*level, 5*kills or 5 in the number field for example</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><table cellspacing=-1><tr><td><button value=\"Kick Player\" action=\"bypass -h admin_event_control_kick $player_name\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"player_name\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Kicks the specified player(s) from the event. Blank field kicks target.</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"End!\" action=\"bypass -h admin_event_control_finish\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Will finish the event teleporting back all the players</font></td></tr><tr><td>&nbsp;</td></tr></table></td></tr></table></body></html>");
-		adminReply.setHtml(sb.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	private void rewardTeam(PlayerInstance activeChar, int team, int n, int id, String type)
-	{
-		int num = n;
-		for (PlayerInstance player : GameEvent._teams.get(team))
-		{
-			if (type.equalsIgnoreCase("level"))
-			{
-				num = n * player.getLevel();
-			}
-			else if (type.equalsIgnoreCase("kills") && (player.getEventStatus() != null))
-			{
-				num = n * player.getEventStatus().getKills().size();
-			}
-			else
-			{
-				num = n;
-			}
-			
-			player.addItem("Event", id, num, activeChar, true);
-			
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-			adminReply.setHtml("<html><body>CONGRATULATIONS! You should have been rewarded.</body></html>");
-			player.sendPacket(adminReply);
-		}
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
deleted file mode 100644
index 2e64c1b8f1..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.admincommandhandlers;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEventTeleporter;
-import org.l2jmobius.gameserver.instancemanager.events.TvTManager;
-import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-/**
- * @author HorridoJoho
- */
-public class AdminTvTEvent implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_tvt_add",
-		"admin_tvt_remove",
-		"admin_tvt_advance"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_tvt_add"))
-		{
-			final WorldObject target = activeChar.getTarget();
-			if ((target == null) || !target.isPlayer())
-			{
-				BuilderUtil.sendSysMessage(activeChar, "You should select a player!");
-				return true;
-			}
-			
-			add(activeChar, (PlayerInstance) target);
-		}
-		else if (command.equals("admin_tvt_remove"))
-		{
-			final WorldObject target = activeChar.getTarget();
-			if ((target == null) || !target.isPlayer())
-			{
-				BuilderUtil.sendSysMessage(activeChar, "You should select a player!");
-				return true;
-			}
-			
-			remove(activeChar, (PlayerInstance) target);
-		}
-		else if (command.equals("admin_tvt_advance"))
-		{
-			TvTManager.getInstance().skipDelay();
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	private void add(PlayerInstance activeChar, PlayerInstance playerInstance)
-	{
-		if (playerInstance.isOnEvent())
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Player already participated in the event!");
-			return;
-		}
-		
-		if (!TvTEvent.addParticipant(playerInstance))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Player instance could not be added, it seems to be null!");
-			return;
-		}
-		
-		if (TvTEvent.isStarted())
-		{
-			new TvTEventTeleporter(playerInstance, TvTEvent.getParticipantTeamCoordinates(playerInstance.getObjectId()), true, false);
-		}
-	}
-	
-	private void remove(PlayerInstance activeChar, PlayerInstance playerInstance)
-	{
-		if (!TvTEvent.removeParticipant(playerInstance.getObjectId()))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Player is not part of the event!");
-			return;
-		}
-		
-		new TvTEventTeleporter(playerInstance, Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES, true, true);
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java
deleted file mode 100644
index 081bbe2c2b..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.bypasshandlers;
-
-import java.util.logging.Level;
-
-import org.l2jmobius.gameserver.handler.IBypassHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class EventEngine implements IBypassHandler
-{
-	private static final String[] COMMANDS =
-	{
-		"event_participate",
-		"event_unregister"
-	};
-	
-	@Override
-	public boolean useBypass(String command, PlayerInstance player, Creature target)
-	{
-		if (!target.isNpc())
-		{
-			return false;
-		}
-		
-		try
-		{
-			if (command.equalsIgnoreCase("event_participate"))
-			{
-				GameEvent.registerPlayer(player);
-				return true;
-			}
-			else if (command.equalsIgnoreCase("event_unregister"))
-			{
-				GameEvent.removeAndResetPlayer(player);
-				return true;
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
-		}
-		return false;
-	}
-	
-	@Override
-	public String[] getBypassList()
-	{
-		return COMMANDS;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
index 936405cb06..f5c46a8ab1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
@@ -100,9 +100,9 @@ public class Observation implements IBypassHandler
 			player.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_SIEGE_WITH_A_PET_OR_SERVITOR_SUMMONED);
 			return false;
 		}
-		if (player.isOnEvent())
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("Cannot use while current Event");
+			player.sendMessage("Cannot use while registered on an event");
 			return false;
 		}
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
index 348370a3e7..78c325f532 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
@@ -90,7 +90,7 @@ public class HomeBoard implements IParseBoardHandler
 				break;
 			}
 		}
-		return commandCheck && (player.isCastingNow() || player.isCastingSimultaneouslyNow() || player.isInCombat() || player.isInDuel() || player.isInOlympiadMode() || player.isInsideZone(ZoneId.SIEGE) || player.isInsideZone(ZoneId.PVP) || (player.getPvpFlag() > 0) || player.isAlikeDead() || player.isOnEvent());
+		return commandCheck && (player.isCastingNow() || player.isCastingSimultaneouslyNow() || player.isInCombat() || player.isInDuel() || player.isInOlympiadMode() || player.isInsideZone(ZoneId.SIEGE) || player.isInsideZone(ZoneId.PVP) || (player.getPvpFlag() > 0) || player.isAlikeDead() || player.isOnCustomEvent());
 	};
 	
 	private static final Predicate<PlayerInstance> KARMA_CHECK = player -> Config.COMMUNITYBOARD_KARMA_DISABLED && (player.getKarma() > 0);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index 56c895ef43..29df63d6cb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -18,7 +18,6 @@ package handlers.effecthandlers;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -140,7 +139,7 @@ public class CallPc extends AbstractEffect
 			return false;
 		}
 		
-		if (target.isFestivalParticipant() || target.isFlyingMounted() || target.isCombatFlagEquipped() || !TvTEvent.onEscapeUse(target.getObjectId()))
+		if (target.isFestivalParticipant() || target.isFlyingMounted() || target.isCombatFlagEquipped() || !target.isOnCustomEvent())
 		{
 			activeChar.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
 			return false;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index d1420ac599..a45ca0874f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -18,7 +18,6 @@ package handlers.itemhandlers;
 
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IItemHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -41,7 +40,7 @@ public class ItemSkillsTemplate implements IItemHandler
 			return false;
 		}
 		
-		if (!TvTEvent.onScrollUse(playable.getObjectId()))
+		if (playable.isOnCustomEvent())
 		{
 			playable.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
index 7fa76417b8..a0413c7413 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
@@ -17,7 +17,6 @@
 package handlers.itemhandlers;
 
 import org.l2jmobius.gameserver.data.xml.PetDataTable;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +38,7 @@ public class SummonItems extends ItemSkillsTemplate
 			return false;
 		}
 		
-		if (!TvTEvent.onItemSummon(playable.getObjectId()))
+		if (playable.isOnCustomEvent())
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
index 34367d94f0..4880ee8b9d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
@@ -21,7 +21,6 @@ import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.LoginServerThread;
 import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.handler.IPunishmentHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.tasks.player.TeleportTask;
@@ -185,11 +184,6 @@ public class JailHandler implements IPunishmentHandler
 	{
 		player.setInstanceId(0);
 		
-		if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(player.getObjectId()))
-		{
-			TvTEvent.removeParticipant(player.getObjectId());
-		}
-		
 		if (Olympiad.getInstance().isRegisteredInComp(player))
 		{
 			Olympiad.getInstance().removeDisconnectedCompetitor(player);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/Clan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/Clan.java
index 8dccb7637e..852ae47cc9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/Clan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/Clan.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -101,7 +100,7 @@ public class Clan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+					if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java
index f8371a517f..908185dc58 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -88,7 +87,7 @@ public class CorpseClan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+					if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/PartyClan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/PartyClan.java
index 8a3e4fe74c..9411bebca4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/PartyClan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/PartyClan.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -118,7 +117,7 @@ public class PartyClan implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+			if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
index 7c0abe6fde..83a5465066 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.skills.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -45,8 +44,7 @@ public class Unstuck implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, PlayerInstance player)
 	{
-		// Thanks nbd
-		if (!TvTEvent.onEscapeUse(player.getObjectId()))
+		if (player.isRegisteredOnCustomEvent())
 		{
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index 785b9f0c25..a3d2f21f11 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -32,8 +32,6 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.CoupleManager;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -41,7 +39,6 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import org.l2jmobius.gameserver.model.skills.Skill;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
@@ -292,9 +289,9 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (GameEvent.isParticipant(activeChar))
+		if (activeChar.isRegisteredOnCustomEvent())
 		{
-			activeChar.sendMessage("You are in an event.");
+			activeChar.sendMessage("You are registered in an event.");
 			return false;
 		}
 		
@@ -328,13 +325,6 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		// Thanks nbd
-		if (!TvTEvent.onEscapeUse(activeChar.getObjectId()))
-		{
-			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-			return false;
-		}
-		
 		if (activeChar.isInsideZone(ZoneId.NO_SUMMON_FRIEND))
 		{
 			activeChar.sendMessage("You are in area which blocks summoning.");
@@ -378,9 +368,9 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (GameEvent.isParticipant(partner))
+		if (partner.isRegisteredOnCustomEvent())
 		{
-			activeChar.sendMessage("Your partner is in an event.");
+			activeChar.sendMessage("Your partner is registered in an event.");
 			return false;
 		}
 		
@@ -437,12 +427,6 @@ public class Wedding implements IVoicedCommandHandler
 			}
 		}
 		
-		if (!TvTEvent.onEscapeUse(partner.getObjectId()))
-		{
-			activeChar.sendMessage("Your partner is in an event.");
-			return false;
-		}
-		
 		if (partner.isInsideZone(ZoneId.NO_SUMMON_FRIEND))
 		{
 			activeChar.sendMessage("Your partner is in area which blocks summoning.");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/npcs/custom/custom.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/npcs/custom/custom.xml
index 9d10edd44c..77e90d6b35 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/npcs/custom/custom.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/npcs/custom/custom.xml
@@ -6,12 +6,6 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="70010" displayId="31606" name="Catrina" usingServerSideName="true" title="TvT Event Manager" usingServerSideTitle="true" type="Npc">
-		<collision>
-			<radius normal="8" />
-			<height normal="15" />
-		</collision>
-	</npc>
 	<npc id="900100" displayId="20432" level="1" name="Elpy" type="EventMonster">
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="40" hpRegen="3" mp="36" mpRegen="1" />
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java
index 11ea15c683..cd0255233a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java
@@ -139,7 +139,6 @@ public class Config
 	private static final String CUSTOM_SERVER_TIME_CONFIG_FILE = "./config/Custom/ServerTime.ini";
 	private static final String CUSTOM_SCHEME_BUFFER_CONFIG_FILE = "./config/Custom/ShemeBuffer.ini";
 	private static final String CUSTOM_STARTING_LOCATION_CONFIG_FILE = "./config/Custom/StartingLocation.ini";
-	private static final String CUSTOM_TVT_CONFIG_FILE = "./config/Custom/TeamVersusTeam.ini";
 	private static final String CUSTOM_VOTE_REWARD_CONFIG_FILE = "./config/Custom/VoteReward.ini";
 	private static final String CUSTOM_WAREHOUSE_SORTING_CONFIG_FILE = "./config/Custom/WarehouseSorting.ini";
 	private static final String CUSTOM_WEDDING_CONFIG_FILE = "./config/Custom/Wedding.ini";
@@ -1106,38 +1105,6 @@ public class Config
 	public static int CHAMPION_REWARD_QTY;
 	public static boolean CHAMPION_ENABLE_VITALITY;
 	public static boolean CHAMPION_ENABLE_IN_INSTANCES;
-	public static boolean TVT_EVENT_ENABLED;
-	public static boolean TVT_EVENT_IN_INSTANCE;
-	public static int TVT_EVENT_INSTANCE_ID;
-	public static String[] TVT_EVENT_INTERVAL;
-	public static int TVT_EVENT_PARTICIPATION_TIME;
-	public static int TVT_EVENT_RUNNING_TIME;
-	public static int TVT_EVENT_PARTICIPATION_NPC_ID;
-	public static int[] TVT_EVENT_PARTICIPATION_NPC_COORDINATES = new int[4];
-	public static int[] TVT_EVENT_PARTICIPATION_FEE = new int[2];
-	public static int TVT_EVENT_MIN_PLAYERS_IN_TEAMS;
-	public static int TVT_EVENT_MAX_PLAYERS_IN_TEAMS;
-	public static int TVT_EVENT_RESPAWN_TELEPORT_DELAY;
-	public static int TVT_EVENT_START_LEAVE_TELEPORT_DELAY;
-	public static String TVT_EVENT_TEAM_1_NAME;
-	public static int[] TVT_EVENT_TEAM_1_COORDINATES = new int[3];
-	public static String TVT_EVENT_TEAM_2_NAME;
-	public static int[] TVT_EVENT_TEAM_2_COORDINATES = new int[3];
-	public static List<int[]> TVT_EVENT_REWARDS;
-	public static boolean TVT_EVENT_TARGET_TEAM_MEMBERS_ALLOWED;
-	public static boolean TVT_EVENT_SCROLL_ALLOWED;
-	public static boolean TVT_EVENT_POTIONS_ALLOWED;
-	public static boolean TVT_EVENT_SUMMON_BY_ITEM_ALLOWED;
-	public static List<Integer> TVT_DOORS_IDS_TO_OPEN;
-	public static List<Integer> TVT_DOORS_IDS_TO_CLOSE;
-	public static boolean TVT_REWARD_TEAM_TIE;
-	public static byte TVT_EVENT_MIN_LEVEL;
-	public static byte TVT_EVENT_MAX_LEVEL;
-	public static int TVT_EVENT_EFFECTS_REMOVAL;
-	public static Map<Integer, Integer> TVT_EVENT_FIGHTER_BUFFS;
-	public static Map<Integer, Integer> TVT_EVENT_MAGE_BUFFS;
-	public static int TVT_EVENT_MAX_PARTICIPANTS_PER_IP;
-	public static boolean TVT_ALLOW_VOICED_COMMAND;
 	public static boolean ALLOW_WEDDING;
 	public static int WEDDING_PRICE;
 	public static boolean WEDDING_PUNISH_INFIDELITY;
@@ -3071,210 +3038,6 @@ public class Config
 			CUSTOM_STARTING_LOC_Y = StartingLocation.getInt("CustomStartingLocY", 147880);
 			CUSTOM_STARTING_LOC_Z = StartingLocation.getInt("CustomStartingLocZ", -3469);
 			
-			// Load TeamVersusTeam config file (if exists)
-			final PropertiesParser TeamVersusTeam = new PropertiesParser(CUSTOM_TVT_CONFIG_FILE);
-			TVT_EVENT_ENABLED = TeamVersusTeam.getBoolean("TvTEventEnabled", false);
-			TVT_EVENT_IN_INSTANCE = TeamVersusTeam.getBoolean("TvTEventInInstance", false);
-			TVT_EVENT_INSTANCE_ID = TeamVersusTeam.getInt("TvTEventInstanceId", 3049);
-			TVT_EVENT_INTERVAL = TeamVersusTeam.getString("TvTEventInterval", "20:00").split(",");
-			TVT_EVENT_PARTICIPATION_TIME = TeamVersusTeam.getInt("TvTEventParticipationTime", 3600);
-			TVT_EVENT_RUNNING_TIME = TeamVersusTeam.getInt("TvTEventRunningTime", 1800);
-			TVT_EVENT_PARTICIPATION_NPC_ID = TeamVersusTeam.getInt("TvTEventParticipationNpcId", 0);
-			if (TVT_EVENT_PARTICIPATION_NPC_ID == 0)
-			{
-				TVT_EVENT_ENABLED = false;
-				LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventParticipationNpcId");
-			}
-			else
-			{
-				String[] tvtNpcCoords = TeamVersusTeam.getString("TvTEventParticipationNpcCoordinates", "0,0,0").split(",");
-				if (tvtNpcCoords.length < 3)
-				{
-					TVT_EVENT_ENABLED = false;
-					LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventParticipationNpcCoordinates");
-				}
-				else
-				{
-					TVT_EVENT_REWARDS = new ArrayList<>();
-					TVT_DOORS_IDS_TO_OPEN = new ArrayList<>();
-					TVT_DOORS_IDS_TO_CLOSE = new ArrayList<>();
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES = new int[4];
-					TVT_EVENT_TEAM_1_COORDINATES = new int[3];
-					TVT_EVENT_TEAM_2_COORDINATES = new int[3];
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES[0] = Integer.parseInt(tvtNpcCoords[0]);
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES[1] = Integer.parseInt(tvtNpcCoords[1]);
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES[2] = Integer.parseInt(tvtNpcCoords[2]);
-					if (tvtNpcCoords.length == 4)
-					{
-						TVT_EVENT_PARTICIPATION_NPC_COORDINATES[3] = Integer.parseInt(tvtNpcCoords[3]);
-					}
-					TVT_EVENT_MIN_PLAYERS_IN_TEAMS = TeamVersusTeam.getInt("TvTEventMinPlayersInTeams", 1);
-					TVT_EVENT_MAX_PLAYERS_IN_TEAMS = TeamVersusTeam.getInt("TvTEventMaxPlayersInTeams", 20);
-					TVT_EVENT_MIN_LEVEL = TeamVersusTeam.getByte("TvTEventMinPlayerLevel", (byte) 1);
-					TVT_EVENT_MAX_LEVEL = TeamVersusTeam.getByte("TvTEventMaxPlayerLevel", (byte) 80);
-					TVT_EVENT_RESPAWN_TELEPORT_DELAY = TeamVersusTeam.getInt("TvTEventRespawnTeleportDelay", 20);
-					TVT_EVENT_START_LEAVE_TELEPORT_DELAY = TeamVersusTeam.getInt("TvTEventStartLeaveTeleportDelay", 20);
-					TVT_EVENT_EFFECTS_REMOVAL = TeamVersusTeam.getInt("TvTEventEffectsRemoval", 0);
-					TVT_EVENT_MAX_PARTICIPANTS_PER_IP = TeamVersusTeam.getInt("TvTEventMaxParticipantsPerIP", 0);
-					TVT_ALLOW_VOICED_COMMAND = TeamVersusTeam.getBoolean("TvTAllowVoicedInfoCommand", false);
-					TVT_EVENT_TEAM_1_NAME = TeamVersusTeam.getString("TvTEventTeam1Name", "Team1");
-					tvtNpcCoords = TeamVersusTeam.getString("TvTEventTeam1Coordinates", "0,0,0").split(",");
-					if (tvtNpcCoords.length < 3)
-					{
-						TVT_EVENT_ENABLED = false;
-						LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventTeam1Coordinates");
-					}
-					else
-					{
-						TVT_EVENT_TEAM_1_COORDINATES[0] = Integer.parseInt(tvtNpcCoords[0]);
-						TVT_EVENT_TEAM_1_COORDINATES[1] = Integer.parseInt(tvtNpcCoords[1]);
-						TVT_EVENT_TEAM_1_COORDINATES[2] = Integer.parseInt(tvtNpcCoords[2]);
-						TVT_EVENT_TEAM_2_NAME = TeamVersusTeam.getString("TvTEventTeam2Name", "Team2");
-						tvtNpcCoords = TeamVersusTeam.getString("TvTEventTeam2Coordinates", "0,0,0").split(",");
-						if (tvtNpcCoords.length < 3)
-						{
-							TVT_EVENT_ENABLED = false;
-							LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventTeam2Coordinates");
-						}
-						else
-						{
-							TVT_EVENT_TEAM_2_COORDINATES[0] = Integer.parseInt(tvtNpcCoords[0]);
-							TVT_EVENT_TEAM_2_COORDINATES[1] = Integer.parseInt(tvtNpcCoords[1]);
-							TVT_EVENT_TEAM_2_COORDINATES[2] = Integer.parseInt(tvtNpcCoords[2]);
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventParticipationFee", "0,0").split(",");
-							try
-							{
-								TVT_EVENT_PARTICIPATION_FEE[0] = Integer.parseInt(tvtNpcCoords[0]);
-								TVT_EVENT_PARTICIPATION_FEE[1] = Integer.parseInt(tvtNpcCoords[1]);
-							}
-							catch (NumberFormatException nfe)
-							{
-								if (tvtNpcCoords.length > 0)
-								{
-									LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventParticipationFee");
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventReward", "57,100000").split(";");
-							for (String reward : tvtNpcCoords)
-							{
-								final String[] rewardSplit = reward.split(",");
-								if (rewardSplit.length != 2)
-								{
-									LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"" + reward + "\"");
-								}
-								else
-								{
-									try
-									{
-										TVT_EVENT_REWARDS.add(new int[]
-										{
-											Integer.parseInt(rewardSplit[0]),
-											Integer.parseInt(rewardSplit[1])
-										});
-									}
-									catch (NumberFormatException nfe)
-									{
-										if (!reward.isEmpty())
-										{
-											LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"" + reward + "\"");
-										}
-									}
-								}
-							}
-							TVT_EVENT_TARGET_TEAM_MEMBERS_ALLOWED = TeamVersusTeam.getBoolean("TvTEventTargetTeamMembersAllowed", true);
-							TVT_EVENT_SCROLL_ALLOWED = TeamVersusTeam.getBoolean("TvTEventScrollsAllowed", false);
-							TVT_EVENT_POTIONS_ALLOWED = TeamVersusTeam.getBoolean("TvTEventPotionsAllowed", false);
-							TVT_EVENT_SUMMON_BY_ITEM_ALLOWED = TeamVersusTeam.getBoolean("TvTEventSummonByItemAllowed", false);
-							TVT_REWARD_TEAM_TIE = TeamVersusTeam.getBoolean("TvTRewardTeamTie", false);
-							tvtNpcCoords = TeamVersusTeam.getString("TvTDoorsToOpen", "").split(";");
-							for (String door : tvtNpcCoords)
-							{
-								try
-								{
-									TVT_DOORS_IDS_TO_OPEN.add(Integer.parseInt(door));
-								}
-								catch (NumberFormatException nfe)
-								{
-									if (!door.isEmpty())
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToOpen \"" + door + "\"");
-									}
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTDoorsToClose", "").split(";");
-							for (String door : tvtNpcCoords)
-							{
-								try
-								{
-									TVT_DOORS_IDS_TO_CLOSE.add(Integer.parseInt(door));
-								}
-								catch (NumberFormatException nfe)
-								{
-									if (!door.isEmpty())
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToClose \"" + door + "\"");
-									}
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventFighterBuffs", "").split(";");
-							if (!tvtNpcCoords[0].isEmpty())
-							{
-								TVT_EVENT_FIGHTER_BUFFS = new HashMap<>(tvtNpcCoords.length);
-								for (String skill : tvtNpcCoords)
-								{
-									final String[] skillSplit = skill.split(",");
-									if (skillSplit.length != 2)
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"" + skill + "\"");
-									}
-									else
-									{
-										try
-										{
-											TVT_EVENT_FIGHTER_BUFFS.put(Integer.parseInt(skillSplit[0]), Integer.parseInt(skillSplit[1]));
-										}
-										catch (NumberFormatException nfe)
-										{
-											if (!skill.isEmpty())
-											{
-												LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"" + skill + "\"");
-											}
-										}
-									}
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventMageBuffs", "").split(";");
-							if (!tvtNpcCoords[0].isEmpty())
-							{
-								TVT_EVENT_MAGE_BUFFS = new HashMap<>(tvtNpcCoords.length);
-								for (String skill : tvtNpcCoords)
-								{
-									final String[] skillSplit = skill.split(",");
-									if (skillSplit.length != 2)
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"" + skill + "\"");
-									}
-									else
-									{
-										try
-										{
-											TVT_EVENT_MAGE_BUFFS.put(Integer.parseInt(skillSplit[0]), Integer.parseInt(skillSplit[1]));
-										}
-										catch (NumberFormatException nfe)
-										{
-											if (!skill.isEmpty())
-											{
-												LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"" + skill + "\"");
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			
 			// Load WarehouseSorting config file (if exists)
 			final PropertiesParser WarehouseSorting = new PropertiesParser(CUSTOM_WAREHOUSE_SORTING_CONFIG_FILE);
 			ENABLE_WAREHOUSESORTING_CLAN = WarehouseSorting.getBoolean("EnableWarehouseSortingClan", false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
index 6c7fa6fe28..bfb6749ede 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
@@ -136,7 +136,6 @@ import org.l2jmobius.gameserver.instancemanager.SoIManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTManager;
 import org.l2jmobius.gameserver.instancemanager.games.Lottery;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.AutoSpawnHandler;
@@ -436,8 +435,6 @@ public class GameServer
 		
 		LOGGER.info("IdManager: Free ObjectID's remaining: " + IdManager.size());
 		
-		TvTManager.getInstance();
-		
 		if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.RESTORE_OFFLINERS)
 		{
 			OfflineTraderTable.getInstance().restoreOfflineTraders();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
index cdd4f70205..402b3d5b16 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
@@ -170,9 +170,9 @@ public class HandysBlockCheckerManager
 				return false;
 			}
 			
-			if (player.isOnEvent() || player.isInOlympiadMode())
+			if (player.isRegisteredOnCustomEvent() || player.isInOlympiadMode())
 			{
-				player.sendMessage("Couldnt register you due other event participation");
+				player.sendMessage("Couldnt register you due other event participation.");
 				return false;
 			}
 			
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
index 469f47e26a..e7d47b90ba 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
@@ -154,7 +154,7 @@ public class PrecautionaryRestartManager
 				return true;
 			}
 			
-			if (player.isOnEvent())
+			if (player.isOnCustomEvent())
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index 3384e13ccf..e7502da3ab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -401,7 +401,7 @@ public class SellBuffsManager implements IXmlReader
 			player.sendMessage("You can't sell buffs with Olympiad status!");
 			return false;
 		}
-		else if (player.isOnEvent()) // custom event message
+		else if (player.isRegisteredOnCustomEvent()) // custom event message
 		{
 			player.sendMessage("You can't sell buffs while registered in an event!");
 			return false;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
deleted file mode 100644
index aede373cc5..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.cache.HtmCache;
-import org.l2jmobius.gameserver.data.SpawnTable;
-import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
-import org.l2jmobius.gameserver.model.Spawn;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.holders.PlayerEventHolder;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-
-/**
- * @author Nik
- * @Since 2011/05/17 21:51:39
- */
-public class GameEvent
-{
-	protected static final Logger LOGGER = Logger.getLogger(GameEvent.class.getName());
-	public static EventState eventState = EventState.OFF;
-	public static String _eventName = "";
-	public static String _eventCreator = "";
-	public static String _eventInfo = "";
-	public static int _teamsNumber = 0;
-	public static final Map<Integer, String> _teamNames = new ConcurrentHashMap<>();
-	public static final Collection<PlayerInstance> _registeredPlayers = ConcurrentHashMap.newKeySet();
-	public static final Map<Integer, List<PlayerInstance>> _teams = new ConcurrentHashMap<>();
-	public static int _npcId = 0;
-	private static final Map<PlayerInstance, PlayerEventHolder> _connectionLossData = new ConcurrentHashMap<>();
-	
-	public enum EventState
-	{
-		OFF, // Not running
-		STANDBY, // Waiting for participants to register
-		ON // Registration is over and the event has started.
-	}
-	
-	/**
-	 * @param player
-	 * @return The team ID where the player is in, or -1 if player is null or team not found.
-	 */
-	public static int getPlayerTeamId(PlayerInstance player)
-	{
-		if (player == null)
-		{
-			return -1;
-		}
-		
-		for (Entry<Integer, List<PlayerInstance>> team : _teams.entrySet())
-		{
-			if (team.getValue().contains(player))
-			{
-				return team.getKey();
-			}
-		}
-		
-		return -1;
-	}
-	
-	public static List<PlayerInstance> getTopNKillers(int n)
-	{
-		final Map<PlayerInstance, Integer> tmp = new HashMap<>();
-		for (List<PlayerInstance> teamList : _teams.values())
-		{
-			for (PlayerInstance player : teamList)
-			{
-				if (player.getEventStatus() == null)
-				{
-					continue;
-				}
-				tmp.put(player, player.getEventStatus().getKills().size());
-			}
-		}
-		
-		sortByValue(tmp);
-		return tmp.size() <= n ? new ArrayList<>(tmp.keySet()) : (new ArrayList<>(tmp.keySet())).subList(1, n);
-	}
-	
-	public static void showEventHtml(PlayerInstance player, String objectid)
-	{
-		// TODO: work on this
-		if (eventState == EventState.STANDBY)
-		{
-			try
-			{
-				final String htmContent;
-				final NpcHtmlMessage html = new NpcHtmlMessage(Integer.parseInt(objectid));
-				if (_registeredPlayers.contains(player))
-				{
-					htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participating.htm");
-				}
-				else
-				{
-					htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participation.htm");
-				}
-				
-				if (htmContent != null)
-				{
-					html.setHtml(htmContent);
-				}
-				
-				html.replace("%objectId%", objectid); // Yeah, we need this.
-				html.replace("%eventName%", _eventName);
-				html.replace("%eventCreator%", _eventCreator);
-				html.replace("%eventInfo%", _eventInfo);
-				player.sendPacket(html);
-			}
-			catch (Exception e)
-			{
-				LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e);
-			}
-		}
-	}
-	
-	/**
-	 * Spawns an event participation NPC near the player. The npc id used to spawning is GameEvent._npcId
-	 * @param target
-	 */
-	public static void spawnEventNpc(PlayerInstance target)
-	{
-		try
-		{
-			final Spawn spawn = new Spawn(_npcId);
-			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
-			spawn.setAmount(1);
-			spawn.setHeading(target.getHeading());
-			spawn.stopRespawn();
-			SpawnTable.getInstance().addNewSpawn(spawn, false);
-			spawn.init();
-			spawn.getLastSpawn().setCurrentHp(999999999);
-			spawn.getLastSpawn().setTitle(_eventName);
-			spawn.getLastSpawn().setEventMob(true);
-			// spawn.getLastSpawn().decayMe();
-			// spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ());
-			spawn.getLastSpawn().broadcastPacket(new MagicSkillUse(spawn.getLastSpawn(), spawn.getLastSpawn(), 1034, 1, 1, 1));
-			
-			// _npcs.add(spawn.getLastSpawn());
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e);
-		}
-	}
-	
-	/**
-	 * Zoey76: TODO: Rewrite this in a way that doesn't iterate over all spawns.
-	 */
-	public static void unspawnEventNpcs()
-	{
-		SpawnTable.getInstance().forEachSpawn(spawn ->
-		{
-			final Npc npc = spawn.getLastSpawn();
-			if ((npc != null) && npc.isEventMob())
-			{
-				npc.deleteMe();
-				spawn.stopRespawn();
-				SpawnTable.getInstance().deleteSpawn(spawn, false);
-			}
-			return true;
-		});
-	}
-	
-	/**
-	 * @param player
-	 * @return False: If player is null, his event status is null or the event state is off. True: if the player is inside the _registeredPlayers list while the event state is STANDBY. If the event state is ON, it will check if the player is inside in one of the teams.
-	 */
-	public static boolean isParticipant(PlayerInstance player)
-	{
-		if ((player == null) || (player.getEventStatus() == null))
-		{
-			return false;
-		}
-		
-		switch (eventState)
-		{
-			case OFF:
-			{
-				return false;
-			}
-			case STANDBY:
-			{
-				return _registeredPlayers.contains(player);
-			}
-			case ON:
-			{
-				for (List<PlayerInstance> teamList : _teams.values())
-				{
-					if (teamList.contains(player))
-					{
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Adds the player to the list of participants. If the event state is NOT STANDBY, the player wont be registered.
-	 * @param player
-	 */
-	public static void registerPlayer(PlayerInstance player)
-	{
-		if (eventState != EventState.STANDBY)
-		{
-			player.sendMessage("The registration period for this event is over.");
-			return;
-		}
-		
-		if ((Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP == 0) || AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.L2EVENT_ID, player, Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP))
-		{
-			_registeredPlayers.add(player);
-		}
-		else
-		{
-			player.sendMessage("You have reached the maximum allowed participants per IP.");
-		}
-	}
-	
-	/**
-	 * Removes the player from the participating players and the teams and restores his init stats before he registered at the event (loc, pvp, pk, title etc)
-	 * @param player
-	 */
-	public static void removeAndResetPlayer(PlayerInstance player)
-	{
-		try
-		{
-			if (isParticipant(player))
-			{
-				if (player.isDead())
-				{
-					player.restoreExp(100.0);
-					player.doRevive();
-					player.setCurrentHpMp(player.getMaxHp(), player.getMaxMp());
-					player.setCurrentCp(player.getMaxCp());
-				}
-				
-				player.decayMe();
-				player.spawnMe(player.getX(), player.getY(), player.getZ());
-				player.broadcastUserInfo();
-				
-				player.stopTransformation(true);
-			}
-			
-			if (player.getEventStatus() != null)
-			{
-				player.getEventStatus().restorePlayerStats();
-			}
-			
-			player.setEventStatus(null);
-			
-			_registeredPlayers.remove(player);
-			final int teamId = getPlayerTeamId(player);
-			if (_teams.containsKey(teamId))
-			{
-				_teams.get(teamId).remove(player);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e);
-		}
-	}
-	
-	/**
-	 * The player's event status will be saved at _connectionLossData
-	 * @param player
-	 */
-	public static void savePlayerEventStatus(PlayerInstance player)
-	{
-		_connectionLossData.put(player, player.getEventStatus());
-	}
-	
-	/**
-	 * If _connectionLossData contains the player, it will restore the player's event status. Also it will remove the player from the _connectionLossData.
-	 * @param player
-	 */
-	public static void restorePlayerEventStatus(PlayerInstance player)
-	{
-		if (_connectionLossData.containsKey(player))
-		{
-			player.setEventStatus(_connectionLossData.get(player));
-			_connectionLossData.remove(player);
-		}
-	}
-	
-	/**
-	 * If the event is ON or STANDBY, it will not start. Sets the event state to STANDBY and spawns registration NPCs
-	 * @return a string with information if the event participation has been successfully started or not.
-	 */
-	public static String startEventParticipation()
-	{
-		try
-		{
-			switch (eventState)
-			{
-				case ON:
-				{
-					return "Cannot start event, it is already on.";
-				}
-				case STANDBY:
-				{
-					return "Cannot start event, it is on standby mode.";
-				}
-				case OFF: // Event is off, so no problem turning it on.
-				{
-					eventState = EventState.STANDBY;
-					break;
-				}
-			}
-			
-			// Register the event at AntiFeedManager and clean it for just in case if the event is already registered.
-			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.L2EVENT_ID);
-			AntiFeedManager.getInstance().clear(AntiFeedManager.L2EVENT_ID);
-			
-			// Just in case
-			unspawnEventNpcs();
-			_registeredPlayers.clear();
-			// _npcs.clear();
-			if (NpcData.getInstance().getTemplate(_npcId) == null)
-			{
-				return "Cannot start event, invalid npc id.";
-			}
-			
-			try (FileReader fr = new FileReader(Config.DATAPACK_ROOT + "/data/events/" + _eventName);
-				BufferedReader br = new BufferedReader(fr))
-			{
-				_eventCreator = br.readLine();
-				_eventInfo = br.readLine();
-			}
-			
-			final List<PlayerInstance> temp = new LinkedList<>();
-			for (PlayerInstance player : World.getInstance().getPlayers())
-			{
-				if (!player.isOnline())
-				{
-					continue;
-				}
-				
-				if (!temp.contains(player))
-				{
-					spawnEventNpc(player);
-					temp.add(player);
-				}
-				World.getInstance().forEachVisibleObject(player, PlayerInstance.class, playertemp ->
-				{
-					if ((Math.abs(playertemp.getX() - player.getX()) < 1000) && (Math.abs(playertemp.getY() - player.getY()) < 1000) && (Math.abs(playertemp.getZ() - player.getZ()) < 1000))
-					{
-						temp.add(playertemp);
-					}
-				});
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Event: " + e.getMessage());
-			return "Cannot start event participation, an error has occured.";
-		}
-		
-		return "The event participation has been successfully started.";
-	}
-	
-	/**
-	 * If the event is ON or OFF, it will not start. Sets the event state to ON, creates the teams, adds the registered players ordered by level at the teams and adds a new event status to the players.
-	 * @return a string with information if the event has been successfully started or not.
-	 */
-	public static String startEvent()
-	{
-		try
-		{
-			switch (eventState)
-			{
-				case ON:
-				{
-					return "Cannot start event, it is already on.";
-				}
-				case STANDBY:
-				{
-					eventState = EventState.ON;
-					break;
-				}
-				case OFF: // Event is off, so no problem turning it on.
-				{
-					return "Cannot start event, it is off. Participation start is required.";
-				}
-			}
-			
-			// Clean the things we will use, just in case.
-			unspawnEventNpcs();
-			_teams.clear();
-			_connectionLossData.clear();
-			
-			// Insert empty lists at _teams.
-			for (int i = 0; i < _teamsNumber; i++)
-			{
-				_teams.put(i + 1, new CopyOnWriteArrayList<>());
-			}
-			
-			int i = 0;
-			while (!_registeredPlayers.isEmpty())
-			{
-				// Get the player with the biggest level
-				int max = 0;
-				PlayerInstance biggestLvlPlayer = null;
-				for (PlayerInstance player : _registeredPlayers)
-				{
-					if (player == null)
-					{
-						continue;
-					}
-					
-					if (max < player.getLevel())
-					{
-						max = player.getLevel();
-						biggestLvlPlayer = player;
-					}
-				}
-				
-				if (biggestLvlPlayer == null)
-				{
-					continue;
-				}
-				
-				_registeredPlayers.remove(biggestLvlPlayer);
-				_teams.get(i + 1).add(biggestLvlPlayer);
-				biggestLvlPlayer.setEventStatus();
-				i = (i + 1) % _teamsNumber;
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Event: " + e.getMessage());
-			return "Cannot start event, an error has occured.";
-		}
-		
-		return "The event has been successfully started.";
-	}
-	
-	/**
-	 * If the event state is OFF, it will not finish. Sets the event state to OFF, unregisters and resets the players, unspawns and clers the event NPCs, clears the teams, registered players, connection loss data, sets the teams number to 0, sets the event name to empty.
-	 * @return a string with information if the event has been successfully stopped or not.
-	 */
-	public static String finishEvent()
-	{
-		switch (eventState)
-		{
-			case OFF:
-			{
-				return "Cannot finish event, it is already off.";
-			}
-			case STANDBY:
-			{
-				for (PlayerInstance player : _registeredPlayers)
-				{
-					removeAndResetPlayer(player);
-				}
-				
-				unspawnEventNpcs();
-				// _npcs.clear();
-				_registeredPlayers.clear();
-				_teams.clear();
-				_connectionLossData.clear();
-				_teamsNumber = 0;
-				_eventName = "";
-				eventState = EventState.OFF;
-				return "The event has been stopped at STANDBY mode, all players unregistered and all event npcs unspawned.";
-			}
-			case ON:
-			{
-				for (List<PlayerInstance> teamList : _teams.values())
-				{
-					for (PlayerInstance player : teamList)
-					{
-						removeAndResetPlayer(player);
-					}
-				}
-				
-				eventState = EventState.OFF;
-				AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
-				unspawnEventNpcs(); // Just in case
-				// _npcs.clear();
-				_registeredPlayers.clear();
-				_teams.clear();
-				_connectionLossData.clear();
-				_teamsNumber = 0;
-				_eventName = "";
-				_npcId = 0;
-				_eventCreator = "";
-				_eventInfo = "";
-				return "The event has been stopped, all players unregistered and all event npcs unspawned.";
-			}
-		}
-		
-		return "The event has been successfully finished.";
-	}
-	
-	private static Map<PlayerInstance, Integer> sortByValue(Map<PlayerInstance, Integer> unsortMap)
-	{
-		final List<Entry<PlayerInstance, Integer>> list = new LinkedList<>(unsortMap.entrySet());
-		list.sort(Comparator.comparing(Entry::getValue));
-		
-		final Map<PlayerInstance, Integer> sortedMap = new LinkedHashMap<>();
-		for (Entry<PlayerInstance, Integer> entry : list)
-		{
-			sortedMap.put(entry.getKey(), entry.getValue());
-		}
-		return sortedMap;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEvent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEvent.java
deleted file mode 100644
index a5119abae7..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEvent.java
+++ /dev/null
@@ -1,1097 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.cache.HtmCache;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SpawnTable;
-import org.l2jmobius.gameserver.data.xml.DoorData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
-import org.l2jmobius.gameserver.instancemanager.InstanceManager;
-import org.l2jmobius.gameserver.model.Spawn;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.events.EventDispatcher;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventFinish;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventKill;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventRegistrationStart;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventStart;
-import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
-import org.l2jmobius.gameserver.model.skills.Skill;
-import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-
-/**
- * @author HorridoJoho
- */
-public class TvTEvent
-{
-	enum EventState
-	{
-		INACTIVE,
-		INACTIVATING,
-		PARTICIPATING,
-		STARTING,
-		STARTED,
-		REWARDING
-	}
-	
-	protected static final Logger LOGGER = Logger.getLogger(TvTEvent.class.getName());
-	
-	private static final String HTML_PATH = "data/scripts/custom/events/TvT/TvTManager/";
-	
-	private static TvTEventTeam[] _teams = new TvTEventTeam[2];
-	private static EventState _state = EventState.INACTIVE;
-	private static Spawn _npcSpawn = null;
-	private static Npc _lastNpcSpawn = null;
-	private static int _TvTEventInstance = 0;
-	
-	private TvTEvent()
-	{
-		// Prevent external initialization.
-	}
-	
-	/**
-	 * Teams initializing
-	 */
-	public static void init()
-	{
-		AntiFeedManager.getInstance().registerEvent(AntiFeedManager.TVT_ID);
-		_teams[0] = new TvTEventTeam(Config.TVT_EVENT_TEAM_1_NAME, Config.TVT_EVENT_TEAM_1_COORDINATES);
-		_teams[1] = new TvTEventTeam(Config.TVT_EVENT_TEAM_2_NAME, Config.TVT_EVENT_TEAM_2_COORDINATES);
-	}
-	
-	/**
-	 * Starts the participation of the TvTEvent<br>
-	 * 1. Get NpcTemplate by Config.TVT_EVENT_PARTICIPATION_NPC_ID<br>
-	 * 2. Try to spawn a new npc of it
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static boolean startParticipation()
-	{
-		try
-		{
-			_npcSpawn = new Spawn(Config.TVT_EVENT_PARTICIPATION_NPC_ID);
-			_npcSpawn.setXYZ(Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[0], Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[1], Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[2]);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[3]);
-			_npcSpawn.setRespawnDelay(1);
-			// later no need to delete spawn from db, we don't store it (false)
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_lastNpcSpawn = _npcSpawn.getLastSpawn();
-			_lastNpcSpawn.setCurrentHp(_lastNpcSpawn.getMaxHp());
-			_lastNpcSpawn.setTitle("TvT Event Participation");
-			_lastNpcSpawn.isAggressive();
-			_lastNpcSpawn.decayMe();
-			_lastNpcSpawn.spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_lastNpcSpawn.broadcastPacket(new MagicSkillUse(_lastNpcSpawn, _lastNpcSpawn, 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "TvTEventEngine[TvTEvent.startParticipation()]: exception: " + e.getMessage(), e);
-			return false;
-		}
-		
-		setState(EventState.PARTICIPATING);
-		EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventRegistrationStart());
-		return true;
-	}
-	
-	private static int highestLevelPcInstanceOf(Map<Integer, PlayerInstance> players)
-	{
-		int maxLevel = Integer.MIN_VALUE;
-		int maxLevelId = -1;
-		for (PlayerInstance player : players.values())
-		{
-			if (player.getLevel() >= maxLevel)
-			{
-				maxLevel = player.getLevel();
-				maxLevelId = player.getObjectId();
-			}
-		}
-		return maxLevelId;
-	}
-	
-	/**
-	 * Starts the TvTEvent fight<br>
-	 * 1. Set state EventState.STARTING<br>
-	 * 2. Close doors specified in configs<br>
-	 * 3. Abort if not enough participants(return false)<br>
-	 * 4. Set state EventState.STARTED<br>
-	 * 5. Teleport all participants to team spot
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static boolean startFight()
-	{
-		// Set state to STARTING
-		setState(EventState.STARTING);
-		
-		// Randomize and balance team distribution
-		final Map<Integer, PlayerInstance> allParticipants = new HashMap<>();
-		allParticipants.putAll(_teams[0].getParticipatedPlayers());
-		allParticipants.putAll(_teams[1].getParticipatedPlayers());
-		_teams[0].cleanMe();
-		_teams[1].cleanMe();
-		
-		if (needParticipationFee())
-		{
-			for (PlayerInstance player : allParticipants.values())
-			{
-				if (!hasParticipationFee(player))
-				{
-					allParticipants.remove(player.getObjectId());
-				}
-			}
-		}
-		
-		final int[] balance =
-		{
-			0,
-			0
-		};
-		int priority = 0;
-		int highestLevelPlayerId;
-		PlayerInstance highestLevelPlayer;
-		// TODO: allParticipants should be sorted by level instead of using highestLevelPcInstanceOf for every fetch
-		while (!allParticipants.isEmpty())
-		{
-			// Priority team gets one player
-			highestLevelPlayerId = highestLevelPcInstanceOf(allParticipants);
-			highestLevelPlayer = allParticipants.get(highestLevelPlayerId);
-			allParticipants.remove(highestLevelPlayerId);
-			_teams[priority].addPlayer(highestLevelPlayer);
-			balance[priority] += highestLevelPlayer.getLevel();
-			// Exiting if no more players
-			if (allParticipants.isEmpty())
-			{
-				break;
-			}
-			// The other team gets one player
-			// TODO: Code not dry
-			priority = 1 - priority;
-			highestLevelPlayerId = highestLevelPcInstanceOf(allParticipants);
-			highestLevelPlayer = allParticipants.get(highestLevelPlayerId);
-			allParticipants.remove(highestLevelPlayerId);
-			_teams[priority].addPlayer(highestLevelPlayer);
-			balance[priority] += highestLevelPlayer.getLevel();
-			// Recalculating priority
-			priority = balance[0] > balance[1] ? 1 : 0;
-		}
-		
-		// Check for enought participants
-		if ((_teams[0].getParticipatedPlayerCount() < Config.TVT_EVENT_MIN_PLAYERS_IN_TEAMS) || (_teams[1].getParticipatedPlayerCount() < Config.TVT_EVENT_MIN_PLAYERS_IN_TEAMS))
-		{
-			// Set state INACTIVE
-			setState(EventState.INACTIVE);
-			// Cleanup of teams
-			_teams[0].cleanMe();
-			_teams[1].cleanMe();
-			// Unspawn the event NPC
-			unSpawnNpc();
-			AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
-			return false;
-		}
-		
-		if (needParticipationFee())
-		{
-			for (PlayerInstance player : _teams[0].getParticipatedPlayers().values())
-			{
-				if (!payParticipationFee(player))
-				{
-					_teams[0].removePlayer(player.getObjectId());
-				}
-			}
-			for (PlayerInstance player : _teams[1].getParticipatedPlayers().values())
-			{
-				if (!payParticipationFee(player))
-				{
-					_teams[1].removePlayer(player.getObjectId());
-				}
-			}
-		}
-		
-		if (Config.TVT_EVENT_IN_INSTANCE)
-		{
-			try
-			{
-				_TvTEventInstance = InstanceManager.getInstance().createDynamicInstance(Config.TVT_EVENT_INSTANCE_ID).getId();
-				InstanceManager.getInstance().getInstance(_TvTEventInstance).setAllowSummon(false);
-				InstanceManager.getInstance().getInstance(_TvTEventInstance).setPvP(true);
-				InstanceManager.getInstance().getInstance(_TvTEventInstance).setEmptyDestroyTime((Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY * 1000) + 60000);
-			}
-			catch (Exception e)
-			{
-				_TvTEventInstance = 0;
-				LOGGER.log(Level.WARNING, "TvTEventEngine[TvTEvent.createDynamicInstance]: exception: " + e.getMessage(), e);
-			}
-		}
-		
-		// Opens all doors specified in configs for tvt
-		openDoors(Config.TVT_DOORS_IDS_TO_OPEN);
-		// Closes all doors specified in configs for tvt
-		closeDoors(Config.TVT_DOORS_IDS_TO_CLOSE);
-		// Set state STARTED
-		setState(EventState.STARTED);
-		
-		// Iterate over all teams
-		for (TvTEventTeam team : _teams)
-		{
-			// Iterate over all participated player instances in this team
-			for (PlayerInstance playerInstance : team.getParticipatedPlayers().values())
-			{
-				if (playerInstance != null)
-				{
-					// Disable player revival.
-					playerInstance.setCanRevive(false);
-					// Teleporter implements Runnable and starts itself
-					new TvTEventTeleporter(playerInstance, team.getCoordinates(), false, false);
-				}
-			}
-		}
-		
-		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventStart());
-		return true;
-	}
-	
-	/**
-	 * Calculates the TvTEvent reward<br>
-	 * 1. If both teams are at a tie(points equals), send it as system message to all participants, if one of the teams have 0 participants left online abort rewarding<br>
-	 * 2. Wait till teams are not at a tie anymore<br>
-	 * 3. Set state EvcentState.REWARDING<br>
-	 * 4. Reward team with more points<br>
-	 * 5. Show win html to wining team participants
-	 * @return String: winning team name
-	 */
-	public static String calculateRewards()
-	{
-		if (_teams[0].getPoints() == _teams[1].getPoints())
-		{
-			// Check if one of the teams have no more players left
-			if ((_teams[0].getParticipatedPlayerCount() == 0) || (_teams[1].getParticipatedPlayerCount() == 0))
-			{
-				// set state to rewarding
-				setState(EventState.REWARDING);
-				// return here, the fight can't be completed
-				return "TvT Event: Event has ended. No team won due to inactivity!";
-			}
-			
-			// Both teams have equals points
-			sysMsgToAllParticipants("TvT Event: Event has ended, both teams have tied.");
-			if (Config.TVT_REWARD_TEAM_TIE)
-			{
-				rewardTeam(_teams[0]);
-				rewardTeam(_teams[1]);
-				return "TvT Event: Event has ended with both teams tying.";
-			}
-			return "TvT Event: Event has ended with both teams tying.";
-		}
-		
-		// Set state REWARDING so nobody can point anymore
-		setState(EventState.REWARDING);
-		
-		// Get team which has more points
-		final TvTEventTeam team = _teams[_teams[0].getPoints() > _teams[1].getPoints() ? 0 : 1];
-		rewardTeam(team);
-		
-		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventFinish());
-		return "TvT Event: Event finish. Team " + team.getName() + " won with " + team.getPoints() + " kills.";
-	}
-	
-	private static void rewardTeam(TvTEventTeam team)
-	{
-		// Iterate over all participated player instances of the winning team
-		for (PlayerInstance playerInstance : team.getParticipatedPlayers().values())
-		{
-			// Check for nullpointer
-			if (playerInstance == null)
-			{
-				continue;
-			}
-			
-			SystemMessage systemMessage = null;
-			
-			// Iterate over all tvt event rewards
-			for (int[] reward : Config.TVT_EVENT_REWARDS)
-			{
-				final PlayerInventory inv = playerInstance.getInventory();
-				
-				// Check for stackable item, non stackabe items need to be added one by one
-				if (ItemTable.getInstance().getTemplate(reward[0]).isStackable())
-				{
-					inv.addItem("TvT Event", reward[0], reward[1], playerInstance, playerInstance);
-					if (reward[1] > 1)
-					{
-						systemMessage = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-						systemMessage.addItemName(reward[0]);
-						systemMessage.addLong(reward[1]);
-					}
-					else
-					{
-						systemMessage = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-						systemMessage.addItemName(reward[0]);
-					}
-					
-					playerInstance.sendPacket(systemMessage);
-				}
-				else
-				{
-					for (int i = 0; i < reward[1]; ++i)
-					{
-						inv.addItem("TvT Event", reward[0], 1, playerInstance, playerInstance);
-						systemMessage = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-						systemMessage.addItemName(reward[0]);
-						playerInstance.sendPacket(systemMessage);
-					}
-				}
-			}
-			
-			final StatusUpdate statusUpdate = new StatusUpdate(playerInstance);
-			final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage();
-			statusUpdate.addAttribute(StatusUpdate.CUR_LOAD, playerInstance.getCurrentLoad());
-			npcHtmlMessage.setHtml(HtmCache.getInstance().getHtm(playerInstance, HTML_PATH + "Reward.html"));
-			playerInstance.sendPacket(statusUpdate);
-			playerInstance.sendPacket(npcHtmlMessage);
-		}
-	}
-	
-	/**
-	 * Stops the TvTEvent fight<br>
-	 * 1. Set state EventState.INACTIVATING<br>
-	 * 2. Remove tvt npc from world<br>
-	 * 3. Open doors specified in configs<br>
-	 * 4. Teleport all participants back to participation npc location<br>
-	 * 5. Teams cleaning<br>
-	 * 6. Set state EventState.INACTIVE
-	 */
-	public static void stopFight()
-	{
-		// Set state INACTIVATING
-		setState(EventState.INACTIVATING);
-		// Unspawn event npc
-		unSpawnNpc();
-		// Opens all doors specified in configs for tvt
-		openDoors(Config.TVT_DOORS_IDS_TO_CLOSE);
-		// Closes all doors specified in Configs for tvt
-		closeDoors(Config.TVT_DOORS_IDS_TO_OPEN);
-		
-		// Iterate over all teams
-		for (TvTEventTeam team : _teams)
-		{
-			for (PlayerInstance playerInstance : team.getParticipatedPlayers().values())
-			{
-				// Check for nullpointer
-				if (playerInstance != null)
-				{
-					// Enable player revival.
-					playerInstance.setCanRevive(true);
-					// Teleport back.
-					new TvTEventTeleporter(playerInstance, Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES, false, false);
-				}
-			}
-		}
-		
-		// Cleanup of teams
-		_teams[0].cleanMe();
-		_teams[1].cleanMe();
-		// Set state INACTIVE
-		setState(EventState.INACTIVE);
-		AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
-	}
-	
-	/**
-	 * Adds a player to a TvTEvent team<br>
-	 * 1. Calculate the id of the team in which the player should be added<br>
-	 * 2. Add the player to the calculated team
-	 * @param playerInstance as PlayerInstance
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static synchronized boolean addParticipant(PlayerInstance playerInstance)
-	{
-		// Check for nullpoitner
-		if (playerInstance == null)
-		{
-			return false;
-		}
-		
-		byte teamId = 0;
-		
-		// Check to which team the player should be added
-		if (_teams[0].getParticipatedPlayerCount() == _teams[1].getParticipatedPlayerCount())
-		{
-			teamId = (byte) Rnd.get(2);
-		}
-		else
-		{
-			teamId = (byte) (_teams[0].getParticipatedPlayerCount() > _teams[1].getParticipatedPlayerCount() ? 1 : 0);
-		}
-		playerInstance.addEventListener(new TvTEventListener(playerInstance));
-		return _teams[teamId].addPlayer(playerInstance);
-	}
-	
-	/**
-	 * Removes a TvTEvent player from it's team<br>
-	 * 1. Get team id of the player<br>
-	 * 2. Remove player from it's team
-	 * @param playerObjectId
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static boolean removeParticipant(int playerObjectId)
-	{
-		// Get the teamId of the player
-		final byte teamId = getParticipantTeamId(playerObjectId);
-		
-		// Check if the player is participant
-		if (teamId != -1)
-		{
-			// Remove the player from team
-			_teams[teamId].removePlayer(playerObjectId);
-			
-			final PlayerInstance player = World.getInstance().getPlayer(playerObjectId);
-			if (player != null)
-			{
-				player.removeEventListener(TvTEventListener.class);
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	public static boolean needParticipationFee()
-	{
-		return (Config.TVT_EVENT_PARTICIPATION_FEE[0] != 0) && (Config.TVT_EVENT_PARTICIPATION_FEE[1] != 0);
-	}
-	
-	public static boolean hasParticipationFee(PlayerInstance playerInstance)
-	{
-		return playerInstance.getInventory().getInventoryItemCount(Config.TVT_EVENT_PARTICIPATION_FEE[0], -1) >= Config.TVT_EVENT_PARTICIPATION_FEE[1];
-	}
-	
-	public static boolean payParticipationFee(PlayerInstance playerInstance)
-	{
-		return playerInstance.destroyItemByItemId("TvT Participation Fee", Config.TVT_EVENT_PARTICIPATION_FEE[0], Config.TVT_EVENT_PARTICIPATION_FEE[1], _lastNpcSpawn, true);
-	}
-	
-	public static String getParticipationFee()
-	{
-		final int itemId = Config.TVT_EVENT_PARTICIPATION_FEE[0];
-		final int itemNum = Config.TVT_EVENT_PARTICIPATION_FEE[1];
-		if ((itemId == 0) || (itemNum == 0))
-		{
-			return "-";
-		}
-		return itemNum + " " + ItemTable.getInstance().getTemplate(itemId).getName();
-	}
-	
-	/**
-	 * Send a SystemMessage to all participated players<br>
-	 * 1. Send the message to all players of team number one<br>
-	 * 2. Send the message to all players of team number two
-	 * @param message as String
-	 */
-	public static void sysMsgToAllParticipants(String message)
-	{
-		for (PlayerInstance playerInstance : _teams[0].getParticipatedPlayers().values())
-		{
-			if (playerInstance != null)
-			{
-				playerInstance.sendMessage(message);
-			}
-		}
-		
-		for (PlayerInstance playerInstance : _teams[1].getParticipatedPlayers().values())
-		{
-			if (playerInstance != null)
-			{
-				playerInstance.sendMessage(message);
-			}
-		}
-	}
-	
-	private static DoorInstance getDoor(int doorId)
-	{
-		DoorInstance door = null;
-		if (_TvTEventInstance <= 0)
-		{
-			door = DoorData.getInstance().getDoor(doorId);
-		}
-		else
-		{
-			final Instance inst = InstanceManager.getInstance().getInstance(_TvTEventInstance);
-			if (inst != null)
-			{
-				door = inst.getDoor(doorId);
-			}
-		}
-		return door;
-	}
-	
-	/**
-	 * Close doors specified in configs
-	 * @param doors
-	 */
-	private static void closeDoors(List<Integer> doors)
-	{
-		for (int doorId : doors)
-		{
-			final DoorInstance doorInstance = getDoor(doorId);
-			if (doorInstance != null)
-			{
-				doorInstance.closeMe();
-			}
-		}
-	}
-	
-	/**
-	 * Open doors specified in configs
-	 * @param doors
-	 */
-	private static void openDoors(List<Integer> doors)
-	{
-		for (int doorId : doors)
-		{
-			final DoorInstance doorInstance = getDoor(doorId);
-			if (doorInstance != null)
-			{
-				doorInstance.openMe();
-			}
-		}
-	}
-	
-	/**
-	 * UnSpawns the TvTEvent npc
-	 */
-	private static void unSpawnNpc()
-	{
-		// Delete the npc
-		_lastNpcSpawn.deleteMe();
-		SpawnTable.getInstance().deleteSpawn(_lastNpcSpawn.getSpawn(), false);
-		// Stop respawning of the npc
-		_npcSpawn.stopRespawn();
-		_npcSpawn = null;
-		_lastNpcSpawn = null;
-	}
-	
-	/**
-	 * Called when a player logs in
-	 * @param playerInstance as PlayerInstance
-	 */
-	public static void onLogin(PlayerInstance playerInstance)
-	{
-		if ((playerInstance == null) || (!isStarting() && !isStarted()))
-		{
-			return;
-		}
-		
-		final byte teamId = getParticipantTeamId(playerInstance.getObjectId());
-		if (teamId == -1)
-		{
-			return;
-		}
-		
-		_teams[teamId].addPlayer(playerInstance);
-		new TvTEventTeleporter(playerInstance, _teams[teamId].getCoordinates(), true, false);
-	}
-	
-	/**
-	 * Called when a player logs out
-	 * @param playerInstance as PlayerInstance
-	 */
-	public static void onLogout(PlayerInstance playerInstance)
-	{
-		if ((playerInstance != null) && (isStarting() || isStarted() || isParticipating()) && removeParticipant(playerInstance.getObjectId()))
-		{
-			playerInstance.setXYZInvisible((Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[0] + Rnd.get(101)) - 50, (Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[1] + Rnd.get(101)) - 50, Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[2]);
-		}
-	}
-	
-	/**
-	 * Called on every onAction in PlayerIstance
-	 * @param playerInstance
-	 * @param targetedPlayerObjectId
-	 * @return boolean: true if player is allowed to target, otherwise false
-	 */
-	public static boolean onAction(PlayerInstance playerInstance, int targetedPlayerObjectId)
-	{
-		if ((playerInstance == null) || !isStarted())
-		{
-			return true;
-		}
-		
-		if (playerInstance.isGM())
-		{
-			return true;
-		}
-		
-		final byte playerTeamId = getParticipantTeamId(playerInstance.getObjectId());
-		final byte targetedPlayerTeamId = getParticipantTeamId(targetedPlayerObjectId);
-		if (((playerTeamId != -1) && (targetedPlayerTeamId == -1)) || ((playerTeamId == -1) && (targetedPlayerTeamId != -1)))
-		{
-			return false;
-		}
-		
-		if ((playerTeamId != -1) && (targetedPlayerTeamId != -1) && (playerTeamId == targetedPlayerTeamId) && (playerInstance.getObjectId() != targetedPlayerObjectId) && !Config.TVT_EVENT_TARGET_TEAM_MEMBERS_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every scroll use
-	 * @param playerObjectId
-	 * @return boolean: true if player is allowed to use scroll, otherwise false
-	 */
-	public static boolean onScrollUse(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId) && !Config.TVT_EVENT_SCROLL_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every potion use
-	 * @param playerObjectId
-	 * @return boolean: true if player is allowed to use potions, otherwise false
-	 */
-	public static boolean onPotionUse(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId) && !Config.TVT_EVENT_POTIONS_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every escape use(thanks to nbd)
-	 * @param playerObjectId
-	 * @return boolean: true if player is not in tvt event, otherwise false
-	 */
-	public static boolean onEscapeUse(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId))
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every summon item use
-	 * @param playerObjectId
-	 * @return boolean: true if player is allowed to summon by item, otherwise false
-	 */
-	public static boolean onItemSummon(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId) && !Config.TVT_EVENT_SUMMON_BY_ITEM_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Is called when a player is killed
-	 * @param killerCharacter as Creature
-	 * @param killedPlayerInstance as PlayerInstance
-	 */
-	public static void onKill(Creature killerCharacter, PlayerInstance killedPlayerInstance)
-	{
-		if ((killedPlayerInstance == null) || !isStarted())
-		{
-			return;
-		}
-		
-		final byte killedTeamId = getParticipantTeamId(killedPlayerInstance.getObjectId());
-		if (killedTeamId == -1)
-		{
-			return;
-		}
-		
-		new TvTEventTeleporter(killedPlayerInstance, _teams[killedTeamId].getCoordinates(), false, false);
-		if (killerCharacter == null)
-		{
-			return;
-		}
-		
-		PlayerInstance killerPlayerInstance = null;
-		if (killerCharacter.isPet() || killerCharacter.isServitor())
-		{
-			killerPlayerInstance = ((Summon) killerCharacter).getOwner();
-			if (killerPlayerInstance == null)
-			{
-				return;
-			}
-		}
-		else if (killerCharacter.isPlayer())
-		{
-			killerPlayerInstance = (PlayerInstance) killerCharacter;
-		}
-		else
-		{
-			return;
-		}
-		
-		final byte killerTeamId = getParticipantTeamId(killerPlayerInstance.getObjectId());
-		if ((killerTeamId != -1) && (killedTeamId != -1) && (killerTeamId != killedTeamId))
-		{
-			final TvTEventTeam killerTeam = _teams[killerTeamId];
-			killerTeam.increasePoints();
-			
-			final CreatureSay cs = new CreatureSay(killerPlayerInstance, ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!");
-			for (PlayerInstance playerInstance : _teams[killerTeamId].getParticipatedPlayers().values())
-			{
-				if (playerInstance != null)
-				{
-					playerInstance.sendPacket(cs);
-				}
-			}
-			
-			// Notify to scripts.
-			EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventKill(killerPlayerInstance, killedPlayerInstance, killerTeam));
-		}
-	}
-	
-	/**
-	 * Called on Appearing packet received (player finished teleporting)
-	 * @param playerInstance
-	 */
-	public static void onTeleported(PlayerInstance playerInstance)
-	{
-		if (!isStarted() || (playerInstance == null) || !isPlayerParticipant(playerInstance.getObjectId()))
-		{
-			return;
-		}
-		
-		if (playerInstance.isMageClass())
-		{
-			if ((Config.TVT_EVENT_MAGE_BUFFS != null) && !Config.TVT_EVENT_MAGE_BUFFS.isEmpty())
-			{
-				for (Entry<Integer, Integer> e : Config.TVT_EVENT_MAGE_BUFFS.entrySet())
-				{
-					final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue());
-					if (skill != null)
-					{
-						skill.applyEffects(playerInstance, playerInstance);
-					}
-				}
-			}
-		}
-		else if ((Config.TVT_EVENT_FIGHTER_BUFFS != null) && !Config.TVT_EVENT_FIGHTER_BUFFS.isEmpty())
-		{
-			for (Entry<Integer, Integer> e : Config.TVT_EVENT_FIGHTER_BUFFS.entrySet())
-			{
-				final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue());
-				if (skill != null)
-				{
-					skill.applyEffects(playerInstance, playerInstance);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * @param source
-	 * @param target
-	 * @param skill
-	 * @return true if player valid for skill
-	 */
-	public static boolean checkForTvTSkill(PlayerInstance source, PlayerInstance target, Skill skill)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		// TvT is started
-		final int sourcePlayerId = source.getObjectId();
-		final int targetPlayerId = target.getObjectId();
-		final boolean isSourceParticipant = isPlayerParticipant(sourcePlayerId);
-		final boolean isTargetParticipant = isPlayerParticipant(targetPlayerId);
-		
-		// both players not participating
-		if (!isSourceParticipant && !isTargetParticipant)
-		{
-			return true;
-		}
-		// one player not participating
-		if (!(isSourceParticipant && isTargetParticipant))
-		{
-			return false;
-		}
-		// players in the different teams ?
-		if ((getParticipantTeamId(sourcePlayerId) != getParticipantTeamId(targetPlayerId)) && !skill.isBad())
-		{
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Sets the TvTEvent state
-	 * @param state as EventState
-	 */
-	private static void setState(EventState state)
-	{
-		synchronized (_state)
-		{
-			_state = state;
-		}
-	}
-	
-	/**
-	 * Is TvTEvent inactive?
-	 * @return boolean: true if event is inactive(waiting for next event cycle), otherwise false
-	 */
-	public static boolean isInactive()
-	{
-		boolean isInactive;
-		
-		synchronized (_state)
-		{
-			isInactive = _state == EventState.INACTIVE;
-		}
-		return isInactive;
-	}
-	
-	/**
-	 * Is TvTEvent in inactivating?
-	 * @return boolean: true if event is in inactivating progress, otherwise false
-	 */
-	public static boolean isInactivating()
-	{
-		boolean isInactivating;
-		
-		synchronized (_state)
-		{
-			isInactivating = _state == EventState.INACTIVATING;
-		}
-		return isInactivating;
-	}
-	
-	/**
-	 * Is TvTEvent in participation?
-	 * @return boolean: true if event is in participation progress, otherwise false
-	 */
-	public static boolean isParticipating()
-	{
-		boolean isParticipating;
-		
-		synchronized (_state)
-		{
-			isParticipating = _state == EventState.PARTICIPATING;
-		}
-		return isParticipating;
-	}
-	
-	/**
-	 * Is TvTEvent starting?
-	 * @return boolean: true if event is starting up(setting up fighting spot, teleport players etc.), otherwise false
-	 */
-	public static boolean isStarting()
-	{
-		boolean isStarting;
-		
-		synchronized (_state)
-		{
-			isStarting = _state == EventState.STARTING;
-		}
-		return isStarting;
-	}
-	
-	/**
-	 * Is TvTEvent started?
-	 * @return boolean: true if event is started, otherwise false
-	 */
-	public static boolean isStarted()
-	{
-		boolean isStarted;
-		
-		synchronized (_state)
-		{
-			isStarted = _state == EventState.STARTED;
-		}
-		return isStarted;
-	}
-	
-	/**
-	 * Is TvTEvent rewarding?
-	 * @return boolean: true if event is currently rewarding, otherwise false
-	 */
-	public static boolean isRewarding()
-	{
-		boolean isRewarding;
-		
-		synchronized (_state)
-		{
-			isRewarding = _state == EventState.REWARDING;
-		}
-		return isRewarding;
-	}
-	
-	/**
-	 * Returns the team id of a player, if player is not participant it returns -1
-	 * @param playerObjectId
-	 * @return byte: team name of the given playerName, if not in event -1
-	 */
-	public static byte getParticipantTeamId(int playerObjectId)
-	{
-		return (byte) (_teams[0].containsPlayer(playerObjectId) ? 0 : (_teams[1].containsPlayer(playerObjectId) ? 1 : -1));
-	}
-	
-	/**
-	 * Returns the team of a player, if player is not participant it returns null
-	 * @param playerObjectId
-	 * @return TvTEventTeam: team of the given playerObjectId, if not in event null
-	 */
-	public static TvTEventTeam getParticipantTeam(int playerObjectId)
-	{
-		return _teams[0].containsPlayer(playerObjectId) ? _teams[0] : (_teams[1].containsPlayer(playerObjectId) ? _teams[1] : null);
-	}
-	
-	/**
-	 * Returns the enemy team of a player, if player is not participant it returns null
-	 * @param playerObjectId
-	 * @return TvTEventTeam: enemy team of the given playerObjectId, if not in event null
-	 */
-	public static TvTEventTeam getParticipantEnemyTeam(int playerObjectId)
-	{
-		return (_teams[0].containsPlayer(playerObjectId) ? _teams[1] : (_teams[1].containsPlayer(playerObjectId) ? _teams[0] : null));
-	}
-	
-	/**
-	 * Returns the team coordinates in which the player is in, if player is not in a team return null
-	 * @param playerObjectId
-	 * @return int[]: coordinates of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static int[] getParticipantTeamCoordinates(int playerObjectId)
-	{
-		return _teams[0].containsPlayer(playerObjectId) ? _teams[0].getCoordinates() : (_teams[1].containsPlayer(playerObjectId) ? _teams[1].getCoordinates() : null);
-	}
-	
-	/**
-	 * Is given player participant of the event?
-	 * @param playerObjectId
-	 * @return boolean: true if player is participant, ohterwise false
-	 */
-	public static boolean isPlayerParticipant(int playerObjectId)
-	{
-		return (isParticipating() || isStarting() || isStarted()) && (_teams[0].containsPlayer(playerObjectId) || _teams[1].containsPlayer(playerObjectId));
-	}
-	
-	/**
-	 * Returns participated player count
-	 * @return int: amount of players registered in the event
-	 */
-	public static int getParticipatedPlayersCount()
-	{
-		return !isParticipating() && !isStarting() && !isStarted() ? 0 : _teams[0].getParticipatedPlayerCount() + _teams[1].getParticipatedPlayerCount();
-	}
-	
-	/**
-	 * Returns teams names
-	 * @return String[]: names of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static String[] getTeamNames()
-	{
-		return new String[]
-		{
-			_teams[0].getName(),
-			_teams[1].getName()
-		};
-	}
-	
-	/**
-	 * Returns player count of both teams
-	 * @return int[]: player count of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static int[] getTeamsPlayerCounts()
-	{
-		return new int[]
-		{
-			_teams[0].getParticipatedPlayerCount(),
-			_teams[1].getParticipatedPlayerCount()
-		};
-	}
-	
-	/**
-	 * Returns points count of both teams
-	 * @return int[]: points of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static int[] getTeamsPoints()
-	{
-		return new int[]
-		{
-			_teams[0].getPoints(),
-			_teams[1].getPoints()
-		};
-	}
-	
-	public static int getTvTEventInstance()
-	{
-		return _TvTEventInstance;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventListener.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventListener.java
deleted file mode 100644
index 43fe8e6d36..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventListener.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.interfaces.IEventListener;
-
-/**
- * @author UnAfraid
- */
-public class TvTEventListener implements IEventListener
-{
-	private final PlayerInstance _player;
-	
-	protected TvTEventListener(PlayerInstance player)
-	{
-		_player = player;
-	}
-	
-	@Override
-	public boolean isOnEvent()
-	{
-		return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_player.getObjectId());
-	}
-	
-	@Override
-	public boolean isBlockingExit()
-	{
-		return true;
-	}
-	
-	@Override
-	public boolean isBlockingDeathPenalty()
-	{
-		return true;
-	}
-	
-	@Override
-	public boolean canRevive()
-	{
-		return false;
-	}
-	
-	@Override
-	public PlayerInstance getPlayer()
-	{
-		return _player;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventPlayer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventPlayer.java
deleted file mode 100644
index bd7c43d75c..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventPlayer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-/**
- * @author UnAfraid
- */
-public class TvTEventPlayer
-{
-	private final PlayerInstance _player;
-	
-	protected TvTEventPlayer(PlayerInstance player)
-	{
-		_player = player;
-	}
-	
-	public boolean isOnEvent()
-	{
-		return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_player.getObjectId());
-	}
-	
-	public boolean isBlockingExit()
-	{
-		return true;
-	}
-	
-	public boolean isBlockingDeathPenalty()
-	{
-		return true;
-	}
-	
-	public boolean canRevive()
-	{
-		return false;
-	}
-	
-	public PlayerInstance getPlayer()
-	{
-		return _player;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeam.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeam.java
deleted file mode 100644
index 8997873c2e..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeam.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-/**
- * @author HorridoJoho
- */
-public class TvTEventTeam
-{
-	/**
-	 * The name of the team
-	 */
-	private final String _name;
-	/**
-	 * The team spot coordinated
-	 */
-	private int[] _coordinates = new int[3];
-	/**
-	 * The points of the team
-	 */
-	private short _points;
-	/** Name and instance of all participated players in map. */
-	private final Map<Integer, PlayerInstance> _participatedPlayers = new ConcurrentHashMap<>();
-	
-	/**
-	 * C'tor initialize the team
-	 * @param name as String
-	 * @param coordinates as int[]
-	 */
-	public TvTEventTeam(String name, int[] coordinates)
-	{
-		_name = name;
-		_coordinates = coordinates;
-		_points = 0;
-	}
-	
-	/**
-	 * Adds a player to the team
-	 * @param playerInstance as PlayerInstance
-	 * @return boolean: true if success, otherwise false
-	 */
-	public boolean addPlayer(PlayerInstance playerInstance)
-	{
-		if (playerInstance == null)
-		{
-			return false;
-		}
-		
-		_participatedPlayers.put(playerInstance.getObjectId(), playerInstance);
-		
-		return true;
-	}
-	
-	/**
-	 * Removes a player from the team
-	 * @param playerObjectId
-	 */
-	public void removePlayer(int playerObjectId)
-	{
-		_participatedPlayers.remove(playerObjectId);
-	}
-	
-	/**
-	 * Increases the points of the team
-	 */
-	public void increasePoints()
-	{
-		++_points;
-	}
-	
-	/**
-	 * Cleanup the team and make it ready for adding players again
-	 */
-	public void cleanMe()
-	{
-		_participatedPlayers.clear();
-		_points = 0;
-	}
-	
-	/**
-	 * Is given player in this team?
-	 * @param playerObjectId
-	 * @return boolean: true if player is in this team, otherwise false
-	 */
-	public boolean containsPlayer(int playerObjectId)
-	{
-		return _participatedPlayers.containsKey(playerObjectId);
-	}
-	
-	/**
-	 * Returns the name of the team
-	 * @return String: name of the team
-	 */
-	public String getName()
-	{
-		return _name;
-	}
-	
-	/**
-	 * Returns the coordinates of the team spot
-	 * @return int[]: team coordinates
-	 */
-	public int[] getCoordinates()
-	{
-		return _coordinates;
-	}
-	
-	/**
-	 * Returns the points of the team
-	 * @return short: team points
-	 */
-	public short getPoints()
-	{
-		return _points;
-	}
-	
-	/**
-	 * Returns name and instance of all participated players in Map
-	 * @return Map<String, PlayerInstance>: map of players in this team
-	 */
-	public Map<Integer, PlayerInstance> getParticipatedPlayers()
-	{
-		return _participatedPlayers;
-	}
-	
-	/**
-	 * Returns player count of this team
-	 * @return int: number of players in team
-	 */
-	public int getParticipatedPlayerCount()
-	{
-		return _participatedPlayers.size();
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeleporter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeleporter.java
deleted file mode 100644
index 66c8683529..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeleporter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.enums.Team;
-import org.l2jmobius.gameserver.model.Duel;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class TvTEventTeleporter implements Runnable
-{
-	/** The instance of the player to teleport */
-	private PlayerInstance _playerInstance = null;
-	/** Coordinates of the spot to teleport to */
-	private int[] _coordinates = new int[3];
-	/** Admin removed this player from event */
-	private boolean _adminRemove = false;
-	
-	/**
-	 * Initialize the teleporter and start the delayed task.
-	 * @param playerInstance
-	 * @param coordinates
-	 * @param fastSchedule
-	 * @param adminRemove
-	 */
-	public TvTEventTeleporter(PlayerInstance playerInstance, int[] coordinates, boolean fastSchedule, boolean adminRemove)
-	{
-		_playerInstance = playerInstance;
-		_coordinates = coordinates;
-		_adminRemove = adminRemove;
-		ThreadPool.schedule(this, fastSchedule ? 0 : (TvTEvent.isStarted() ? Config.TVT_EVENT_RESPAWN_TELEPORT_DELAY : Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY) * 1000);
-	}
-	
-	/**
-	 * The task method to teleport the player<br>
-	 * 1. Unsummon pet if there is one<br>
-	 * 2. Remove all effects<br>
-	 * 3. Revive and full heal the player<br>
-	 * 4. Teleport the player<br>
-	 * 5. Broadcast status and user info
-	 */
-	@Override
-	public void run()
-	{
-		if (_playerInstance == null)
-		{
-			return;
-		}
-		
-		final Summon summon = _playerInstance.getSummon();
-		if (summon != null)
-		{
-			summon.unSummon(_playerInstance);
-		}
-		
-		if ((Config.TVT_EVENT_EFFECTS_REMOVAL == 0) || ((Config.TVT_EVENT_EFFECTS_REMOVAL == 1) && ((_playerInstance.getTeam() == Team.NONE) || (_playerInstance.isInDuel() && (_playerInstance.getDuelState() != Duel.DUELSTATE_INTERRUPTED)))))
-		{
-			_playerInstance.stopAllEffectsExceptThoseThatLastThroughDeath();
-		}
-		
-		if (_playerInstance.isInDuel())
-		{
-			_playerInstance.setDuelState(Duel.DUELSTATE_INTERRUPTED);
-		}
-		
-		final int TvTInstance = TvTEvent.getTvTEventInstance();
-		if (TvTInstance != 0)
-		{
-			if (TvTEvent.isStarted() && !_adminRemove)
-			{
-				_playerInstance.setInstanceId(TvTInstance);
-			}
-			else
-			{
-				_playerInstance.setInstanceId(0);
-			}
-		}
-		else
-		{
-			_playerInstance.setInstanceId(0);
-		}
-		
-		_playerInstance.doRevive();
-		
-		_playerInstance.teleToLocation((_coordinates[0] + Rnd.get(101)) - 50, (_coordinates[1] + Rnd.get(101)) - 50, _coordinates[2], false);
-		if (TvTEvent.isStarted() && !_adminRemove)
-		{
-			final int teamId = TvTEvent.getParticipantTeamId(_playerInstance.getObjectId()) + 1;
-			switch (teamId)
-			{
-				case 0:
-				{
-					_playerInstance.setTeam(Team.NONE);
-					break;
-				}
-				case 1:
-				{
-					_playerInstance.setTeam(Team.BLUE);
-					break;
-				}
-				case 2:
-				{
-					_playerInstance.setTeam(Team.RED);
-					break;
-				}
-			}
-		}
-		else
-		{
-			_playerInstance.setTeam(Team.NONE);
-		}
-		
-		_playerInstance.setCurrentCp(_playerInstance.getMaxCp());
-		_playerInstance.setCurrentHp(_playerInstance.getMaxHp());
-		_playerInstance.setCurrentMp(_playerInstance.getMaxMp());
-		
-		_playerInstance.broadcastStatusUpdate();
-		_playerInstance.broadcastUserInfo();
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTManager.java
deleted file mode 100644
index 56ab43c0e8..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events/TvTManager.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.util.Calendar;
-import java.util.concurrent.ScheduledFuture;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.gameserver.util.Broadcast;
-
-/**
- * @author HorridoJoho
- */
-public class TvTManager
-{
-	protected static final Logger LOGGER = Logger.getLogger(TvTManager.class.getName());
-	
-	/**
-	 * Task for event cycles
-	 */
-	private TvTStartTask _task;
-	
-	/**
-	 * New instance only by getInstance()
-	 */
-	protected TvTManager()
-	{
-		if (Config.TVT_EVENT_ENABLED)
-		{
-			TvTEvent.init();
-			
-			scheduleEventStart();
-			LOGGER.info("TvTEventEngine[TvTManager.TvTManager()]: Started.");
-		}
-		else
-		{
-			LOGGER.info("TvTEventEngine[TvTManager.TvTManager()]: Engine is disabled.");
-		}
-	}
-	
-	/**
-	 * Initialize new/Returns the one and only instance
-	 * @return TvTManager
-	 */
-	public static TvTManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	/**
-	 * Starts TvTStartTask
-	 */
-	public void scheduleEventStart()
-	{
-		try
-		{
-			final Calendar currentTime = Calendar.getInstance();
-			Calendar nextStartTime = null;
-			Calendar testStartTime = null;
-			for (String timeOfDay : Config.TVT_EVENT_INTERVAL)
-			{
-				// Creating a Calendar object from the specified interval value
-				testStartTime = Calendar.getInstance();
-				testStartTime.setLenient(true);
-				final String[] splitTimeOfDay = timeOfDay.split(":");
-				testStartTime.set(Calendar.HOUR_OF_DAY, Integer.parseInt(splitTimeOfDay[0]));
-				testStartTime.set(Calendar.MINUTE, Integer.parseInt(splitTimeOfDay[1]));
-				// If the date is in the past, make it the next day (Example: Checking for "1:00", when the time is 23:57.)
-				if (testStartTime.getTimeInMillis() < currentTime.getTimeInMillis())
-				{
-					testStartTime.add(Calendar.DAY_OF_MONTH, 1);
-				}
-				// Check for the test date to be the minimum (smallest in the specified list)
-				if ((nextStartTime == null) || (testStartTime.getTimeInMillis() < nextStartTime.getTimeInMillis()))
-				{
-					nextStartTime = testStartTime;
-				}
-			}
-			if (nextStartTime != null)
-			{
-				_task = new TvTStartTask(nextStartTime.getTimeInMillis());
-				ThreadPool.execute(_task);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("TvTEventEngine[TvTManager.scheduleEventStart()]: Error figuring out a start time. Check TvTEventInterval in config file.");
-		}
-	}
-	
-	/**
-	 * Method to start participation
-	 */
-	public void startReg()
-	{
-		if (!TvTEvent.startParticipation())
-		{
-			Broadcast.toAllOnlinePlayers("TvT Event: Event was cancelled.");
-			LOGGER.warning("TvTEventEngine[TvTManager.run()]: Error spawning event npc for participation.");
-			scheduleEventStart();
-		}
-		else
-		{
-			Broadcast.toAllOnlinePlayers("TvT Event: Registration opened for " + Config.TVT_EVENT_PARTICIPATION_TIME + " minute(s).");
-			
-			// schedule registration end
-			_task.setStartTime(Chronos.currentTimeMillis() + (60000 * Config.TVT_EVENT_PARTICIPATION_TIME));
-			ThreadPool.execute(_task);
-		}
-	}
-	
-	/**
-	 * Method to start the fight
-	 */
-	public void startEvent()
-	{
-		if (!TvTEvent.startFight())
-		{
-			Broadcast.toAllOnlinePlayers("TvT Event: Event cancelled due to lack of Participation.");
-			LOGGER.info("TvTEventEngine[TvTManager.run()]: Lack of registration, abort event.");
-			scheduleEventStart();
-		}
-		else
-		{
-			TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting participants to an arena in " + Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY + " second(s).");
-			_task.setStartTime(Chronos.currentTimeMillis() + (60000 * Config.TVT_EVENT_RUNNING_TIME));
-			ThreadPool.execute(_task);
-		}
-	}
-	
-	/**
-	 * Method to end the event and reward
-	 */
-	public void endEvent()
-	{
-		Broadcast.toAllOnlinePlayers(TvTEvent.calculateRewards());
-		TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting back to the registration npc in " + Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY + " second(s).");
-		TvTEvent.stopFight();
-		
-		scheduleEventStart();
-	}
-	
-	public void skipDelay()
-	{
-		if (_task.nextRun.cancel(false))
-		{
-			_task.setStartTime(Chronos.currentTimeMillis());
-			ThreadPool.execute(_task);
-		}
-	}
-	
-	/**
-	 * Class for TvT cycles
-	 */
-	class TvTStartTask implements Runnable
-	{
-		private long _startTime;
-		public ScheduledFuture<?> nextRun;
-		
-		public TvTStartTask(long startTime)
-		{
-			_startTime = startTime;
-		}
-		
-		public void setStartTime(long startTime)
-		{
-			_startTime = startTime;
-		}
-		
-		@Override
-		public void run()
-		{
-			final int delay = (int) Math.round((_startTime - Chronos.currentTimeMillis()) / 1000.0);
-			if (delay > 0)
-			{
-				announce(delay);
-			}
-			
-			int nextMsg = 0;
-			if (delay > 3600)
-			{
-				nextMsg = delay - 3600;
-			}
-			else if (delay > 1800)
-			{
-				nextMsg = delay - 1800;
-			}
-			else if (delay > 900)
-			{
-				nextMsg = delay - 900;
-			}
-			else if (delay > 600)
-			{
-				nextMsg = delay - 600;
-			}
-			else if (delay > 300)
-			{
-				nextMsg = delay - 300;
-			}
-			else if (delay > 60)
-			{
-				nextMsg = delay - 60;
-			}
-			else if (delay > 5)
-			{
-				nextMsg = delay - 5;
-			}
-			else if (delay > 0)
-			{
-				nextMsg = delay;
-			}
-			// start
-			else if (TvTEvent.isInactive())
-			{
-				startReg();
-			}
-			else if (TvTEvent.isParticipating())
-			{
-				startEvent();
-			}
-			else
-			{
-				endEvent();
-			}
-			
-			if (delay > 0)
-			{
-				nextRun = ThreadPool.schedule(this, nextMsg * 1000);
-			}
-		}
-		
-		private void announce(long time)
-		{
-			if ((time >= 3600) && ((time % 3600) == 0))
-			{
-				if (TvTEvent.isParticipating())
-				{
-					Broadcast.toAllOnlinePlayers("TvT Event: " + (time / 60 / 60) + " hour(s) until registration is closed!");
-				}
-				else if (TvTEvent.isStarted())
-				{
-					TvTEvent.sysMsgToAllParticipants("TvT Event: " + (time / 60 / 60) + " hour(s) until event is finished!");
-				}
-			}
-			else if (time >= 60)
-			{
-				if (TvTEvent.isParticipating())
-				{
-					Broadcast.toAllOnlinePlayers("TvT Event: " + (time / 60) + " minute(s) until registration is closed!");
-				}
-				else if (TvTEvent.isStarted())
-				{
-					TvTEvent.sysMsgToAllParticipants("TvT Event: " + (time / 60) + " minute(s) until the event is finished!");
-				}
-			}
-			else if (TvTEvent.isParticipating())
-			{
-				Broadcast.toAllOnlinePlayers("TvT Event: " + time + " second(s) until registration is closed!");
-			}
-			else if (TvTEvent.isStarted())
-			{
-				TvTEvent.sysMsgToAllParticipants("TvT Event: " + time + " second(s) until the event is finished!");
-			}
-		}
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final TvTManager INSTANCE = new TvTManager();
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3894517ade..85c1406342 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -258,11 +258,6 @@ public class Attackable extends Npc
 			}
 		}
 		
-		if (isEventMob())
-		{
-			return;
-		}
-		
 		// Add damage and hate to the attacker AggroInfo of the Attackable _aggroList
 		if (attacker != null)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1f8ebe572a..36f86ef0c9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -4788,7 +4788,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a PlayerInstance)
-		if ((target == null) || isAlikeDead() || (isNpc() && ((Npc) this).isEventMob()))
+		if ((target == null) || isAlikeDead())
 		{
 			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
 			return;
@@ -6526,7 +6526,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * Dummy method overriden in {@link PlayerInstance}
 	 * @return {@code true} if player is on event, {@code false} otherwise.
 	 */
-	public boolean isOnEvent()
+	public boolean isOnCustomEvent()
 	{
 		return false;
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 9e37ec9fe8..439466e28b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -129,7 +129,6 @@ public class Npc extends Creature
 	private int _castleIndex = -2;
 	/** The fortress index in the array of Fort this NpcInstance belongs to */
 	private int _fortIndex = -2;
-	private boolean _eventMob = false;
 	private boolean _isInTown = false;
 	/** True if this Npc is autoattackable **/
 	private boolean _isAutoAttackable = false;
@@ -410,16 +409,6 @@ public class Npc extends Creature
 		});
 	}
 	
-	public boolean isEventMob()
-	{
-		return _eventMob;
-	}
-	
-	public void setEventMob(boolean value)
-	{
-		_eventMob = value;
-	}
-	
 	@Override
 	public boolean isAutoAttackable(Creature attacker)
 	{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 8fed320f50..984abb18b6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -1181,4 +1181,10 @@ public abstract class Summon extends Playable
 		}
 		return formId;
 	}
+	
+	@Override
+	public boolean isOnCustomEvent()
+	{
+		return (_owner != null) && _owner.isOnCustomEvent();
+	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
index 78d0b63525..81a64bbf01 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
@@ -28,8 +28,6 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.instancemanager.DuelManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEventTeam;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Attackable;
@@ -287,14 +285,13 @@ public class CubicInstance implements IIdentifiable
 			{
 				return;
 			}
-			// TvT event targeting
-			if (TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_owner.getObjectId()))
+			// Custom event targeting
+			if (_owner.isOnCustomEvent())
 			{
-				final TvTEventTeam enemyTeam = TvTEvent.getParticipantEnemyTeam(_owner.getObjectId());
 				if (ownerTarget.getActingPlayer() != null)
 				{
 					final PlayerInstance target = ownerTarget.getActingPlayer();
-					if (enemyTeam.containsPlayer(target.getObjectId()) && !(target.isDead()))
+					if ((_owner.getTeam() != target.getTeam()) && !(target.isDead()))
 					{
 						_target = (Creature) ownerTarget;
 					}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index dc507615a9..3bff488e0f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -80,7 +80,7 @@ public class MonsterInstance extends Attackable
 			return false;
 		}
 		
-		return super.isAutoAttackable(attacker) && !isEventMob();
+		return super.isAutoAttackable(attacker);
 	}
 	
 	/**
@@ -89,7 +89,7 @@ public class MonsterInstance extends Attackable
 	@Override
 	public boolean isAggressive()
 	{
-		return getTemplate().isAggressive() && !isEventMob() && !isAffected(EffectFlag.PASSIVE);
+		return getTemplate().isAggressive() && !isAffected(EffectFlag.PASSIVE);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 00bdc3d24c..1a9e0b68f7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -117,8 +117,6 @@ import org.l2jmobius.gameserver.instancemanager.RecipeManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.AccessLevel;
 import org.l2jmobius.gameserver.model.ArenaParticipantsHolder;
 import org.l2jmobius.gameserver.model.BlockList;
@@ -200,7 +198,6 @@ import org.l2jmobius.gameserver.model.fishing.Fishing;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.holders.MovieHolder;
-import org.l2jmobius.gameserver.model.holders.PlayerEventHolder;
 import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillUseHolder;
@@ -719,7 +716,8 @@ public class PlayerInstance extends Playable
 	public ReentrantLock soulShotLock = new ReentrantLock();
 	
 	/** Event parameters */
-	private PlayerEventHolder eventStatus = null;
+	private boolean _isRegisteredOnCustomEvent = false;
+	private boolean _isOnCustomEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
 	
@@ -2954,11 +2952,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void standUp()
 	{
-		if (GameEvent.isParticipant(this) && eventStatus.isSitForced())
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-		}
-		else if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
+		if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
 		{
 			if (getEffectList().isAffected(EffectFlag.RELAXING))
 			{
@@ -5151,11 +5145,6 @@ public class PlayerInstance extends Playable
 				if (pk != null)
 				{
 					EventDispatcher.getInstance().notifyEventAsync(new OnPlayerPvPKill(pk, this), this);
-					TvTEvent.onKill(killer, this);
-					if (GameEvent.isParticipant(pk))
-					{
-						pk.getEventStatus().getKills().add(this);
-					}
 					
 					// pvp/pk item rewards
 					if (!(Config.DISABLE_REWARDS_IN_INSTANCES && (getInstanceId() != 0)) && //
@@ -5329,7 +5318,7 @@ public class PlayerInstance extends Playable
 	
 	private void onDieDropItem(Creature killer)
 	{
-		if (GameEvent.isParticipant(this) || (killer == null))
+		if (isOnCustomEvent() || (killer == null))
 		{
 			return;
 		}
@@ -5697,7 +5686,7 @@ public class PlayerInstance extends Playable
 		
 		// Calculate the Experience loss
 		long lostExp = 0;
-		if (!GameEvent.isParticipant(this))
+		if (!isOnCustomEvent())
 		{
 			if (lvl < ExperienceData.getInstance().getMaxLevel())
 			{
@@ -8348,14 +8337,9 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isBlockedFromExit())
+		if (isRegisteredOnCustomEvent())
 		{
-			return false;
-		}
-		
-		if (GameEvent.isParticipant(this))
-		{
-			sendMessage("A superior power doesn't allow you to leave the event.");
+			sendMessage("A superior power doesn't allow you to leave.");
 			return false;
 		}
 		
@@ -8435,8 +8419,8 @@ public class PlayerInstance extends Playable
 			return _inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId());
 		}
 		
-		// Check if the attacker is in TvT and TvT is started
-		if (isOnEvent())
+		// Check if the attacker is in an event
+		if (isOnCustomEvent())
 		{
 			return true;
 		}
@@ -10867,8 +10851,6 @@ public class PlayerInstance extends Playable
 			_summon.updateAndBroadcastStatus(0);
 		}
 		
-		TvTEvent.onTeleported(this);
-		
 		// show movie if available
 		if (_movieHolder != null)
 		{
@@ -11511,16 +11493,6 @@ public class PlayerInstance extends Playable
 			LOGGER.log(Level.SEVERE, "deleteMe()", e);
 		}
 		
-		// TvT Event removal
-		try
-		{
-			TvTEvent.onLogout(this);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.SEVERE, "deleteMe()", e);
-		}
-		
 		// Update database with items in its inventory and remove them from the world
 		try
 		{
@@ -11591,12 +11563,6 @@ public class PlayerInstance extends Playable
 			player.removeSnooped(this);
 		}
 		
-		// we store all data from players who are disconnected while in an event in order to restore it in the next login
-		if (GameEvent.isParticipant(this))
-		{
-			GameEvent.savePlayerEventStatus(this);
-		}
-		
 		try
 		{
 			notifyFriends();
@@ -12398,7 +12364,7 @@ public class PlayerInstance extends Playable
 			return;
 		}
 		
-		if (isResurrectSpecialAffected() || isLucky() || isBlockedFromDeathPenalty() || isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE) || canOverrideCond(PlayerCondOverride.DEATH_PENALTY))
+		if (isResurrectSpecialAffected() || isLucky() || isOnCustomEvent() || isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE) || canOverrideCond(PlayerCondOverride.DEATH_PENALTY))
 		{
 			return;
 		}
@@ -13948,21 +13914,6 @@ public class PlayerInstance extends Playable
 		return _contactList;
 	}
 	
-	public void setEventStatus()
-	{
-		eventStatus = new PlayerEventHolder(this);
-	}
-	
-	public void setEventStatus(PlayerEventHolder pes)
-	{
-		eventStatus = pes;
-	}
-	
-	public PlayerEventHolder getEventStatus()
-	{
-		return eventStatus;
-	}
-	
 	public long getNotMoveUntil()
 	{
 		return _notMoveUntil;
@@ -14040,13 +13991,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean canRevive()
 	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent() && !listener.canRevive())
-			{
-				return false;
-			}
-		}
 		return _canRevive;
 	}
 	
@@ -14060,44 +14004,25 @@ public class PlayerInstance extends Playable
 		_canRevive = value;
 	}
 	
-	/**
-	 * @return {@code true} if player is on event, {@code false} otherwise.
-	 */
+	public boolean isRegisteredOnCustomEvent()
+	{
+		return _isRegisteredOnCustomEvent || _isOnCustomEvent;
+	}
+	
+	public void setRegisteredOnCustomEvent(boolean value)
+	{
+		_isRegisteredOnCustomEvent = value;
+	}
+	
 	@Override
-	public boolean isOnEvent()
+	public boolean isOnCustomEvent()
 	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent())
-			{
-				return true;
-			}
-		}
-		return super.isOnEvent();
+		return _isOnCustomEvent;
 	}
 	
-	public boolean isBlockedFromExit()
+	public void setOnCustomEvent(boolean value)
 	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent() && listener.isBlockingExit())
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public boolean isBlockedFromDeathPenalty()
-	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent() && listener.isBlockingDeathPenalty())
-			{
-				return true;
-			}
-		}
-		return false;
+		_isOnCustomEvent = value;
 	}
 	
 	public void setOriginalCpHpMp(double cp, double hp, double mp)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
index 5651fb9d90..4466642299 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.conditions;
 
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
@@ -55,7 +54,7 @@ public class ConditionPlayerCallPc extends Condition
 		{
 			canCallPlayer = false;
 		}
-		else if (!TvTEvent.onEscapeUse(player.getObjectId()))
+		else if (player.isOnCustomEvent())
 		{
 			player.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
 			canCallPlayer = false;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
index 27ddc09857..ce63ac33ea 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
@@ -17,7 +17,6 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -46,7 +45,7 @@ public class ConditionPlayerCanEscape extends Condition
 		{
 			canTeleport = false;
 		}
-		else if (!TvTEvent.onEscapeUse(player.getObjectId()))
+		else if (player.isOnCustomEvent())
 		{
 			canTeleport = false;
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTvTEvent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTvTEvent.java
deleted file mode 100644
index d397d98bd1..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTvTEvent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.conditions;
-
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.items.Item;
-import org.l2jmobius.gameserver.model.skills.Skill;
-
-/**
- * The Class ConditionPlayerTvTEvent.
- */
-public class ConditionPlayerTvTEvent extends Condition
-{
-	private final boolean _value;
-	
-	/**
-	 * Instantiates a new condition player tv t event.
-	 * @param value the value
-	 */
-	public ConditionPlayerTvTEvent(boolean value)
-	{
-		_value = value;
-	}
-	
-	@Override
-	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
-	{
-		final PlayerInstance player = effector.getActingPlayer();
-		return (player == null) || !TvTEvent.isStarted() ? !_value : TvTEvent.isPlayerParticipant(player.getObjectId()) == _value;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventType.java
index 3365486be6..90a3c25a69 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventType.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventType.java
@@ -90,10 +90,6 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPl
 import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemTransfer;
 import org.l2jmobius.gameserver.model.events.impl.creature.trap.OnTrapAction;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventFinish;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventKill;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventRegistrationStart;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventStart;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
@@ -219,13 +215,7 @@ public enum EventType
 	ON_PLAYER_TRANSFORM(OnPlayerTransform.class, void.class),
 	
 	// Trap events
-	ON_TRAP_ACTION(OnTrapAction.class, void.class),
-	
-	// TvT events.
-	ON_TVT_EVENT_FINISH(OnTvTEventFinish.class, void.class),
-	ON_TVT_EVENT_KILL(OnTvTEventKill.class, void.class),
-	ON_TVT_EVENT_REGISTRATION_START(OnTvTEventRegistrationStart.class, void.class),
-	ON_TVT_EVENT_START(OnTvTEventStart.class, void.class);
+	ON_TRAP_ACTION(OnTrapAction.class, void.class);
 	
 	private final Class<? extends IBaseEvent> _eventClass;
 	private final Class<?>[] _returnClass;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventFinish.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventFinish.java
deleted file mode 100644
index b20449db18..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventFinish.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventFinish implements IBaseEvent
-{
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_FINISH;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventKill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventKill.java
deleted file mode 100644
index 7e6d994779..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventKill.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.instancemanager.events.TvTEventTeam;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventKill implements IBaseEvent
-{
-	private final PlayerInstance _killer;
-	private final PlayerInstance _victim;
-	private final TvTEventTeam _killerTeam;
-	
-	public OnTvTEventKill(PlayerInstance killer, PlayerInstance victim, TvTEventTeam killerTeam)
-	{
-		_killer = killer;
-		_victim = victim;
-		_killerTeam = killerTeam;
-	}
-	
-	public PlayerInstance getKiller()
-	{
-		return _killer;
-	}
-	
-	public PlayerInstance getVictim()
-	{
-		return _victim;
-	}
-	
-	public TvTEventTeam getKillerTeam()
-	{
-		return _killerTeam;
-	}
-	
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_KILL;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventRegistrationStart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventRegistrationStart.java
deleted file mode 100644
index 383858cd5a..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventRegistrationStart.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventRegistrationStart implements IBaseEvent
-{
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_REGISTRATION_START;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventStart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventStart.java
deleted file mode 100644
index 7f9293c91e..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventStart.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventStart implements IBaseEvent
-{
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_START;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PlayerEventHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PlayerEventHolder.java
deleted file mode 100644
index 08b5881876..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PlayerEventHolder.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.holders;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.l2jmobius.gameserver.data.sql.ClanTable;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-/**
- * Player event holder, meant for restoring player after event has finished.<br>
- * Allows you to restore following information about player:
- * <ul>
- * <li>Name</li>
- * <li>Title</li>
- * <li>Clan</li>
- * <li>Location</li>
- * <li>PvP Kills</li>
- * <li>PK Kills</li>
- * <li>Karma</li>
- * </ul>
- * @author Nik, xban1x
- */
-public class PlayerEventHolder
-{
-	private final PlayerInstance _player;
-	private final String _name;
-	private final String _title;
-	private final int _clanId;
-	private final Location _loc;
-	private final int _pvpKills;
-	private final int _pkKills;
-	private final int _karma;
-	
-	private final Collection<PlayerInstance> _kills = ConcurrentHashMap.newKeySet();
-	private boolean _sitForced;
-	
-	public PlayerEventHolder(PlayerInstance player)
-	{
-		this(player, false);
-	}
-	
-	public PlayerEventHolder(PlayerInstance player, boolean sitForced)
-	{
-		_player = player;
-		_name = player.getName();
-		_title = player.getTitle();
-		_clanId = player.getClanId();
-		_loc = new Location(player);
-		_pvpKills = player.getPvpKills();
-		_pkKills = player.getPkKills();
-		_karma = player.getKarma();
-		_sitForced = sitForced;
-	}
-	
-	public void restorePlayerStats()
-	{
-		_player.setName(_name);
-		_player.setTitle(_title);
-		_player.setClan(ClanTable.getInstance().getClan(_clanId));
-		_player.teleToLocation(_loc, true);
-		_player.setPvpKills(_pvpKills);
-		_player.setPkKills(_pkKills);
-		_player.setKarma(_karma);
-	}
-	
-	public void setSitForced(boolean sitForced)
-	{
-		_sitForced = sitForced;
-	}
-	
-	public boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	public Collection<PlayerInstance> getKills()
-	{
-		return _kills;
-	}
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index b0f5be3c56..862b2a3ee2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -878,7 +878,7 @@ public class Instance
 	 */
 	public void notifyDeath(PlayerInstance player)
 	{
-		if (!player.isOnEvent() && (_ejectTime > 0))
+		if (!player.isOnCustomEvent() && (_ejectTime > 0))
 		{
 			// Proper system message doesn't exist in epilogue client.
 			player.sendMessage("If you are not resurrected within " + (_ejectTime / 1000 / 60) + " minutes, you will be expelled from the instance zone.");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java
index ebe37243d3..c286b07fbe 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java
@@ -23,11 +23,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  */
 public interface IEventListener
 {
-	/**
-	 * @return {@code true} if player is on event, {@code false} otherwise.
-	 */
-	boolean isOnEvent();
-	
 	/**
 	 * @return {@code true} if player is blocked from leaving the game, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
index d7f8e2082f..d0568a55d5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -581,9 +581,9 @@ public class Olympiad extends ListenersContainer
 			noble.sendPacket(sm);
 			return false;
 		}
-		if (noble.isOnEvent())
+		if (noble.isRegisteredOnCustomEvent())
 		{
-			noble.sendMessage("You can't join olympiad while participating on Events.");
+			noble.sendMessage("You can't join olympiad while participating on events.");
 			return false;
 		}
 		/** End Olympiad Restrictions */
@@ -1171,9 +1171,9 @@ public class Olympiad extends ListenersContainer
 			spectator.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_GRAND_OLYMPIAD_GAMES_MATCH_WHILE_YOU_ARE_ON_THE_WAITING_LIST));
 			return;
 		}
-		if (spectator.isOnEvent())
+		if (spectator.isRegisteredOnCustomEvent())
 		{
-			spectator.sendMessage("You can not observe games while registered for Events");
+			spectator.sendMessage("You can not observe games while registered on events.");
 			return;
 		}
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java
index bcef85664b..28a9f1aa14 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
 import org.l2jmobius.gameserver.handler.TargetHandler;
 import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.ArenaParticipantsHolder;
 import org.l2jmobius.gameserver.model.ExtractableProductItem;
 import org.l2jmobius.gameserver.model.ExtractableSkill;
@@ -1123,7 +1122,7 @@ public class Skill implements IIdentifiable
 					}
 				}
 				
-				if (!TvTEvent.checkForTvTSkill(player, targetPlayer, skill))
+				if (player.isOnCustomEvent() && targetPlayer.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index effa908afb..1ab2f9c1ee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -47,8 +47,6 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
 import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.Couple;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
 import org.l2jmobius.gameserver.model.World;
@@ -429,11 +427,6 @@ public class EnterWorld implements IClientIncomingPacket
 		// player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
 		player.getInventory().applyItemSkills();
 		
-		if (GameEvent.isParticipant(player))
-		{
-			GameEvent.restorePlayerEventStatus(player);
-		}
-		
 		// Wedding Checks
 		if (Config.ALLOW_WEDDING)
 		{
@@ -574,8 +567,6 @@ public class EnterWorld implements IClientIncomingPacket
 			client.sendPacket(ExNoticePostArrived.valueOf(false));
 		}
 		
-		TvTEvent.onLogin(player);
-		
 		if (Config.WELCOME_MESSAGE_ENABLED)
 		{
 			player.sendPacket(new ExShowScreenMessage(Config.WELCOME_MESSAGE_TEXT, Config.WELCOME_MESSAGE_TIME));
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index b4b17cb23a..bfb6d97535 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -110,13 +110,6 @@ public class RequestRestart implements IClientIncomingPacket
 			}
 		}
 		
-		if (player.isBlockedFromExit())
-		{
-			client.sendPacket(RestartResponse.valueOf(false));
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
 		if (!player.canLogout())
 		{
 			client.sendPacket(RestartResponse.valueOf(false));
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
index c2a226df96..2b076382bb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
@@ -24,11 +24,13 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
+import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance;
+import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.residences.ClanHall;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
@@ -90,6 +92,19 @@ public class RequestRestartPoint implements IClientIncomingPacket
 			return;
 		}
 		
+		// Custom event resurrection management.
+		if (player.isOnCustomEvent())
+		{
+			// This is an example, replace EventScriptName with proper event script name.
+			final Quest eventScript = QuestManager.getInstance().getQuest("EventScriptName");
+			if (eventScript != null)
+			{
+				// Notify onAdvEvent ResurrectPlayer event.
+				eventScript.notifyEvent("ResurrectPlayer", null, player);
+				return;
+			}
+		}
+		
 		final Castle castle = CastleManager.getInstance().getCastle(player.getX(), player.getY(), player.getZ());
 		if ((castle != null) && castle.getSiege().isInProgress() && (player.getClan() != null) && castle.getSiege().checkIsAttacker(player.getClan()))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
index 186ddd56a2..9becc499ef 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -68,7 +68,7 @@ public class Die implements IClientOutgoingPacket
 		
 		if (_creature.isPlayer())
 		{
-			if (!Olympiad.getInstance().isRegistered(_creature.getActingPlayer()) && !_creature.isOnEvent())
+			if (!Olympiad.getInstance().isRegistered(_creature.getActingPlayer()) && !_creature.getActingPlayer().isOnCustomEvent())
 			{
 				_staticRes = _creature.getInventory().haveItemForSelfResurrection();
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java
index ff68e85984..9e475541c1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java
@@ -98,7 +98,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionPlayerSouls;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerState;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerSubclass;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerTransformationId;
-import org.l2jmobius.gameserver.model.conditions.ConditionPlayerTvTEvent;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerVehicleMounted;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerWeight;
 import org.l2jmobius.gameserver.model.conditions.ConditionSiegeZone;
@@ -651,12 +650,6 @@ public abstract class DocumentBase
 					cond = joinAnd(cond, new ConditionPlayerIsClanLeader(val));
 					break;
 				}
-				case "ontvtevent":
-				{
-					final boolean val = Boolean.parseBoolean(a.getNodeValue());
-					cond = joinAnd(cond, new ConditionPlayerTvTEvent(val));
-					break;
-				}
 				case "pledgeclass":
 				{
 					final int pledgeClass = Integer.decode(getValue(a.getNodeValue(), null));
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
index dde6216290..31b3eab0e0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
@@ -48,7 +48,7 @@ public class OfflineTradeUtil
 	 */
 	private static boolean offlineMode(PlayerInstance player)
 	{
-		if ((player == null) || player.isInOlympiadMode() || player.isBlockedFromExit() || player.isJailed() || (player.getVehicle() != null))
+		if ((player == null) || player.isInOlympiadMode() || player.isRegisteredOnCustomEvent() || player.isJailed() || (player.getVehicle() != null))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml
index 13e7f217e1..56d9d3e280 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml
@@ -216,32 +216,6 @@
 	<admin command="admin_setbe" accessLevel="100" />
 	<admin command="admin_enchant" accessLevel="100" />
 
-	<!-- ADMIN EVENT ENGINE -->
-	<admin command="admin_event" accessLevel="100" />
-	<admin command="admin_event_new" accessLevel="100" />
-	<admin command="admin_event_choose" accessLevel="100" />
-	<admin command="admin_event_store" accessLevel="100" />
-	<admin command="admin_event_set" accessLevel="100" />
-	<admin command="admin_event_change_teams_number" accessLevel="100" />
-	<admin command="admin_event_announce" accessLevel="100" />
-	<admin command="admin_event_panel" accessLevel="100" />
-	<admin command="admin_event_control_begin" accessLevel="100" />
-	<admin command="admin_event_control_teleport" accessLevel="100" />
-	<admin command="admin_add" accessLevel="100" />
-	<admin command="admin_event_see" accessLevel="100" />
-	<admin command="admin_event_del" accessLevel="100" />
-	<admin command="admin_delete_buffer" accessLevel="100" />
-	<admin command="admin_event_control_sit" accessLevel="100" />
-	<admin command="admin_event_name" accessLevel="100" />
-	<admin command="admin_event_control_kill" accessLevel="100" />
-	<admin command="admin_event_control_res" accessLevel="100" />
-	<admin command="admin_event_control_transform" accessLevel="100" />
-	<admin command="admin_event_control_untransform" accessLevel="100" />
-	<admin command="admin_event_control_prize" accessLevel="100" />
-	<admin command="admin_event_control_chatban" accessLevel="100" />
-	<admin command="admin_event_control_kick" accessLevel="100" />
-	<admin command="admin_event_control_finish" accessLevel="100" />
-
 	<!-- ADMIN EVENTS -->
 	<admin command="admin_event_menu" accessLevel="100" />
 	<admin command="admin_event_start" accessLevel="100" />
@@ -584,11 +558,6 @@
 	<admin command="admin_stats" accessLevel="100" />
 	<admin command="admin_skill_test" accessLevel="100" />
 
-	<!-- ADMIN TVT EVENT -->
-	<admin command="admin_tvt_add" accessLevel="100" />
-	<admin command="admin_tvt_remove" accessLevel="100" />
-	<admin command="admin_tvt_advance" accessLevel="100" />
-
 	<!-- ADMIN VITALITY -->
 	<admin command="admin_set_vitality" accessLevel="100" />
 	<admin command="admin_set_vitality_level" accessLevel="100" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/TeamVersusTeam.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/TeamVersusTeam.ini
deleted file mode 100644
index eef2428b89..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/TeamVersusTeam.ini
+++ /dev/null
@@ -1,116 +0,0 @@
-# ---------------------------------------------------------------------------
-# Team vs. Team Event Engine (by HorridoJoho)
-# ---------------------------------------------------------------------------
-
-# <u><b><font color="red">WARNING: this mod require custom NPC table support turned on !</font></b></u>
-# CustomNpcTable = True in General.properties
-# ---------------------------------------------------------------------------
-# Enable/Disable TvTEvent System
-# Default: False
-TvTEventEnabled = False
-
-# TvT in instance
-# Default: False
-TvTEventInInstance = False
-
-# Id of the instance template for TvT
-# Default: 3049 (coliseum.xml)
-TvTEventInstanceId = 3049
-
-# Times TvT will occur (24h format).
-# Default: 9:00,15:00,21:00,3:00
-TvTEventInterval = 9:00,15:00,21:00,3:00
-
-# Registration timer from start of event (in minutes).
-# Default: 30
-TvTEventParticipationTime = 30
-
-# Event running time (in minutes).
-# Default: 20
-TvTEventRunningTime = 20
-
-# TvT Event NPC (create a custom npc of type L2TvTEventNpc).
-# Default: 70010
-TvTEventParticipationNpcId = 70010
-
-# TvT Event Participation Fee (itemId, number). Fee is not returned.
-# Example: 57,100000
-# Default: 0,0
-TvTEventParticipationFee = 0,0
-
-# Location for TvTEvent NPC to spawn in form x,y,z[,heading]
-# Default: 83425,148585,-3406
-TvTEventParticipationNpcCoordinates = 83425,148585,-3406
-
-# Minimum amount of players allowed in each team.
-# Default: 1
-TvTEventMinPlayersInTeams = 1
-# Maximum amount of players allowed in each team.
-# Default: 20
-TvTEventMaxPlayersInTeams = 20
-
-# Minimum level of players that may join the event.
-# Default: 1
-TvTEventMinPlayerLevel = 1
-# Maximum level of players that may join the event.
-# Default: 85
-TvTEventMaxPlayerLevel = 85
-
-# Respawn delay timer (in seconds).
-# Default: 10
-TvTEventRespawnTeleportDelay = 10
-# Exit delay timer (in seconds).
-# Default: 10
-TvTEventStartLeaveTeleportDelay = 10
-
-# First Team - Name, Start/Death x,y,z location.
-TvTEventTeam1Name = Team1
-TvTEventTeam1Coordinates = 148695,46725,-3414
-
-# Second Team - Name, Start/Death x,y,z location.
-TvTEventTeam2Name = Team2
-TvTEventTeam2Coordinates = 149999,46728,-3414
-
-# Reward for winning team.
-# Example: TvTEventReward = itemId,amount;itemId,amount;itemId,amount
-TvTEventReward = 57,100000
-
-# TvTEvent Rules
-TvTEventTargetTeamMembersAllowed = True
-TvTEventScrollsAllowed = False
-TvTEventPotionsAllowed = False
-TvTEventSummonByItemAllowed = False
-
-# Door ID's to open/close on start/end.
-# Not supported in instance, use xml template for defining doors.
-# Example: TvTDoorsToOpen = 1;2;3;4;5;6
-TvTDoorsToOpen = 
-TvTDoorsToClose = 
-
-# Should both teams get reward if there's a tie?
-TvTRewardTeamTie = False
-
-# Participant's effects handling on teleport/death.
-# Effects lasting through death never removed.
-# 0 - always remove all effects.
-# 1 - remove all effects only during port to event (noblesse blessing can be used)
-# 2 - never remove any effect
-# Default: 0
-TvTEventEffectsRemoval = 0
-
-# Fighter-class participants will be buffed with those buffs each respawn
-# Format: skill1Id,skill1Level;skill2Id,skill2Level...
-# Example: 1504,1;1501,1;1502,1;1499,1
-TvTEventFighterBuffs =
-
-# Mage-class participants will be buffed with those buffs each respawn
-# Format: skill1Id,skill1Level;skill2Id,skill2Level...
-# Example: 1504,1;1500,1;1501,1;1085,3
-TvTEventMageBuffs =
-
-# Maximum number of allowed participants per IP address (dualbox check)
-# Default: 0 (no limits)
-TvTEventMaxParticipantsPerIP = 0
-
-# Voiced command (.tvt) working during TVT event to get information about event status
-TvTAllowVoicedInfoCommand = false
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/help/l2jmod/tvt.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/help/l2jmod/tvt.htm
deleted file mode 100644
index 798f8dd795..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/help/l2jmod/tvt.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><title>Mods Help</title><body>
-<table width=260><tr>
-<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=180><center>Mod Help Page</center></td>
-<td width=40><button value="Back" action="bypass -h admin_admin5" width=40 height=15 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
-<font color="LEVEL"><table width=260><tr>
-<td width 90>GM commands page:</td><td><a action="bypass -h admin_html admhelp.htm">Index</a></td><td><a action="bypass -h admin_html help/gmcommands.htm">1</a></td><td><a action="bypass -h admin_html help/gmcommands2.htm">2</a></td><td><a action="bypass -h admin_html help/gmcommands3.htm">3</a></td>
-</tr></table></font>
-<br>
-<font color="FF9933">These are the available settings for this mod.</font><br>
-(When a parameter is required, it must be written in the quickbox without leading nor trailing spaces)<br1>
-Mandatory parameters will appear <font color="FF0000">&lt;ike this&gt;</font><br1>
-Optional parameters will appear <font color="00FF00">[like that]</font><br>
-<!-- Mod writers should change from here -->
-<font color="LEVEL">Enable</font> - Enable this mod<br>
-<font color="LEVEL">Interval</font> <font color="FF0000">&lt;minutes&gt;</font> - Time between events.<br>
-<font color="LEVEL">PartTime</font> <font color="FF0000">&lt;minutes&gt;</font> - Time allowed for application.<br>
-<font color="LEVEL">RunnTime</font> <font color="FF0000">&lt;minutes&gt;</font> - Event duration<br>
-<br>
-<font color="LEVEL">Disable</font> - Disable this mod.<br>
-<font color="LEVEL">EventNpc</font> <font color="FF0000">&lt;integer&gt;</font> - NpcId to be used as event manager.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/mods_menu.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/mods_menu.htm
index 3e96953b5d..6d4cb3ae09 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/mods_menu.htm
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/mods_menu.htm
@@ -57,20 +57,5 @@
 </tr>
 </table>
 <br>
-<font color="LEVEL">TvT EVENT MOD
-<a action="bypass -h admin_html help/l2jmod/tvt.htm">Help</a></font>
-<table width=240 border=0 bgcolor="666666">
-<tr>
-<td><button value="Enable" action="bypass -h admin_set_mod TvTEventEnabled=true" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Interval" action="bypass -h admin_set_mod TvTEventInterval=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="PartTime" action="bypass -h admin_set_mod TvTEventParticipationTime=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="RunnTime" action="bypass -h admin_set_mod TvTEventRunningTime=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td><button value="Disable" action="bypass -h admin_set_mod TvTEventEnabled=false" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="EventNpc" action="bypass -h admin_set_mod TvTEventParticipationNpcId=$qbox" width=60 height=20 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-</table>
-<br>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/mods/EventEngine/Participating.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/mods/EventEngine/Participating.htm
deleted file mode 100644
index 4724f31677..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/mods/EventEngine/Participating.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><body scroll="no">
-<table cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
-<tr><td valign="top" align="center">
-	<table width=96% cellpadding=0 cellspacing=0>
-		<tr><td height=30></td></tr>
-		<tr><td align=center><font color="LEVEL">%eventName%</font> by %eventCreator%</td></tr>
-		<tr><td height=20></td></tr>
-		<tr><td align=center>%eventInfo%</td></tr>
-		<tr><td height=34></td></tr>
-		<tr><td align=center><button value="Unregister" action="bypass -h npc_%objectId%_event_unregister" width=120 height=32 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
-		<tr><td height=34></td></tr>
-	</table>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/mods/EventEngine/Participation.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/mods/EventEngine/Participation.htm
deleted file mode 100644
index 93445c87d9..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/mods/EventEngine/Participation.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><body scroll="no">
-<table cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
-<tr><td valign="top" align="center">
-	<table width=96% cellpadding=0 cellspacing=0>
-		<tr><td height=30></td></tr>
-		<tr><td align=center><font color="LEVEL">%eventName%</font> by %eventCreator%</td></tr>
-		<tr><td height=20></td></tr>
-		<tr><td align=center>%eventInfo%</td></tr>
-		<tr><td height=34></td></tr>
-		<tr><td align=center><button value="Participate" action="bypass -h npc_%objectId%_event_participate" width=120 height=32 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
-		<tr><td height=34></td></tr>
-	</table>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/custom/coliseum.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/custom/coliseum.xml
deleted file mode 100644
index 36a1d93870..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/custom/coliseum.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<instance id="3049" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
-	<PvPInstance val="true" />
-	<doorlist>
-		<door id="24190001" />
-		<door id="24190002" />
-		<door id="24190003" />
-		<door id="24190004" />
-	</doorlist>
-</instance>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
index 1a60c7100f..acb63b1d0d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
@@ -95,7 +95,7 @@ public class Warpgate extends AbstractNpcAI
 		if (creature.isPlayer())
 		{
 			final PlayerInstance player = creature.getActingPlayer();
-			if (!canEnter(player) && !player.canOverrideCond(PlayerCondOverride.ZONE_CONDITIONS) && !player.isOnEvent())
+			if (!canEnter(player) && !player.canOverrideCond(PlayerCondOverride.ZONE_CONDITIONS) && !player.isOnCustomEvent())
 			{
 				startQuestTimer("TELEPORT", 1000, null, player);
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/CursedWeaponEquipped.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/CursedWeaponEquipped.html
deleted file mode 100644
index 77e95f28cb..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/CursedWeaponEquipped.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Cursed weapon holders are not allowed to participate.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/IPRestriction.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/IPRestriction.html
deleted file mode 100644
index 74d580f126..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/IPRestriction.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Maximum of %max% participant(s) per IP address is allowed.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Karma.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Karma.html
deleted file mode 100644
index 4ad6698e5b..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Karma.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Chaotic players are not allowed to participate.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Level.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Level.html
deleted file mode 100644
index 5d1e0d71a5..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Level.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Only players from level %min% to level %max% are allowed to participate.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Olympiad.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Olympiad.html
deleted file mode 100644
index b4829288c9..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Olympiad.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You can not participate while registered for Olympiad.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Participation.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Participation.html
deleted file mode 100644
index 65db8d24bc..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Participation.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Registration for TvT Event:<br>
-		<center>
-			%playercount% players in.<br>
-			Participation Fee: %fee%<br>
-			<button action="bypass -h Quest TvTManager join" value="Participate" width="200" height="31" back="L2UI_CT1.OlympiadWnd_DF_Apply_Down" fore="L2UI_CT1.OlympiadWnd_DF_Apply">
-		</center>
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/ParticipationFee.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/ParticipationFee.html
deleted file mode 100644
index 9aea7de607..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/ParticipationFee.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You need %fee% for participation.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Registered.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Registered.html
deleted file mode 100644
index f6eb819966..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Registered.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You are registered for a TvT Event.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/RemoveParticipation.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/RemoveParticipation.html
deleted file mode 100644
index 110efb0f54..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/RemoveParticipation.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-	<head>
-		</head><title>TvT Event</title>
-	</head>
-	<body>
-		Cancel registration for TvT Event:<br>
-		You are already registered for this event. Do you wish to cancel your participation in this Event?<br>
-		<center>
-			Participation fee is not returned!<br>
-			<button action="bypass -h Quest TvTManager remove" msg="1480" value="Cancel" width="200" height="31" back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back">
-		</center>
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Reward.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Reward.html
deleted file mode 100644
index be404a4c22..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Reward.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		<font color="LEVEL">Your team won the event!</font><br>
-		Look in your inventory, there should be your reward.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Status.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Status.html
deleted file mode 100644
index 9da25b6062..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Status.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		Status:<br>
-		<center>
-			%team1name% with %team1playercount% players and %team1points% points.<br>
-			%team2name% with %team2playercount% players and %team2points% points.
-		</center>
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TeamsFull.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TeamsFull.html
deleted file mode 100644
index 311707217f..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TeamsFull.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		The event is full! Only %max% players are allowed per team.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
deleted file mode 100644
index 3d4cb6e6ef..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package custom.events.TvT.TvTManager;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
-import org.l2jmobius.gameserver.handler.VoicedCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-
-import ai.AbstractNpcAI;
-
-/**
- * TvT Manager AI.
- * @author Zoey76
- */
-public class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler
-{
-	private static final int MANAGER_ID = 70010;
-	private static final String[] COMMANDS =
-	{
-		"tvt",
-		"tvtjoin",
-		"tvtleave"
-	};
-	
-	public TvTManager()
-	{
-		addFirstTalkId(MANAGER_ID);
-		addTalkId(MANAGER_ID);
-		addStartNpc(MANAGER_ID);
-		
-		if (Config.TVT_ALLOW_VOICED_COMMAND)
-		{
-			VoicedCommandHandler.getInstance().registerHandler(this);
-		}
-	}
-	
-	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
-	{
-		if ((player == null) || !TvTEvent.isParticipating())
-		{
-			return super.onAdvEvent(event, npc, player);
-		}
-		
-		String htmltext = null;
-		switch (event)
-		{
-			case "join":
-			{
-				final int playerLevel = player.getLevel();
-				final int team1Count = TvTEvent.getTeamsPlayerCounts()[0];
-				final int team2Count = TvTEvent.getTeamsPlayerCounts()[1];
-				if (player.isCursedWeaponEquipped())
-				{
-					htmltext = getHtm(player, "CursedWeaponEquipped.html");
-				}
-				else if (OlympiadManager.getInstance().isRegistered(player))
-				{
-					htmltext = getHtm(player, "Olympiad.html");
-				}
-				else if (player.getKarma() > 0)
-				{
-					htmltext = getHtm(player, "Karma.html");
-				}
-				else if ((playerLevel < Config.TVT_EVENT_MIN_LEVEL) || (playerLevel > Config.TVT_EVENT_MAX_LEVEL))
-				{
-					htmltext = getHtm(player, "Level.html");
-					htmltext = htmltext.replace("%min%", String.valueOf(Config.TVT_EVENT_MIN_LEVEL));
-					htmltext = htmltext.replace("%max%", String.valueOf(Config.TVT_EVENT_MAX_LEVEL));
-				}
-				else if ((team1Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS) && (team2Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS))
-				{
-					htmltext = getHtm(player, "TeamsFull.html");
-					htmltext = htmltext.replace("%max%", String.valueOf(Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS));
-				}
-				else if ((Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.TVT_ID, player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP))
-				{
-					htmltext = getHtm(player, "IPRestriction.html");
-					htmltext = htmltext.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP)));
-				}
-				else if (TvTEvent.needParticipationFee() && !TvTEvent.hasParticipationFee(player))
-				{
-					htmltext = getHtm(player, "ParticipationFee.html");
-					htmltext = htmltext.replace("%fee%", TvTEvent.getParticipationFee());
-				}
-				else if (TvTEvent.addParticipant(player))
-				{
-					htmltext = getHtm(player, "Registered.html");
-				}
-				break;
-			}
-			case "remove":
-			{
-				if (TvTEvent.removeParticipant(player.getObjectId()))
-				{
-					if (Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP > 0)
-					{
-						AntiFeedManager.getInstance().removePlayer(AntiFeedManager.TVT_ID, player);
-					}
-					htmltext = getHtm(player, "Unregistered.html");
-				}
-				else
-				{
-					player.sendMessage("You cannot unregister to this event.");
-				}
-				break;
-			}
-		}
-		return htmltext;
-	}
-	
-	@Override
-	public String onFirstTalk(Npc npc, PlayerInstance player)
-	{
-		String htmltext = null;
-		if (TvTEvent.isParticipating())
-		{
-			final boolean isParticipant = TvTEvent.isPlayerParticipant(player.getObjectId());
-			final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
-			htmltext = getHtm(player, (!isParticipant ? "Participation.html" : "RemoveParticipation.html"));
-			htmltext = htmltext.replace("%objectId%", String.valueOf(npc.getObjectId()));
-			htmltext = htmltext.replace("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
-			htmltext = htmltext.replace("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
-			htmltext = htmltext.replace("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
-			htmltext = htmltext.replace("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
-			htmltext = htmltext.replace("%playercount%", String.valueOf(teamsPlayerCounts[0] + teamsPlayerCounts[1]));
-			if (!isParticipant)
-			{
-				htmltext = htmltext.replace("%fee%", TvTEvent.getParticipationFee());
-			}
-		}
-		else if (TvTEvent.isStarting() || TvTEvent.isStarted())
-		{
-			htmltext = getTvTStatus(player);
-		}
-		return htmltext;
-	}
-	
-	@Override
-	public boolean useVoicedCommand(String command, PlayerInstance player, String params)
-	{
-		String html = null;
-		switch (command)
-		{
-			case "tvt":
-			{
-				if (TvTEvent.isStarting() || TvTEvent.isStarted())
-				{
-					html = getTvTStatus(player);
-				}
-				else
-				{
-					html = "The event has not started.";
-				}
-				break;
-			}
-			case "tvtjoin":
-			{
-				html = onAdvEvent("join", null, player);
-				break;
-			}
-			case "tvtleave":
-			{
-				html = onAdvEvent("remove", null, player);
-				break;
-			}
-		}
-		
-		if (html != null)
-		{
-			player.sendPacket(new NpcHtmlMessage(html));
-		}
-		return true;
-	}
-	
-	private String getTvTStatus(PlayerInstance player)
-	{
-		final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
-		final int[] teamsPointsCounts = TvTEvent.getTeamsPoints();
-		String htmltext = getHtm(player, "Status.html");
-		htmltext = htmltext.replace("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
-		htmltext = htmltext.replace("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
-		htmltext = htmltext.replace("%team1points%", String.valueOf(teamsPointsCounts[0]));
-		htmltext = htmltext.replace("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
-		htmltext = htmltext.replace("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
-		htmltext = htmltext.replace("%team2points%", String.valueOf(teamsPointsCounts[1]));
-		return htmltext;
-	}
-	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return COMMANDS;
-	}
-	
-	public static void main(String[] args)
-	{
-		new TvTManager();
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Unregistered.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Unregistered.html
deleted file mode 100644
index 0223caff93..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/Unregistered.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>TvT Event</title>
-	</head>
-	<body>
-		You have been unregistered from the TvT Event.
-	</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java
index 0fd49e5a15..6eb1634739 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java
@@ -72,7 +72,6 @@ import handlers.admincommandhandlers.AdminEditChar;
 import handlers.admincommandhandlers.AdminEffects;
 import handlers.admincommandhandlers.AdminElement;
 import handlers.admincommandhandlers.AdminEnchant;
-import handlers.admincommandhandlers.AdminEventEngine;
 import handlers.admincommandhandlers.AdminEvents;
 import handlers.admincommandhandlers.AdminExpSp;
 import handlers.admincommandhandlers.AdminFakePlayers;
@@ -130,7 +129,6 @@ import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTerritoryWar;
 import handlers.admincommandhandlers.AdminTest;
 import handlers.admincommandhandlers.AdminTransform;
-import handlers.admincommandhandlers.AdminTvTEvent;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
 import handlers.admincommandhandlers.AdminZones;
@@ -139,7 +137,6 @@ import handlers.bypasshandlers.Buy;
 import handlers.bypasshandlers.BuyShadowItem;
 import handlers.bypasshandlers.ChatLink;
 import handlers.bypasshandlers.ClanWarehouse;
-import handlers.bypasshandlers.EventEngine;
 import handlers.bypasshandlers.Festival;
 import handlers.bypasshandlers.FindPvP;
 import handlers.bypasshandlers.Freight;
@@ -371,7 +368,6 @@ public class MasterHandler
 			AdminEffects.class,
 			AdminElement.class,
 			AdminEnchant.class,
-			AdminEventEngine.class,
 			AdminEvents.class,
 			AdminExpSp.class,
 			AdminFakePlayers.class,
@@ -429,7 +425,6 @@ public class MasterHandler
 			AdminTerritoryWar.class,
 			AdminTest.class,
 			AdminTransform.class,
-			AdminTvTEvent.class,
 			AdminVitality.class,
 			AdminZone.class,
 		},
@@ -440,7 +435,6 @@ public class MasterHandler
 			BuyShadowItem.class,
 			ChatLink.class,
 			ClanWarehouse.class,
-			EventEngine.class,
 			Festival.class,
 			FindPvP.class,
 			Freight.class,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java
index 453ced23d8..beac3ccfdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java
@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.IActionHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
@@ -115,25 +114,19 @@ public class NpcAction implements IActionHandler
 					}
 					
 					// Open a chat window on client with the text of the Npc
-					if (npc.isEventMob())
+					if (npc.hasListener(EventType.ON_NPC_QUEST_START))
 					{
-						GameEvent.showEventHtml(player, String.valueOf(target.getObjectId()));
+						player.setLastQuestNpcObject(target.getObjectId());
+					}
+					if (npc.hasListener(EventType.ON_NPC_FIRST_TALK))
+					{
+						EventDispatcher.getInstance().notifyEventAsync(new OnNpcFirstTalk(npc, player), npc);
 					}
 					else
 					{
-						if (npc.hasListener(EventType.ON_NPC_QUEST_START))
-						{
-							player.setLastQuestNpcObject(target.getObjectId());
-						}
-						if (npc.hasListener(EventType.ON_NPC_FIRST_TALK))
-						{
-							EventDispatcher.getInstance().notifyEventAsync(new OnNpcFirstTalk(npc, player), npc);
-						}
-						else
-						{
-							npc.showChatWindow(player);
-						}
+						npc.showChatWindow(player);
 					}
+					
 					if (Config.PLAYER_MOVEMENT_BLOCK_TIME > 0)
 					{
 						player.updateNotMoveUntil();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java
index 7b5d34e705..a05efe7db2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java
@@ -21,7 +21,6 @@ import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.PrivateStoreType;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.IActionHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -51,12 +50,6 @@ public class PlayerInstanceAction implements IActionHandler
 	@Override
 	public boolean action(PlayerInstance player, WorldObject target, boolean interact)
 	{
-		// See description in TvTEvent.java
-		if (!TvTEvent.onAction(player, target.getObjectId()))
-		{
-			return false;
-		}
-		
 		// Check if the PlayerInstance is confused
 		if (player.isOutOfControl())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
deleted file mode 100644
index 68924bc16d..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.admincommandhandlers;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.data.xml.AdminData;
-import org.l2jmobius.gameserver.data.xml.TransformData;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent.EventState;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
-import org.l2jmobius.gameserver.util.Broadcast;
-
-/**
- * This class handles following admin commands: - admin = shows menu
- * @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/04/11 10:06:06 $
- */
-public class AdminEventEngine implements IAdminCommandHandler
-{
-	private static final Logger LOGGER = Logger.getLogger(AdminEventEngine.class.getName());
-	
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_event",
-		"admin_event_new",
-		"admin_event_choose",
-		"admin_event_store",
-		"admin_event_set",
-		"admin_event_change_teams_number",
-		"admin_event_announce",
-		"admin_event_panel",
-		"admin_event_control_begin",
-		"admin_event_control_teleport",
-		"admin_add",
-		"admin_event_see",
-		"admin_event_del",
-		"admin_delete_buffer",
-		"admin_event_control_sit",
-		"admin_event_name",
-		"admin_event_control_kill",
-		"admin_event_control_res",
-		"admin_event_control_transform",
-		"admin_event_control_untransform",
-		"admin_event_control_prize",
-		"admin_event_control_chatban",
-		"admin_event_control_kick",
-		"admin_event_control_finish"
-	};
-	
-	private static String tempBuffer = "";
-	private static String tempName = "";
-	private static boolean npcsDeleted = false;
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		StringTokenizer st = new StringTokenizer(command);
-		final String actualCommand = st.nextToken();
-		try
-		{
-			if (actualCommand.equals("admin_event"))
-			{
-				if (GameEvent.eventState != EventState.OFF)
-				{
-					showEventControl(activeChar);
-				}
-				else
-				{
-					showMainPage(activeChar);
-				}
-			}
-			
-			else if (actualCommand.equals("admin_event_new"))
-			{
-				showNewEventPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_add"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event info.
-				tempBuffer += command.substring(10);
-				showNewEventPage(activeChar);
-				
-			}
-			else if (actualCommand.startsWith("admin_event_see"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				final String eventName = command.substring(16);
-				try
-				{
-					final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-					final DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(Config.DATAPACK_ROOT + "/data/events/" + eventName)));
-					final BufferedReader inbr = new BufferedReader(new InputStreamReader(in));
-					adminReply.setFile(null, "data/html/mods/EventEngine/Participation.htm");
-					adminReply.replace("%eventName%", eventName);
-					adminReply.replace("%eventCreator%", inbr.readLine());
-					adminReply.replace("%eventInfo%", inbr.readLine());
-					adminReply.replace("npc_%objectId%_event_participate", "admin_event"); // Weird, but nice hack, isnt it? :)
-					adminReply.replace("button value=\"Participate\"", "button value=\"Back\"");
-					activeChar.sendPacket(adminReply);
-					inbr.close();
-				}
-				catch (Exception e)
-				{
-					LOGGER.warning("Problem with AdminEventEngine: " + e.getMessage());
-				}
-			}
-			else if (actualCommand.startsWith("admin_event_del"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				final String eventName = command.substring(16);
-				final File file = new File(Config.DATAPACK_ROOT + "/data/events/" + eventName);
-				file.delete();
-				showMainPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_name"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				tempName += command.substring(17);
-				showNewEventPage(activeChar);
-			}
-			else if (actualCommand.equalsIgnoreCase("admin_delete_buffer"))
-			{
-				tempBuffer = "";
-				showNewEventPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_store"))
-			{
-				try
-				{
-					final FileOutputStream file = new FileOutputStream(new File(Config.DATAPACK_ROOT, "data/events/" + tempName));
-					final PrintStream p = new PrintStream(file);
-					p.println(activeChar.getName());
-					p.println(tempBuffer);
-					file.close();
-					p.close();
-				}
-				catch (Exception e)
-				{
-					LOGGER.warning("Problem with AdminEventEngine: " + e.getMessage());
-				}
-				
-				tempBuffer = "";
-				tempName = "";
-				showMainPage(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_set"))
-			{
-				// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
-				GameEvent._eventName = command.substring(16);
-				showEventParameters(activeChar, 2);
-			}
-			else if (actualCommand.startsWith("admin_event_change_teams_number"))
-			{
-				showEventParameters(activeChar, Integer.parseInt(st.nextToken()));
-			}
-			else if (actualCommand.startsWith("admin_event_panel"))
-			{
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_announce"))
-			{
-				GameEvent._npcId = Integer.parseInt(st.nextToken());
-				GameEvent._teamsNumber = Integer.parseInt(st.nextToken());
-				String temp = " ";
-				String temp2 = "";
-				while (st.hasMoreElements())
-				{
-					temp += st.nextToken() + " ";
-				}
-				
-				st = new StringTokenizer(temp, "-");
-				Integer i = 1;
-				
-				while (st.hasMoreElements())
-				{
-					temp2 = st.nextToken();
-					if (!temp2.equals(" "))
-					{
-						GameEvent._teamNames.put(i++, temp2.substring(1, temp2.length() - 1));
-					}
-				}
-				
-				activeChar.sendMessage(GameEvent.startEventParticipation());
-				Broadcast.toAllOnlinePlayers(activeChar.getName() + " has started an event. You will find a participation NPC somewhere around you.");
-				
-				final PlaySound snd = new PlaySound(1, "B03_F", 0, 0, 0, 0, 0);
-				activeChar.sendPacket(snd);
-				activeChar.broadcastPacket(snd);
-				
-				final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-				final String replyMSG = "<html><title>[ EVENT ENGINE ]</title><body><br><center>The event <font color=\"LEVEL\">" + GameEvent._eventName + "</font> has been announced, now you can type //event_panel to see the event panel control</center><br></body></html>";
-				adminReply.setHtml(replyMSG);
-				activeChar.sendPacket(adminReply);
-			}
-			else if (actualCommand.startsWith("admin_event_control_begin"))
-			{
-				// Starts the event and sends a message of the result
-				activeChar.sendMessage(GameEvent.startEvent());
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_finish"))
-			{
-				// Finishes the event and sends a message of the result
-				activeChar.sendMessage(GameEvent.finishEvent());
-			}
-			else if (actualCommand.startsWith("admin_event_control_teleport"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					final int teamId = Integer.parseInt(st.nextToken());
-					for (PlayerInstance player : GameEvent._teams.get(teamId))
-					{
-						player.setTitle(GameEvent._teamNames.get(teamId));
-						player.teleToLocation(activeChar.getLocation(), true);
-						player.setInstanceId(activeChar.getInstanceId());
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_sit"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					// Integer.parseInt(st.nextToken()) == teamId
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						if (player.getEventStatus() == null)
-						{
-							continue;
-						}
-						
-						player.getEventStatus().setSitForced(!player.getEventStatus().isSitForced());
-						if (player.getEventStatus().isSitForced())
-						{
-							player.sitDown();
-						}
-						else
-						{
-							player.standUp();
-						}
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_kill"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.reduceCurrentHp(player.getMaxHp() + player.getMaxCp() + 1, activeChar, null);
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_res"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						if ((player == null) || !player.isDead())
-						{
-							continue;
-						}
-						player.restoreExp(100.0);
-						player.doRevive();
-						player.setCurrentHpMp(player.getMaxHp(), player.getMaxMp());
-						player.setCurrentCp(player.getMaxCp());
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_transform"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final int[] transIds = new int[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a transform ID
-				{
-					transIds[i++] = Integer.parseInt(st.nextToken());
-				}
-				
-				for (PlayerInstance player : GameEvent._teams.get(teamId))
-				{
-					final int transId = transIds[Rnd.get(transIds.length)];
-					if (!TransformData.getInstance().transformPlayer(transId, player))
-					{
-						AdminData.getInstance().broadcastMessageToGMs("EventEngine: Unknow transformation id: " + transId);
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_untransform"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (PlayerInstance player : GameEvent._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.stopTransformation(true);
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_kick"))
-			{
-				if (st.hasMoreElements()) // If has next token, it should be player name.
-				{
-					while (st.hasMoreElements())
-					{
-						final PlayerInstance player = World.getInstance().getPlayer(st.nextToken());
-						if (player != null)
-						{
-							GameEvent.removeAndResetPlayer(player);
-						}
-					}
-				}
-				else
-				{
-					if ((activeChar.getTarget() != null) && (activeChar.getTarget().isPlayer()))
-					{
-						GameEvent.removeAndResetPlayer((PlayerInstance) activeChar.getTarget());
-					}
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_prize"))
-			{
-				final int[] teamIds = new int[st.countTokens() - 2];
-				int i = 0;
-				while ((st.countTokens() - 2) > 0) // The last 2 tokens are used for "n" and "item id"
-				{
-					teamIds[i++] = Integer.parseInt(st.nextToken());
-				}
-				
-				final String[] n = st.nextToken().split("\\*");
-				final int itemId = Integer.parseInt(st.nextToken());
-				for (int teamId : teamIds)
-				{
-					rewardTeam(activeChar, teamId, Integer.parseInt(n[0]), itemId, n.length == 2 ? n[1] : "");
-				}
-				showEventControl(activeChar);
-			}
-		}
-		catch (Exception e)
-		{
-			AdminData.getInstance().broadcastMessageToGMs("EventEngine: Error! Possible blank boxes while executing a command which requires a value in the box?");
-		}
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	private String showStoredEvents()
-	{
-		final File dir = new File(Config.DATAPACK_ROOT, "/data/events");
-		if (dir.isFile())
-		{
-			return "<font color=\"FF0000\">The directory '" + dir.getAbsolutePath() + "' is a file or is corrupted!</font><br>";
-		}
-		
-		String note = "";
-		if (!dir.exists())
-		{
-			note = "<font color=\"FF0000\">The directory '" + dir.getAbsolutePath() + "' does not exist!</font><br><font color=\"0099FF\">Trying to create it now...<br></font><br>";
-			if (dir.mkdirs())
-			{
-				note += "<font color=\"006600\">The directory '" + dir.getAbsolutePath() + "' has been created!</font><br>";
-			}
-			else
-			{
-				note += "<font color=\"FF0000\">The directory '" + dir.getAbsolutePath() + "' hasn't been created!</font><br>";
-				return note;
-			}
-		}
-		
-		final String[] files = dir.list();
-		final StringBuilder result = new StringBuilder(files.length * 500);
-		result.append("<table>");
-		for (String fileName : files)
-		{
-			result.append("<tr><td align=center>");
-			result.append(fileName);
-			result.append(" </td></tr><tr><td><table cellspacing=0><tr><td><button value=\"Select Event\" action=\"bypass -h admin_event_set ");
-			result.append(fileName);
-			result.append("\" width=90 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"View Event\" action=\"bypass -h admin_event_see ");
-			result.append(fileName);
-			result.append("\" width=90 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Delete Event\" action=\"bypass -h admin_event_del ");
-			result.append(fileName);
-			result.append("\" width=90 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr>");
-		}
-		
-		result.append("</table>");
-		
-		return note + result;
-	}
-	
-	public void showMainPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final String replyMSG = "<html><title>[ L2J EVENT ENGINE ]</title><body><br><center><button value=\"Create NEW event \" action=\"bypass -h admin_event_new\" width=150 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><center><br><font color=LEVEL>Stored Events:</font><br></center>" + showStoredEvents() + "</body></html>";
-		adminReply.setHtml(replyMSG);
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showNewEventPage(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final StringBuilder replyMSG = new StringBuilder(512);
-		replyMSG.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><br><center><font color=LEVEL>Event name:</font><br>");
-		if (tempName.isEmpty())
-		{
-			replyMSG.append("You can also use //event_name text to insert a new title");
-			replyMSG.append("<center><multiedit var=\"name\" width=260 height=24> <button value=\"Set Event Name\" action=\"bypass -h admin_event_name $name\" width=120 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		}
-		else
-		{
-			replyMSG.append(tempName);
-		}
-		
-		replyMSG.append("<br><br><font color=LEVEL>Event description:</font><br></center>");
-		if (tempBuffer.isEmpty())
-		{
-			replyMSG.append("You can also use //add text to add text or //delete_buffer to remove the text.");
-		}
-		else
-		{
-			replyMSG.append(tempBuffer);
-		}
-		
-		replyMSG.append("<center><multiedit var=\"txt\" width=270 height=100> <button value=\"Add text\" action=\"bypass -h admin_add $txt\" width=120 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		replyMSG.append("<button value=\"Remove text\" action=\"bypass -h admin_delete_buffer\" width=120 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		if (!(tempName.isEmpty() && tempBuffer.isEmpty()))
-		{
-			replyMSG.append("<br><button value=\"Store Event Data\" action=\"bypass -h admin_event_store\" width=160 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
-		}
-		
-		replyMSG.append("</center></body></html>");
-		
-		adminReply.setHtml(replyMSG.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	public void showEventParameters(PlayerInstance activeChar, int teamnumbers)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><body><title>[ L2J EVENT ENGINE ]</title><br><center> Current event: <font color=\"LEVEL\">");
-		sb.append(GameEvent._eventName);
-		sb.append("</font></center><br>INFO: To start an event, you must first set the number of teams, then type their names in the boxes and finally type the NPC ID that will be the event manager (can be any existing npc) next to the \"Announce Event!\" button.<br><table width=100%>");
-		sb.append("<tr><td><button value=\"Announce Event!\" action=\"bypass -h admin_event_announce $event_npcid ");
-		sb.append(teamnumbers);
-		sb.append(" ");
-		for (int i = 1; (i - 1) < teamnumbers; i++) // Event announce params
-		{
-			sb.append("$event_teams_name");
-			sb.append(i);
-			sb.append(" - ");
-		}
-		sb.append("\" width=140 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
-		sb.append("<td><edit var=\"event_npcid\" width=100 height=20></td></tr>");
-		sb.append("<tr><td><button value=\"Set number of teams\" action=\"bypass -h admin_event_change_teams_number $event_teams_number\" width=140 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
-		sb.append("<td><edit var=\"event_teams_number\" width=100 height=20></td></tr>");
-		sb.append("</table><br><center><br><br>");
-		sb.append("<font color=\"LEVEL\">Teams' names:</font><br><table width=100% cellspacing=8>");
-		for (int i = 1; (i - 1) < teamnumbers; i++) // Team names params
-		{
-			sb.append("<tr><td align=center>Team #");
-			sb.append(i);
-			sb.append(" name:</td><td><edit var=\"event_teams_name");
-			sb.append(i);
-			sb.append("\" width=150 height=15></td></tr>");
-		}
-		sb.append("</table></body></html>");
-		
-		adminReply.setHtml(sb.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	private void showEventControl(PlayerInstance activeChar)
-	{
-		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
-		sb.append(GameEvent._eventName);
-		sb.append("</font></center><br><table cellspacing=-1 width=280><tr><td align=center>Type the team ID(s) that will be affected by the commands. Commands with '*' work with only 1 team ID in the field, while '!' - none.</td></tr><tr><td align=center><edit var=\"team_number\" width=100 height=15></td></tr>");
-		sb.append("<tr><td>&nbsp;</td></tr><tr><td><table width=200>");
-		if (!npcsDeleted)
-		{
-			sb.append("<tr><td><button value=\"Start!\" action=\"bypass -h admin_event_control_begin\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Destroys all event npcs so no more people can't participate now on</font></td></tr>");
-		}
-		
-		sb.append("<tr><td>&nbsp;</td></tr><tr><td><button value=\"Teleport\" action=\"bypass -h admin_event_control_teleport $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Teleports the specified team to your position</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"Sit/Stand\" action=\"bypass -h admin_event_control_sit $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Sits/Stands up the team</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"Kill\" action=\"bypass -h admin_event_control_kill $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Finish with the life of all the players in the selected team</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"Resurrect\" action=\"bypass -h admin_event_control_res $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Resurrect Team's members</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><table cellspacing=-1><tr><td><button value=\"Transform*\" action=\"bypass -h admin_event_control_transform $team_number $transf_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"transf_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Transforms the team into the transformation with the ID specified. Multiple IDs result in randomly chosen one for each player.</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"UnTransform\" action=\"bypass -h admin_event_control_untransform $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Untransforms the team</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><table cellspacing=-1><tr><td><button value=\"Give Item\" action=\"bypass -h admin_event_control_prize $team_number $n $id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table><table><tr><td width=32>Num</td><td><edit var=\"n\" width=60 height=15></td></tr><tr><td>ID</td><td><edit var=\"id\" width=60 height=15></td></tr></table></td><td><font color=\"LEVEL\">Give the specified item id to every single member of the team, you can put 5*level, 5*kills or 5 in the number field for example</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><table cellspacing=-1><tr><td><button value=\"Kick Player\" action=\"bypass -h admin_event_control_kick $player_name\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"player_name\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Kicks the specified player(s) from the event. Blank field kicks target.</font></td></tr><tr><td>&nbsp;</td></tr><tr><td><button value=\"End!\" action=\"bypass -h admin_event_control_finish\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Will finish the event teleporting back all the players</font></td></tr><tr><td>&nbsp;</td></tr></table></td></tr></table></body></html>");
-		adminReply.setHtml(sb.toString());
-		activeChar.sendPacket(adminReply);
-	}
-	
-	private void rewardTeam(PlayerInstance activeChar, int team, int n, int id, String type)
-	{
-		int num = n;
-		for (PlayerInstance player : GameEvent._teams.get(team))
-		{
-			if (type.equalsIgnoreCase("level"))
-			{
-				num = n * player.getLevel();
-			}
-			else if (type.equalsIgnoreCase("kills") && (player.getEventStatus() != null))
-			{
-				num = n * player.getEventStatus().getKills().size();
-			}
-			else
-			{
-				num = n;
-			}
-			
-			player.addItem("Event", id, num, activeChar, true);
-			
-			final NpcHtmlMessage adminReply = new NpcHtmlMessage();
-			adminReply.setHtml("<html><body>CONGRATULATIONS! You should have been rewarded.</body></html>");
-			player.sendPacket(adminReply);
-		}
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
deleted file mode 100644
index 2e64c1b8f1..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.admincommandhandlers;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEventTeleporter;
-import org.l2jmobius.gameserver.instancemanager.events.TvTManager;
-import org.l2jmobius.gameserver.model.WorldObject;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.util.BuilderUtil;
-
-/**
- * @author HorridoJoho
- */
-public class AdminTvTEvent implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_tvt_add",
-		"admin_tvt_remove",
-		"admin_tvt_advance"
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
-	{
-		if (command.equals("admin_tvt_add"))
-		{
-			final WorldObject target = activeChar.getTarget();
-			if ((target == null) || !target.isPlayer())
-			{
-				BuilderUtil.sendSysMessage(activeChar, "You should select a player!");
-				return true;
-			}
-			
-			add(activeChar, (PlayerInstance) target);
-		}
-		else if (command.equals("admin_tvt_remove"))
-		{
-			final WorldObject target = activeChar.getTarget();
-			if ((target == null) || !target.isPlayer())
-			{
-				BuilderUtil.sendSysMessage(activeChar, "You should select a player!");
-				return true;
-			}
-			
-			remove(activeChar, (PlayerInstance) target);
-		}
-		else if (command.equals("admin_tvt_advance"))
-		{
-			TvTManager.getInstance().skipDelay();
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	private void add(PlayerInstance activeChar, PlayerInstance playerInstance)
-	{
-		if (playerInstance.isOnEvent())
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Player already participated in the event!");
-			return;
-		}
-		
-		if (!TvTEvent.addParticipant(playerInstance))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Player instance could not be added, it seems to be null!");
-			return;
-		}
-		
-		if (TvTEvent.isStarted())
-		{
-			new TvTEventTeleporter(playerInstance, TvTEvent.getParticipantTeamCoordinates(playerInstance.getObjectId()), true, false);
-		}
-	}
-	
-	private void remove(PlayerInstance activeChar, PlayerInstance playerInstance)
-	{
-		if (!TvTEvent.removeParticipant(playerInstance.getObjectId()))
-		{
-			BuilderUtil.sendSysMessage(activeChar, "Player is not part of the event!");
-			return;
-		}
-		
-		new TvTEventTeleporter(playerInstance, Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES, true, true);
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java
deleted file mode 100644
index 081bbe2c2b..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.bypasshandlers;
-
-import java.util.logging.Level;
-
-import org.l2jmobius.gameserver.handler.IBypassHandler;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class EventEngine implements IBypassHandler
-{
-	private static final String[] COMMANDS =
-	{
-		"event_participate",
-		"event_unregister"
-	};
-	
-	@Override
-	public boolean useBypass(String command, PlayerInstance player, Creature target)
-	{
-		if (!target.isNpc())
-		{
-			return false;
-		}
-		
-		try
-		{
-			if (command.equalsIgnoreCase("event_participate"))
-			{
-				GameEvent.registerPlayer(player);
-				return true;
-			}
-			else if (command.equalsIgnoreCase("event_unregister"))
-			{
-				GameEvent.removeAndResetPlayer(player);
-				return true;
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
-		}
-		return false;
-	}
-	
-	@Override
-	public String[] getBypassList()
-	{
-		return COMMANDS;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
index 936405cb06..f5c46a8ab1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
@@ -100,9 +100,9 @@ public class Observation implements IBypassHandler
 			player.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_SIEGE_WITH_A_PET_OR_SERVITOR_SUMMONED);
 			return false;
 		}
-		if (player.isOnEvent())
+		if (player.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("Cannot use while current Event");
+			player.sendMessage("Cannot use while registered on an event");
 			return false;
 		}
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
index 1061ba83a6..7bad5bafda 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
@@ -81,7 +81,7 @@ public class OlympiadObservation implements IBypassHandler
 					return false;
 				}
 				
-				if (player.isOnEvent())
+				if (player.isRegisteredOnCustomEvent())
 				{
 					player.sendMessage("You can not observe games while registered on an event.");
 					return false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
index 47cd371a08..8193ae80c9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
@@ -89,7 +89,7 @@ public class HomeBoard implements IParseBoardHandler
 				break;
 			}
 		}
-		return commandCheck && (player.isCastingNow() || player.isCastingSimultaneouslyNow() || player.isInCombat() || player.isInDuel() || player.isInOlympiadMode() || player.isInsideZone(ZoneId.SIEGE) || player.isInsideZone(ZoneId.PVP) || (player.getPvpFlag() > 0) || player.isAlikeDead() || player.isOnEvent());
+		return commandCheck && (player.isCastingNow() || player.isCastingSimultaneouslyNow() || player.isInCombat() || player.isInDuel() || player.isInOlympiadMode() || player.isInsideZone(ZoneId.SIEGE) || player.isInsideZone(ZoneId.PVP) || (player.getPvpFlag() > 0) || player.isAlikeDead() || player.isOnCustomEvent());
 	};
 	
 	private static final Predicate<PlayerInstance> KARMA_CHECK = player -> Config.COMMUNITYBOARD_KARMA_DISABLED && (player.getKarma() > 0);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index cdc12f6305..84a62c1ba6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -18,7 +18,6 @@ package handlers.effecthandlers;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -140,7 +139,7 @@ public class CallPc extends AbstractEffect
 			return false;
 		}
 		
-		if (target.isFestivalParticipant() || target.isFlyingMounted() || target.isCombatFlagEquipped() || !TvTEvent.onEscapeUse(target.getObjectId()))
+		if (target.isFestivalParticipant() || target.isFlyingMounted() || target.isCombatFlagEquipped() || !target.isOnCustomEvent())
 		{
 			activeChar.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
 			return false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index d1420ac599..a45ca0874f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -18,7 +18,6 @@ package handlers.itemhandlers;
 
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IItemHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -41,7 +40,7 @@ public class ItemSkillsTemplate implements IItemHandler
 			return false;
 		}
 		
-		if (!TvTEvent.onScrollUse(playable.getObjectId()))
+		if (playable.isOnCustomEvent())
 		{
 			playable.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
index 7fa76417b8..a0413c7413 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
@@ -17,7 +17,6 @@
 package handlers.itemhandlers;
 
 import org.l2jmobius.gameserver.data.xml.PetDataTable;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +38,7 @@ public class SummonItems extends ItemSkillsTemplate
 			return false;
 		}
 		
-		if (!TvTEvent.onItemSummon(playable.getObjectId()))
+		if (playable.isOnCustomEvent())
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
index 7631881908..baedad0266 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
@@ -21,7 +21,6 @@ import org.l2jmobius.commons.util.Chronos;
 import org.l2jmobius.gameserver.LoginServerThread;
 import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.handler.IPunishmentHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.tasks.player.TeleportTask;
@@ -185,11 +184,6 @@ public class JailHandler implements IPunishmentHandler
 	{
 		player.setInstanceId(0);
 		
-		if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(player.getObjectId()))
-		{
-			TvTEvent.removeParticipant(player.getObjectId());
-		}
-		
 		if (OlympiadManager.getInstance().isRegisteredInComp(player))
 		{
 			OlympiadManager.getInstance().removeDisconnectedCompetitor(player);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/Clan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/Clan.java
index 8dccb7637e..852ae47cc9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/Clan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/Clan.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -101,7 +100,7 @@ public class Clan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+					if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java
index f8371a517f..908185dc58 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -88,7 +87,7 @@ public class CorpseClan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+					if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyClan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyClan.java
index 8a3e4fe74c..9411bebca4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyClan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyClan.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -118,7 +117,7 @@ public class PartyClan implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+			if (player.isOnCustomEvent() && obj.isOnCustomEvent() && (player.getTeam() != obj.getTeam()))
 			{
 				continue;
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
index 7c0abe6fde..83a5465066 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.skills.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -45,8 +44,7 @@ public class Unstuck implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, PlayerInstance player)
 	{
-		// Thanks nbd
-		if (!TvTEvent.onEscapeUse(player.getObjectId()))
+		if (player.isRegisteredOnCustomEvent())
 		{
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index 785b9f0c25..a3d2f21f11 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -32,8 +32,6 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.CoupleManager;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -41,7 +39,6 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import org.l2jmobius.gameserver.model.skills.Skill;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
@@ -292,9 +289,9 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (GameEvent.isParticipant(activeChar))
+		if (activeChar.isRegisteredOnCustomEvent())
 		{
-			activeChar.sendMessage("You are in an event.");
+			activeChar.sendMessage("You are registered in an event.");
 			return false;
 		}
 		
@@ -328,13 +325,6 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		// Thanks nbd
-		if (!TvTEvent.onEscapeUse(activeChar.getObjectId()))
-		{
-			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-			return false;
-		}
-		
 		if (activeChar.isInsideZone(ZoneId.NO_SUMMON_FRIEND))
 		{
 			activeChar.sendMessage("You are in area which blocks summoning.");
@@ -378,9 +368,9 @@ public class Wedding implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (GameEvent.isParticipant(partner))
+		if (partner.isRegisteredOnCustomEvent())
 		{
-			activeChar.sendMessage("Your partner is in an event.");
+			activeChar.sendMessage("Your partner is registered in an event.");
 			return false;
 		}
 		
@@ -437,12 +427,6 @@ public class Wedding implements IVoicedCommandHandler
 			}
 		}
 		
-		if (!TvTEvent.onEscapeUse(partner.getObjectId()))
-		{
-			activeChar.sendMessage("Your partner is in an event.");
-			return false;
-		}
-		
 		if (partner.isInsideZone(ZoneId.NO_SUMMON_FRIEND))
 		{
 			activeChar.sendMessage("Your partner is in area which blocks summoning.");
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/npcs/custom/custom.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/npcs/custom/custom.xml
index 9d10edd44c..77e90d6b35 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/npcs/custom/custom.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/npcs/custom/custom.xml
@@ -6,12 +6,6 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="70010" displayId="31606" name="Catrina" usingServerSideName="true" title="TvT Event Manager" usingServerSideTitle="true" type="Npc">
-		<collision>
-			<radius normal="8" />
-			<height normal="15" />
-		</collision>
-	</npc>
 	<npc id="900100" displayId="20432" level="1" name="Elpy" type="EventMonster">
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="40" hpRegen="3" mp="36" mpRegen="1" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
index 22d246c966..4f84445ebe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
@@ -139,7 +139,6 @@ public class Config
 	private static final String CUSTOM_SERVER_TIME_CONFIG_FILE = "./config/Custom/ServerTime.ini";
 	private static final String CUSTOM_SCHEME_BUFFER_CONFIG_FILE = "./config/Custom/ShemeBuffer.ini";
 	private static final String CUSTOM_STARTING_LOCATION_CONFIG_FILE = "./config/Custom/StartingLocation.ini";
-	private static final String CUSTOM_TVT_CONFIG_FILE = "./config/Custom/TeamVersusTeam.ini";
 	private static final String CUSTOM_VOTE_REWARD_CONFIG_FILE = "./config/Custom/VoteReward.ini";
 	private static final String CUSTOM_WAREHOUSE_SORTING_CONFIG_FILE = "./config/Custom/WarehouseSorting.ini";
 	private static final String CUSTOM_WEDDING_CONFIG_FILE = "./config/Custom/Wedding.ini";
@@ -1106,38 +1105,6 @@ public class Config
 	public static int CHAMPION_REWARD_QTY;
 	public static boolean CHAMPION_ENABLE_VITALITY;
 	public static boolean CHAMPION_ENABLE_IN_INSTANCES;
-	public static boolean TVT_EVENT_ENABLED;
-	public static boolean TVT_EVENT_IN_INSTANCE;
-	public static int TVT_EVENT_INSTANCE_ID;
-	public static String[] TVT_EVENT_INTERVAL;
-	public static int TVT_EVENT_PARTICIPATION_TIME;
-	public static int TVT_EVENT_RUNNING_TIME;
-	public static int TVT_EVENT_PARTICIPATION_NPC_ID;
-	public static int[] TVT_EVENT_PARTICIPATION_NPC_COORDINATES = new int[4];
-	public static int[] TVT_EVENT_PARTICIPATION_FEE = new int[2];
-	public static int TVT_EVENT_MIN_PLAYERS_IN_TEAMS;
-	public static int TVT_EVENT_MAX_PLAYERS_IN_TEAMS;
-	public static int TVT_EVENT_RESPAWN_TELEPORT_DELAY;
-	public static int TVT_EVENT_START_LEAVE_TELEPORT_DELAY;
-	public static String TVT_EVENT_TEAM_1_NAME;
-	public static int[] TVT_EVENT_TEAM_1_COORDINATES = new int[3];
-	public static String TVT_EVENT_TEAM_2_NAME;
-	public static int[] TVT_EVENT_TEAM_2_COORDINATES = new int[3];
-	public static List<int[]> TVT_EVENT_REWARDS;
-	public static boolean TVT_EVENT_TARGET_TEAM_MEMBERS_ALLOWED;
-	public static boolean TVT_EVENT_SCROLL_ALLOWED;
-	public static boolean TVT_EVENT_POTIONS_ALLOWED;
-	public static boolean TVT_EVENT_SUMMON_BY_ITEM_ALLOWED;
-	public static List<Integer> TVT_DOORS_IDS_TO_OPEN;
-	public static List<Integer> TVT_DOORS_IDS_TO_CLOSE;
-	public static boolean TVT_REWARD_TEAM_TIE;
-	public static byte TVT_EVENT_MIN_LEVEL;
-	public static byte TVT_EVENT_MAX_LEVEL;
-	public static int TVT_EVENT_EFFECTS_REMOVAL;
-	public static Map<Integer, Integer> TVT_EVENT_FIGHTER_BUFFS;
-	public static Map<Integer, Integer> TVT_EVENT_MAGE_BUFFS;
-	public static int TVT_EVENT_MAX_PARTICIPANTS_PER_IP;
-	public static boolean TVT_ALLOW_VOICED_COMMAND;
 	public static boolean ALLOW_WEDDING;
 	public static int WEDDING_PRICE;
 	public static boolean WEDDING_PUNISH_INFIDELITY;
@@ -3080,210 +3047,6 @@ public class Config
 			CUSTOM_STARTING_LOC_Y = StartingLocation.getInt("CustomStartingLocY", 147880);
 			CUSTOM_STARTING_LOC_Z = StartingLocation.getInt("CustomStartingLocZ", -3469);
 			
-			// Load TeamVersusTeam config file (if exists)
-			final PropertiesParser TeamVersusTeam = new PropertiesParser(CUSTOM_TVT_CONFIG_FILE);
-			TVT_EVENT_ENABLED = TeamVersusTeam.getBoolean("TvTEventEnabled", false);
-			TVT_EVENT_IN_INSTANCE = TeamVersusTeam.getBoolean("TvTEventInInstance", false);
-			TVT_EVENT_INSTANCE_ID = TeamVersusTeam.getInt("TvTEventInstanceId", 3049);
-			TVT_EVENT_INTERVAL = TeamVersusTeam.getString("TvTEventInterval", "20:00").split(",");
-			TVT_EVENT_PARTICIPATION_TIME = TeamVersusTeam.getInt("TvTEventParticipationTime", 3600);
-			TVT_EVENT_RUNNING_TIME = TeamVersusTeam.getInt("TvTEventRunningTime", 1800);
-			TVT_EVENT_PARTICIPATION_NPC_ID = TeamVersusTeam.getInt("TvTEventParticipationNpcId", 0);
-			if (TVT_EVENT_PARTICIPATION_NPC_ID == 0)
-			{
-				TVT_EVENT_ENABLED = false;
-				LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventParticipationNpcId");
-			}
-			else
-			{
-				String[] tvtNpcCoords = TeamVersusTeam.getString("TvTEventParticipationNpcCoordinates", "0,0,0").split(",");
-				if (tvtNpcCoords.length < 3)
-				{
-					TVT_EVENT_ENABLED = false;
-					LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventParticipationNpcCoordinates");
-				}
-				else
-				{
-					TVT_EVENT_REWARDS = new ArrayList<>();
-					TVT_DOORS_IDS_TO_OPEN = new ArrayList<>();
-					TVT_DOORS_IDS_TO_CLOSE = new ArrayList<>();
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES = new int[4];
-					TVT_EVENT_TEAM_1_COORDINATES = new int[3];
-					TVT_EVENT_TEAM_2_COORDINATES = new int[3];
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES[0] = Integer.parseInt(tvtNpcCoords[0]);
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES[1] = Integer.parseInt(tvtNpcCoords[1]);
-					TVT_EVENT_PARTICIPATION_NPC_COORDINATES[2] = Integer.parseInt(tvtNpcCoords[2]);
-					if (tvtNpcCoords.length == 4)
-					{
-						TVT_EVENT_PARTICIPATION_NPC_COORDINATES[3] = Integer.parseInt(tvtNpcCoords[3]);
-					}
-					TVT_EVENT_MIN_PLAYERS_IN_TEAMS = TeamVersusTeam.getInt("TvTEventMinPlayersInTeams", 1);
-					TVT_EVENT_MAX_PLAYERS_IN_TEAMS = TeamVersusTeam.getInt("TvTEventMaxPlayersInTeams", 20);
-					TVT_EVENT_MIN_LEVEL = TeamVersusTeam.getByte("TvTEventMinPlayerLevel", (byte) 1);
-					TVT_EVENT_MAX_LEVEL = TeamVersusTeam.getByte("TvTEventMaxPlayerLevel", (byte) 80);
-					TVT_EVENT_RESPAWN_TELEPORT_DELAY = TeamVersusTeam.getInt("TvTEventRespawnTeleportDelay", 20);
-					TVT_EVENT_START_LEAVE_TELEPORT_DELAY = TeamVersusTeam.getInt("TvTEventStartLeaveTeleportDelay", 20);
-					TVT_EVENT_EFFECTS_REMOVAL = TeamVersusTeam.getInt("TvTEventEffectsRemoval", 0);
-					TVT_EVENT_MAX_PARTICIPANTS_PER_IP = TeamVersusTeam.getInt("TvTEventMaxParticipantsPerIP", 0);
-					TVT_ALLOW_VOICED_COMMAND = TeamVersusTeam.getBoolean("TvTAllowVoicedInfoCommand", false);
-					TVT_EVENT_TEAM_1_NAME = TeamVersusTeam.getString("TvTEventTeam1Name", "Team1");
-					tvtNpcCoords = TeamVersusTeam.getString("TvTEventTeam1Coordinates", "0,0,0").split(",");
-					if (tvtNpcCoords.length < 3)
-					{
-						TVT_EVENT_ENABLED = false;
-						LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventTeam1Coordinates");
-					}
-					else
-					{
-						TVT_EVENT_TEAM_1_COORDINATES[0] = Integer.parseInt(tvtNpcCoords[0]);
-						TVT_EVENT_TEAM_1_COORDINATES[1] = Integer.parseInt(tvtNpcCoords[1]);
-						TVT_EVENT_TEAM_1_COORDINATES[2] = Integer.parseInt(tvtNpcCoords[2]);
-						TVT_EVENT_TEAM_2_NAME = TeamVersusTeam.getString("TvTEventTeam2Name", "Team2");
-						tvtNpcCoords = TeamVersusTeam.getString("TvTEventTeam2Coordinates", "0,0,0").split(",");
-						if (tvtNpcCoords.length < 3)
-						{
-							TVT_EVENT_ENABLED = false;
-							LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventTeam2Coordinates");
-						}
-						else
-						{
-							TVT_EVENT_TEAM_2_COORDINATES[0] = Integer.parseInt(tvtNpcCoords[0]);
-							TVT_EVENT_TEAM_2_COORDINATES[1] = Integer.parseInt(tvtNpcCoords[1]);
-							TVT_EVENT_TEAM_2_COORDINATES[2] = Integer.parseInt(tvtNpcCoords[2]);
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventParticipationFee", "0,0").split(",");
-							try
-							{
-								TVT_EVENT_PARTICIPATION_FEE[0] = Integer.parseInt(tvtNpcCoords[0]);
-								TVT_EVENT_PARTICIPATION_FEE[1] = Integer.parseInt(tvtNpcCoords[1]);
-							}
-							catch (NumberFormatException nfe)
-							{
-								if (tvtNpcCoords.length > 0)
-								{
-									LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventParticipationFee");
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventReward", "57,100000").split(";");
-							for (String reward : tvtNpcCoords)
-							{
-								final String[] rewardSplit = reward.split(",");
-								if (rewardSplit.length != 2)
-								{
-									LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"" + reward + "\"");
-								}
-								else
-								{
-									try
-									{
-										TVT_EVENT_REWARDS.add(new int[]
-										{
-											Integer.parseInt(rewardSplit[0]),
-											Integer.parseInt(rewardSplit[1])
-										});
-									}
-									catch (NumberFormatException nfe)
-									{
-										if (!reward.isEmpty())
-										{
-											LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"" + reward + "\"");
-										}
-									}
-								}
-							}
-							TVT_EVENT_TARGET_TEAM_MEMBERS_ALLOWED = TeamVersusTeam.getBoolean("TvTEventTargetTeamMembersAllowed", true);
-							TVT_EVENT_SCROLL_ALLOWED = TeamVersusTeam.getBoolean("TvTEventScrollsAllowed", false);
-							TVT_EVENT_POTIONS_ALLOWED = TeamVersusTeam.getBoolean("TvTEventPotionsAllowed", false);
-							TVT_EVENT_SUMMON_BY_ITEM_ALLOWED = TeamVersusTeam.getBoolean("TvTEventSummonByItemAllowed", false);
-							TVT_REWARD_TEAM_TIE = TeamVersusTeam.getBoolean("TvTRewardTeamTie", false);
-							tvtNpcCoords = TeamVersusTeam.getString("TvTDoorsToOpen", "").split(";");
-							for (String door : tvtNpcCoords)
-							{
-								try
-								{
-									TVT_DOORS_IDS_TO_OPEN.add(Integer.parseInt(door));
-								}
-								catch (NumberFormatException nfe)
-								{
-									if (!door.isEmpty())
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToOpen \"" + door + "\"");
-									}
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTDoorsToClose", "").split(";");
-							for (String door : tvtNpcCoords)
-							{
-								try
-								{
-									TVT_DOORS_IDS_TO_CLOSE.add(Integer.parseInt(door));
-								}
-								catch (NumberFormatException nfe)
-								{
-									if (!door.isEmpty())
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToClose \"" + door + "\"");
-									}
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventFighterBuffs", "").split(";");
-							if (!tvtNpcCoords[0].isEmpty())
-							{
-								TVT_EVENT_FIGHTER_BUFFS = new HashMap<>(tvtNpcCoords.length);
-								for (String skill : tvtNpcCoords)
-								{
-									final String[] skillSplit = skill.split(",");
-									if (skillSplit.length != 2)
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"" + skill + "\"");
-									}
-									else
-									{
-										try
-										{
-											TVT_EVENT_FIGHTER_BUFFS.put(Integer.parseInt(skillSplit[0]), Integer.parseInt(skillSplit[1]));
-										}
-										catch (NumberFormatException nfe)
-										{
-											if (!skill.isEmpty())
-											{
-												LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"" + skill + "\"");
-											}
-										}
-									}
-								}
-							}
-							tvtNpcCoords = TeamVersusTeam.getString("TvTEventMageBuffs", "").split(";");
-							if (!tvtNpcCoords[0].isEmpty())
-							{
-								TVT_EVENT_MAGE_BUFFS = new HashMap<>(tvtNpcCoords.length);
-								for (String skill : tvtNpcCoords)
-								{
-									final String[] skillSplit = skill.split(",");
-									if (skillSplit.length != 2)
-									{
-										LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"" + skill + "\"");
-									}
-									else
-									{
-										try
-										{
-											TVT_EVENT_MAGE_BUFFS.put(Integer.parseInt(skillSplit[0]), Integer.parseInt(skillSplit[1]));
-										}
-										catch (NumberFormatException nfe)
-										{
-											if (!skill.isEmpty())
-											{
-												LOGGER.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"" + skill + "\"");
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			
 			// Load WarehouseSorting config file (if exists)
 			final PropertiesParser WarehouseSorting = new PropertiesParser(CUSTOM_WAREHOUSE_SORTING_CONFIG_FILE);
 			ENABLE_WAREHOUSESORTING_CLAN = WarehouseSorting.getBoolean("EnableWarehouseSortingClan", false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
index b1b394baec..8dbdaea577 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
@@ -137,7 +137,6 @@ import org.l2jmobius.gameserver.instancemanager.SoIManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTManager;
 import org.l2jmobius.gameserver.instancemanager.games.Lottery;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.AutoSpawnHandler;
@@ -438,8 +437,6 @@ public class GameServer
 		
 		LOGGER.info("IdManager: Free ObjectID's remaining: " + IdManager.size());
 		
-		TvTManager.getInstance();
-		
 		if ((Config.OFFLINE_TRADE_ENABLE || Config.OFFLINE_CRAFT_ENABLE) && Config.RESTORE_OFFLINERS)
 		{
 			OfflineTraderTable.getInstance().restoreOfflineTraders();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
index 1e1df5eeaf..2137e2b053 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
@@ -170,9 +170,9 @@ public class HandysBlockCheckerManager
 				return false;
 			}
 			
-			if (player.isOnEvent() || player.isInOlympiadMode())
+			if (player.isRegisteredOnCustomEvent() || player.isInOlympiadMode())
 			{
-				player.sendMessage("Couldnt register you due other event participation");
+				player.sendMessage("Couldnt register you due other event participation.");
 				return false;
 			}
 			
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
index 469f47e26a..e7d47b90ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PrecautionaryRestartManager.java
@@ -154,7 +154,7 @@ public class PrecautionaryRestartManager
 				return true;
 			}
 			
-			if (player.isOnEvent())
+			if (player.isOnCustomEvent())
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index 6cc2d3db83..add2a1a7e7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -401,7 +401,7 @@ public class SellBuffsManager implements IXmlReader
 			player.sendMessage("You can't sell buffs with Olympiad status!");
 			return false;
 		}
-		else if (player.isOnEvent()) // custom event message
+		else if (player.isRegisteredOnCustomEvent()) // custom event message
 		{
 			player.sendMessage("You can't sell buffs while registered in an event!");
 			return false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
deleted file mode 100644
index aede373cc5..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.cache.HtmCache;
-import org.l2jmobius.gameserver.data.SpawnTable;
-import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
-import org.l2jmobius.gameserver.model.Spawn;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.holders.PlayerEventHolder;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-
-/**
- * @author Nik
- * @Since 2011/05/17 21:51:39
- */
-public class GameEvent
-{
-	protected static final Logger LOGGER = Logger.getLogger(GameEvent.class.getName());
-	public static EventState eventState = EventState.OFF;
-	public static String _eventName = "";
-	public static String _eventCreator = "";
-	public static String _eventInfo = "";
-	public static int _teamsNumber = 0;
-	public static final Map<Integer, String> _teamNames = new ConcurrentHashMap<>();
-	public static final Collection<PlayerInstance> _registeredPlayers = ConcurrentHashMap.newKeySet();
-	public static final Map<Integer, List<PlayerInstance>> _teams = new ConcurrentHashMap<>();
-	public static int _npcId = 0;
-	private static final Map<PlayerInstance, PlayerEventHolder> _connectionLossData = new ConcurrentHashMap<>();
-	
-	public enum EventState
-	{
-		OFF, // Not running
-		STANDBY, // Waiting for participants to register
-		ON // Registration is over and the event has started.
-	}
-	
-	/**
-	 * @param player
-	 * @return The team ID where the player is in, or -1 if player is null or team not found.
-	 */
-	public static int getPlayerTeamId(PlayerInstance player)
-	{
-		if (player == null)
-		{
-			return -1;
-		}
-		
-		for (Entry<Integer, List<PlayerInstance>> team : _teams.entrySet())
-		{
-			if (team.getValue().contains(player))
-			{
-				return team.getKey();
-			}
-		}
-		
-		return -1;
-	}
-	
-	public static List<PlayerInstance> getTopNKillers(int n)
-	{
-		final Map<PlayerInstance, Integer> tmp = new HashMap<>();
-		for (List<PlayerInstance> teamList : _teams.values())
-		{
-			for (PlayerInstance player : teamList)
-			{
-				if (player.getEventStatus() == null)
-				{
-					continue;
-				}
-				tmp.put(player, player.getEventStatus().getKills().size());
-			}
-		}
-		
-		sortByValue(tmp);
-		return tmp.size() <= n ? new ArrayList<>(tmp.keySet()) : (new ArrayList<>(tmp.keySet())).subList(1, n);
-	}
-	
-	public static void showEventHtml(PlayerInstance player, String objectid)
-	{
-		// TODO: work on this
-		if (eventState == EventState.STANDBY)
-		{
-			try
-			{
-				final String htmContent;
-				final NpcHtmlMessage html = new NpcHtmlMessage(Integer.parseInt(objectid));
-				if (_registeredPlayers.contains(player))
-				{
-					htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participating.htm");
-				}
-				else
-				{
-					htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participation.htm");
-				}
-				
-				if (htmContent != null)
-				{
-					html.setHtml(htmContent);
-				}
-				
-				html.replace("%objectId%", objectid); // Yeah, we need this.
-				html.replace("%eventName%", _eventName);
-				html.replace("%eventCreator%", _eventCreator);
-				html.replace("%eventInfo%", _eventInfo);
-				player.sendPacket(html);
-			}
-			catch (Exception e)
-			{
-				LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e);
-			}
-		}
-	}
-	
-	/**
-	 * Spawns an event participation NPC near the player. The npc id used to spawning is GameEvent._npcId
-	 * @param target
-	 */
-	public static void spawnEventNpc(PlayerInstance target)
-	{
-		try
-		{
-			final Spawn spawn = new Spawn(_npcId);
-			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
-			spawn.setAmount(1);
-			spawn.setHeading(target.getHeading());
-			spawn.stopRespawn();
-			SpawnTable.getInstance().addNewSpawn(spawn, false);
-			spawn.init();
-			spawn.getLastSpawn().setCurrentHp(999999999);
-			spawn.getLastSpawn().setTitle(_eventName);
-			spawn.getLastSpawn().setEventMob(true);
-			// spawn.getLastSpawn().decayMe();
-			// spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ());
-			spawn.getLastSpawn().broadcastPacket(new MagicSkillUse(spawn.getLastSpawn(), spawn.getLastSpawn(), 1034, 1, 1, 1));
-			
-			// _npcs.add(spawn.getLastSpawn());
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e);
-		}
-	}
-	
-	/**
-	 * Zoey76: TODO: Rewrite this in a way that doesn't iterate over all spawns.
-	 */
-	public static void unspawnEventNpcs()
-	{
-		SpawnTable.getInstance().forEachSpawn(spawn ->
-		{
-			final Npc npc = spawn.getLastSpawn();
-			if ((npc != null) && npc.isEventMob())
-			{
-				npc.deleteMe();
-				spawn.stopRespawn();
-				SpawnTable.getInstance().deleteSpawn(spawn, false);
-			}
-			return true;
-		});
-	}
-	
-	/**
-	 * @param player
-	 * @return False: If player is null, his event status is null or the event state is off. True: if the player is inside the _registeredPlayers list while the event state is STANDBY. If the event state is ON, it will check if the player is inside in one of the teams.
-	 */
-	public static boolean isParticipant(PlayerInstance player)
-	{
-		if ((player == null) || (player.getEventStatus() == null))
-		{
-			return false;
-		}
-		
-		switch (eventState)
-		{
-			case OFF:
-			{
-				return false;
-			}
-			case STANDBY:
-			{
-				return _registeredPlayers.contains(player);
-			}
-			case ON:
-			{
-				for (List<PlayerInstance> teamList : _teams.values())
-				{
-					if (teamList.contains(player))
-					{
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Adds the player to the list of participants. If the event state is NOT STANDBY, the player wont be registered.
-	 * @param player
-	 */
-	public static void registerPlayer(PlayerInstance player)
-	{
-		if (eventState != EventState.STANDBY)
-		{
-			player.sendMessage("The registration period for this event is over.");
-			return;
-		}
-		
-		if ((Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP == 0) || AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.L2EVENT_ID, player, Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP))
-		{
-			_registeredPlayers.add(player);
-		}
-		else
-		{
-			player.sendMessage("You have reached the maximum allowed participants per IP.");
-		}
-	}
-	
-	/**
-	 * Removes the player from the participating players and the teams and restores his init stats before he registered at the event (loc, pvp, pk, title etc)
-	 * @param player
-	 */
-	public static void removeAndResetPlayer(PlayerInstance player)
-	{
-		try
-		{
-			if (isParticipant(player))
-			{
-				if (player.isDead())
-				{
-					player.restoreExp(100.0);
-					player.doRevive();
-					player.setCurrentHpMp(player.getMaxHp(), player.getMaxMp());
-					player.setCurrentCp(player.getMaxCp());
-				}
-				
-				player.decayMe();
-				player.spawnMe(player.getX(), player.getY(), player.getZ());
-				player.broadcastUserInfo();
-				
-				player.stopTransformation(true);
-			}
-			
-			if (player.getEventStatus() != null)
-			{
-				player.getEventStatus().restorePlayerStats();
-			}
-			
-			player.setEventStatus(null);
-			
-			_registeredPlayers.remove(player);
-			final int teamId = getPlayerTeamId(player);
-			if (_teams.containsKey(teamId))
-			{
-				_teams.get(teamId).remove(player);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e);
-		}
-	}
-	
-	/**
-	 * The player's event status will be saved at _connectionLossData
-	 * @param player
-	 */
-	public static void savePlayerEventStatus(PlayerInstance player)
-	{
-		_connectionLossData.put(player, player.getEventStatus());
-	}
-	
-	/**
-	 * If _connectionLossData contains the player, it will restore the player's event status. Also it will remove the player from the _connectionLossData.
-	 * @param player
-	 */
-	public static void restorePlayerEventStatus(PlayerInstance player)
-	{
-		if (_connectionLossData.containsKey(player))
-		{
-			player.setEventStatus(_connectionLossData.get(player));
-			_connectionLossData.remove(player);
-		}
-	}
-	
-	/**
-	 * If the event is ON or STANDBY, it will not start. Sets the event state to STANDBY and spawns registration NPCs
-	 * @return a string with information if the event participation has been successfully started or not.
-	 */
-	public static String startEventParticipation()
-	{
-		try
-		{
-			switch (eventState)
-			{
-				case ON:
-				{
-					return "Cannot start event, it is already on.";
-				}
-				case STANDBY:
-				{
-					return "Cannot start event, it is on standby mode.";
-				}
-				case OFF: // Event is off, so no problem turning it on.
-				{
-					eventState = EventState.STANDBY;
-					break;
-				}
-			}
-			
-			// Register the event at AntiFeedManager and clean it for just in case if the event is already registered.
-			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.L2EVENT_ID);
-			AntiFeedManager.getInstance().clear(AntiFeedManager.L2EVENT_ID);
-			
-			// Just in case
-			unspawnEventNpcs();
-			_registeredPlayers.clear();
-			// _npcs.clear();
-			if (NpcData.getInstance().getTemplate(_npcId) == null)
-			{
-				return "Cannot start event, invalid npc id.";
-			}
-			
-			try (FileReader fr = new FileReader(Config.DATAPACK_ROOT + "/data/events/" + _eventName);
-				BufferedReader br = new BufferedReader(fr))
-			{
-				_eventCreator = br.readLine();
-				_eventInfo = br.readLine();
-			}
-			
-			final List<PlayerInstance> temp = new LinkedList<>();
-			for (PlayerInstance player : World.getInstance().getPlayers())
-			{
-				if (!player.isOnline())
-				{
-					continue;
-				}
-				
-				if (!temp.contains(player))
-				{
-					spawnEventNpc(player);
-					temp.add(player);
-				}
-				World.getInstance().forEachVisibleObject(player, PlayerInstance.class, playertemp ->
-				{
-					if ((Math.abs(playertemp.getX() - player.getX()) < 1000) && (Math.abs(playertemp.getY() - player.getY()) < 1000) && (Math.abs(playertemp.getZ() - player.getZ()) < 1000))
-					{
-						temp.add(playertemp);
-					}
-				});
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Event: " + e.getMessage());
-			return "Cannot start event participation, an error has occured.";
-		}
-		
-		return "The event participation has been successfully started.";
-	}
-	
-	/**
-	 * If the event is ON or OFF, it will not start. Sets the event state to ON, creates the teams, adds the registered players ordered by level at the teams and adds a new event status to the players.
-	 * @return a string with information if the event has been successfully started or not.
-	 */
-	public static String startEvent()
-	{
-		try
-		{
-			switch (eventState)
-			{
-				case ON:
-				{
-					return "Cannot start event, it is already on.";
-				}
-				case STANDBY:
-				{
-					eventState = EventState.ON;
-					break;
-				}
-				case OFF: // Event is off, so no problem turning it on.
-				{
-					return "Cannot start event, it is off. Participation start is required.";
-				}
-			}
-			
-			// Clean the things we will use, just in case.
-			unspawnEventNpcs();
-			_teams.clear();
-			_connectionLossData.clear();
-			
-			// Insert empty lists at _teams.
-			for (int i = 0; i < _teamsNumber; i++)
-			{
-				_teams.put(i + 1, new CopyOnWriteArrayList<>());
-			}
-			
-			int i = 0;
-			while (!_registeredPlayers.isEmpty())
-			{
-				// Get the player with the biggest level
-				int max = 0;
-				PlayerInstance biggestLvlPlayer = null;
-				for (PlayerInstance player : _registeredPlayers)
-				{
-					if (player == null)
-					{
-						continue;
-					}
-					
-					if (max < player.getLevel())
-					{
-						max = player.getLevel();
-						biggestLvlPlayer = player;
-					}
-				}
-				
-				if (biggestLvlPlayer == null)
-				{
-					continue;
-				}
-				
-				_registeredPlayers.remove(biggestLvlPlayer);
-				_teams.get(i + 1).add(biggestLvlPlayer);
-				biggestLvlPlayer.setEventStatus();
-				i = (i + 1) % _teamsNumber;
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("Event: " + e.getMessage());
-			return "Cannot start event, an error has occured.";
-		}
-		
-		return "The event has been successfully started.";
-	}
-	
-	/**
-	 * If the event state is OFF, it will not finish. Sets the event state to OFF, unregisters and resets the players, unspawns and clers the event NPCs, clears the teams, registered players, connection loss data, sets the teams number to 0, sets the event name to empty.
-	 * @return a string with information if the event has been successfully stopped or not.
-	 */
-	public static String finishEvent()
-	{
-		switch (eventState)
-		{
-			case OFF:
-			{
-				return "Cannot finish event, it is already off.";
-			}
-			case STANDBY:
-			{
-				for (PlayerInstance player : _registeredPlayers)
-				{
-					removeAndResetPlayer(player);
-				}
-				
-				unspawnEventNpcs();
-				// _npcs.clear();
-				_registeredPlayers.clear();
-				_teams.clear();
-				_connectionLossData.clear();
-				_teamsNumber = 0;
-				_eventName = "";
-				eventState = EventState.OFF;
-				return "The event has been stopped at STANDBY mode, all players unregistered and all event npcs unspawned.";
-			}
-			case ON:
-			{
-				for (List<PlayerInstance> teamList : _teams.values())
-				{
-					for (PlayerInstance player : teamList)
-					{
-						removeAndResetPlayer(player);
-					}
-				}
-				
-				eventState = EventState.OFF;
-				AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
-				unspawnEventNpcs(); // Just in case
-				// _npcs.clear();
-				_registeredPlayers.clear();
-				_teams.clear();
-				_connectionLossData.clear();
-				_teamsNumber = 0;
-				_eventName = "";
-				_npcId = 0;
-				_eventCreator = "";
-				_eventInfo = "";
-				return "The event has been stopped, all players unregistered and all event npcs unspawned.";
-			}
-		}
-		
-		return "The event has been successfully finished.";
-	}
-	
-	private static Map<PlayerInstance, Integer> sortByValue(Map<PlayerInstance, Integer> unsortMap)
-	{
-		final List<Entry<PlayerInstance, Integer>> list = new LinkedList<>(unsortMap.entrySet());
-		list.sort(Comparator.comparing(Entry::getValue));
-		
-		final Map<PlayerInstance, Integer> sortedMap = new LinkedHashMap<>();
-		for (Entry<PlayerInstance, Integer> entry : list)
-		{
-			sortedMap.put(entry.getKey(), entry.getValue());
-		}
-		return sortedMap;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEvent.java
deleted file mode 100644
index a5119abae7..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEvent.java
+++ /dev/null
@@ -1,1097 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.cache.HtmCache;
-import org.l2jmobius.gameserver.data.ItemTable;
-import org.l2jmobius.gameserver.data.SpawnTable;
-import org.l2jmobius.gameserver.data.xml.DoorData;
-import org.l2jmobius.gameserver.data.xml.SkillData;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
-import org.l2jmobius.gameserver.instancemanager.InstanceManager;
-import org.l2jmobius.gameserver.model.Spawn;
-import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.events.EventDispatcher;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventFinish;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventKill;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventRegistrationStart;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventStart;
-import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
-import org.l2jmobius.gameserver.model.skills.Skill;
-import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
-import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-
-/**
- * @author HorridoJoho
- */
-public class TvTEvent
-{
-	enum EventState
-	{
-		INACTIVE,
-		INACTIVATING,
-		PARTICIPATING,
-		STARTING,
-		STARTED,
-		REWARDING
-	}
-	
-	protected static final Logger LOGGER = Logger.getLogger(TvTEvent.class.getName());
-	
-	private static final String HTML_PATH = "data/scripts/custom/events/TvT/TvTManager/";
-	
-	private static TvTEventTeam[] _teams = new TvTEventTeam[2];
-	private static EventState _state = EventState.INACTIVE;
-	private static Spawn _npcSpawn = null;
-	private static Npc _lastNpcSpawn = null;
-	private static int _TvTEventInstance = 0;
-	
-	private TvTEvent()
-	{
-		// Prevent external initialization.
-	}
-	
-	/**
-	 * Teams initializing
-	 */
-	public static void init()
-	{
-		AntiFeedManager.getInstance().registerEvent(AntiFeedManager.TVT_ID);
-		_teams[0] = new TvTEventTeam(Config.TVT_EVENT_TEAM_1_NAME, Config.TVT_EVENT_TEAM_1_COORDINATES);
-		_teams[1] = new TvTEventTeam(Config.TVT_EVENT_TEAM_2_NAME, Config.TVT_EVENT_TEAM_2_COORDINATES);
-	}
-	
-	/**
-	 * Starts the participation of the TvTEvent<br>
-	 * 1. Get NpcTemplate by Config.TVT_EVENT_PARTICIPATION_NPC_ID<br>
-	 * 2. Try to spawn a new npc of it
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static boolean startParticipation()
-	{
-		try
-		{
-			_npcSpawn = new Spawn(Config.TVT_EVENT_PARTICIPATION_NPC_ID);
-			_npcSpawn.setXYZ(Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[0], Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[1], Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[2]);
-			_npcSpawn.setAmount(1);
-			_npcSpawn.setHeading(Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[3]);
-			_npcSpawn.setRespawnDelay(1);
-			// later no need to delete spawn from db, we don't store it (false)
-			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
-			_npcSpawn.init();
-			_lastNpcSpawn = _npcSpawn.getLastSpawn();
-			_lastNpcSpawn.setCurrentHp(_lastNpcSpawn.getMaxHp());
-			_lastNpcSpawn.setTitle("TvT Event Participation");
-			_lastNpcSpawn.isAggressive();
-			_lastNpcSpawn.decayMe();
-			_lastNpcSpawn.spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
-			_lastNpcSpawn.broadcastPacket(new MagicSkillUse(_lastNpcSpawn, _lastNpcSpawn, 1034, 1, 1, 1));
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "TvTEventEngine[TvTEvent.startParticipation()]: exception: " + e.getMessage(), e);
-			return false;
-		}
-		
-		setState(EventState.PARTICIPATING);
-		EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventRegistrationStart());
-		return true;
-	}
-	
-	private static int highestLevelPcInstanceOf(Map<Integer, PlayerInstance> players)
-	{
-		int maxLevel = Integer.MIN_VALUE;
-		int maxLevelId = -1;
-		for (PlayerInstance player : players.values())
-		{
-			if (player.getLevel() >= maxLevel)
-			{
-				maxLevel = player.getLevel();
-				maxLevelId = player.getObjectId();
-			}
-		}
-		return maxLevelId;
-	}
-	
-	/**
-	 * Starts the TvTEvent fight<br>
-	 * 1. Set state EventState.STARTING<br>
-	 * 2. Close doors specified in configs<br>
-	 * 3. Abort if not enough participants(return false)<br>
-	 * 4. Set state EventState.STARTED<br>
-	 * 5. Teleport all participants to team spot
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static boolean startFight()
-	{
-		// Set state to STARTING
-		setState(EventState.STARTING);
-		
-		// Randomize and balance team distribution
-		final Map<Integer, PlayerInstance> allParticipants = new HashMap<>();
-		allParticipants.putAll(_teams[0].getParticipatedPlayers());
-		allParticipants.putAll(_teams[1].getParticipatedPlayers());
-		_teams[0].cleanMe();
-		_teams[1].cleanMe();
-		
-		if (needParticipationFee())
-		{
-			for (PlayerInstance player : allParticipants.values())
-			{
-				if (!hasParticipationFee(player))
-				{
-					allParticipants.remove(player.getObjectId());
-				}
-			}
-		}
-		
-		final int[] balance =
-		{
-			0,
-			0
-		};
-		int priority = 0;
-		int highestLevelPlayerId;
-		PlayerInstance highestLevelPlayer;
-		// TODO: allParticipants should be sorted by level instead of using highestLevelPcInstanceOf for every fetch
-		while (!allParticipants.isEmpty())
-		{
-			// Priority team gets one player
-			highestLevelPlayerId = highestLevelPcInstanceOf(allParticipants);
-			highestLevelPlayer = allParticipants.get(highestLevelPlayerId);
-			allParticipants.remove(highestLevelPlayerId);
-			_teams[priority].addPlayer(highestLevelPlayer);
-			balance[priority] += highestLevelPlayer.getLevel();
-			// Exiting if no more players
-			if (allParticipants.isEmpty())
-			{
-				break;
-			}
-			// The other team gets one player
-			// TODO: Code not dry
-			priority = 1 - priority;
-			highestLevelPlayerId = highestLevelPcInstanceOf(allParticipants);
-			highestLevelPlayer = allParticipants.get(highestLevelPlayerId);
-			allParticipants.remove(highestLevelPlayerId);
-			_teams[priority].addPlayer(highestLevelPlayer);
-			balance[priority] += highestLevelPlayer.getLevel();
-			// Recalculating priority
-			priority = balance[0] > balance[1] ? 1 : 0;
-		}
-		
-		// Check for enought participants
-		if ((_teams[0].getParticipatedPlayerCount() < Config.TVT_EVENT_MIN_PLAYERS_IN_TEAMS) || (_teams[1].getParticipatedPlayerCount() < Config.TVT_EVENT_MIN_PLAYERS_IN_TEAMS))
-		{
-			// Set state INACTIVE
-			setState(EventState.INACTIVE);
-			// Cleanup of teams
-			_teams[0].cleanMe();
-			_teams[1].cleanMe();
-			// Unspawn the event NPC
-			unSpawnNpc();
-			AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
-			return false;
-		}
-		
-		if (needParticipationFee())
-		{
-			for (PlayerInstance player : _teams[0].getParticipatedPlayers().values())
-			{
-				if (!payParticipationFee(player))
-				{
-					_teams[0].removePlayer(player.getObjectId());
-				}
-			}
-			for (PlayerInstance player : _teams[1].getParticipatedPlayers().values())
-			{
-				if (!payParticipationFee(player))
-				{
-					_teams[1].removePlayer(player.getObjectId());
-				}
-			}
-		}
-		
-		if (Config.TVT_EVENT_IN_INSTANCE)
-		{
-			try
-			{
-				_TvTEventInstance = InstanceManager.getInstance().createDynamicInstance(Config.TVT_EVENT_INSTANCE_ID).getId();
-				InstanceManager.getInstance().getInstance(_TvTEventInstance).setAllowSummon(false);
-				InstanceManager.getInstance().getInstance(_TvTEventInstance).setPvP(true);
-				InstanceManager.getInstance().getInstance(_TvTEventInstance).setEmptyDestroyTime((Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY * 1000) + 60000);
-			}
-			catch (Exception e)
-			{
-				_TvTEventInstance = 0;
-				LOGGER.log(Level.WARNING, "TvTEventEngine[TvTEvent.createDynamicInstance]: exception: " + e.getMessage(), e);
-			}
-		}
-		
-		// Opens all doors specified in configs for tvt
-		openDoors(Config.TVT_DOORS_IDS_TO_OPEN);
-		// Closes all doors specified in configs for tvt
-		closeDoors(Config.TVT_DOORS_IDS_TO_CLOSE);
-		// Set state STARTED
-		setState(EventState.STARTED);
-		
-		// Iterate over all teams
-		for (TvTEventTeam team : _teams)
-		{
-			// Iterate over all participated player instances in this team
-			for (PlayerInstance playerInstance : team.getParticipatedPlayers().values())
-			{
-				if (playerInstance != null)
-				{
-					// Disable player revival.
-					playerInstance.setCanRevive(false);
-					// Teleporter implements Runnable and starts itself
-					new TvTEventTeleporter(playerInstance, team.getCoordinates(), false, false);
-				}
-			}
-		}
-		
-		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventStart());
-		return true;
-	}
-	
-	/**
-	 * Calculates the TvTEvent reward<br>
-	 * 1. If both teams are at a tie(points equals), send it as system message to all participants, if one of the teams have 0 participants left online abort rewarding<br>
-	 * 2. Wait till teams are not at a tie anymore<br>
-	 * 3. Set state EvcentState.REWARDING<br>
-	 * 4. Reward team with more points<br>
-	 * 5. Show win html to wining team participants
-	 * @return String: winning team name
-	 */
-	public static String calculateRewards()
-	{
-		if (_teams[0].getPoints() == _teams[1].getPoints())
-		{
-			// Check if one of the teams have no more players left
-			if ((_teams[0].getParticipatedPlayerCount() == 0) || (_teams[1].getParticipatedPlayerCount() == 0))
-			{
-				// set state to rewarding
-				setState(EventState.REWARDING);
-				// return here, the fight can't be completed
-				return "TvT Event: Event has ended. No team won due to inactivity!";
-			}
-			
-			// Both teams have equals points
-			sysMsgToAllParticipants("TvT Event: Event has ended, both teams have tied.");
-			if (Config.TVT_REWARD_TEAM_TIE)
-			{
-				rewardTeam(_teams[0]);
-				rewardTeam(_teams[1]);
-				return "TvT Event: Event has ended with both teams tying.";
-			}
-			return "TvT Event: Event has ended with both teams tying.";
-		}
-		
-		// Set state REWARDING so nobody can point anymore
-		setState(EventState.REWARDING);
-		
-		// Get team which has more points
-		final TvTEventTeam team = _teams[_teams[0].getPoints() > _teams[1].getPoints() ? 0 : 1];
-		rewardTeam(team);
-		
-		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventFinish());
-		return "TvT Event: Event finish. Team " + team.getName() + " won with " + team.getPoints() + " kills.";
-	}
-	
-	private static void rewardTeam(TvTEventTeam team)
-	{
-		// Iterate over all participated player instances of the winning team
-		for (PlayerInstance playerInstance : team.getParticipatedPlayers().values())
-		{
-			// Check for nullpointer
-			if (playerInstance == null)
-			{
-				continue;
-			}
-			
-			SystemMessage systemMessage = null;
-			
-			// Iterate over all tvt event rewards
-			for (int[] reward : Config.TVT_EVENT_REWARDS)
-			{
-				final PlayerInventory inv = playerInstance.getInventory();
-				
-				// Check for stackable item, non stackabe items need to be added one by one
-				if (ItemTable.getInstance().getTemplate(reward[0]).isStackable())
-				{
-					inv.addItem("TvT Event", reward[0], reward[1], playerInstance, playerInstance);
-					if (reward[1] > 1)
-					{
-						systemMessage = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
-						systemMessage.addItemName(reward[0]);
-						systemMessage.addLong(reward[1]);
-					}
-					else
-					{
-						systemMessage = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-						systemMessage.addItemName(reward[0]);
-					}
-					
-					playerInstance.sendPacket(systemMessage);
-				}
-				else
-				{
-					for (int i = 0; i < reward[1]; ++i)
-					{
-						inv.addItem("TvT Event", reward[0], 1, playerInstance, playerInstance);
-						systemMessage = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
-						systemMessage.addItemName(reward[0]);
-						playerInstance.sendPacket(systemMessage);
-					}
-				}
-			}
-			
-			final StatusUpdate statusUpdate = new StatusUpdate(playerInstance);
-			final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage();
-			statusUpdate.addAttribute(StatusUpdate.CUR_LOAD, playerInstance.getCurrentLoad());
-			npcHtmlMessage.setHtml(HtmCache.getInstance().getHtm(playerInstance, HTML_PATH + "Reward.html"));
-			playerInstance.sendPacket(statusUpdate);
-			playerInstance.sendPacket(npcHtmlMessage);
-		}
-	}
-	
-	/**
-	 * Stops the TvTEvent fight<br>
-	 * 1. Set state EventState.INACTIVATING<br>
-	 * 2. Remove tvt npc from world<br>
-	 * 3. Open doors specified in configs<br>
-	 * 4. Teleport all participants back to participation npc location<br>
-	 * 5. Teams cleaning<br>
-	 * 6. Set state EventState.INACTIVE
-	 */
-	public static void stopFight()
-	{
-		// Set state INACTIVATING
-		setState(EventState.INACTIVATING);
-		// Unspawn event npc
-		unSpawnNpc();
-		// Opens all doors specified in configs for tvt
-		openDoors(Config.TVT_DOORS_IDS_TO_CLOSE);
-		// Closes all doors specified in Configs for tvt
-		closeDoors(Config.TVT_DOORS_IDS_TO_OPEN);
-		
-		// Iterate over all teams
-		for (TvTEventTeam team : _teams)
-		{
-			for (PlayerInstance playerInstance : team.getParticipatedPlayers().values())
-			{
-				// Check for nullpointer
-				if (playerInstance != null)
-				{
-					// Enable player revival.
-					playerInstance.setCanRevive(true);
-					// Teleport back.
-					new TvTEventTeleporter(playerInstance, Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES, false, false);
-				}
-			}
-		}
-		
-		// Cleanup of teams
-		_teams[0].cleanMe();
-		_teams[1].cleanMe();
-		// Set state INACTIVE
-		setState(EventState.INACTIVE);
-		AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
-	}
-	
-	/**
-	 * Adds a player to a TvTEvent team<br>
-	 * 1. Calculate the id of the team in which the player should be added<br>
-	 * 2. Add the player to the calculated team
-	 * @param playerInstance as PlayerInstance
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static synchronized boolean addParticipant(PlayerInstance playerInstance)
-	{
-		// Check for nullpoitner
-		if (playerInstance == null)
-		{
-			return false;
-		}
-		
-		byte teamId = 0;
-		
-		// Check to which team the player should be added
-		if (_teams[0].getParticipatedPlayerCount() == _teams[1].getParticipatedPlayerCount())
-		{
-			teamId = (byte) Rnd.get(2);
-		}
-		else
-		{
-			teamId = (byte) (_teams[0].getParticipatedPlayerCount() > _teams[1].getParticipatedPlayerCount() ? 1 : 0);
-		}
-		playerInstance.addEventListener(new TvTEventListener(playerInstance));
-		return _teams[teamId].addPlayer(playerInstance);
-	}
-	
-	/**
-	 * Removes a TvTEvent player from it's team<br>
-	 * 1. Get team id of the player<br>
-	 * 2. Remove player from it's team
-	 * @param playerObjectId
-	 * @return boolean: true if success, otherwise false
-	 */
-	public static boolean removeParticipant(int playerObjectId)
-	{
-		// Get the teamId of the player
-		final byte teamId = getParticipantTeamId(playerObjectId);
-		
-		// Check if the player is participant
-		if (teamId != -1)
-		{
-			// Remove the player from team
-			_teams[teamId].removePlayer(playerObjectId);
-			
-			final PlayerInstance player = World.getInstance().getPlayer(playerObjectId);
-			if (player != null)
-			{
-				player.removeEventListener(TvTEventListener.class);
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	public static boolean needParticipationFee()
-	{
-		return (Config.TVT_EVENT_PARTICIPATION_FEE[0] != 0) && (Config.TVT_EVENT_PARTICIPATION_FEE[1] != 0);
-	}
-	
-	public static boolean hasParticipationFee(PlayerInstance playerInstance)
-	{
-		return playerInstance.getInventory().getInventoryItemCount(Config.TVT_EVENT_PARTICIPATION_FEE[0], -1) >= Config.TVT_EVENT_PARTICIPATION_FEE[1];
-	}
-	
-	public static boolean payParticipationFee(PlayerInstance playerInstance)
-	{
-		return playerInstance.destroyItemByItemId("TvT Participation Fee", Config.TVT_EVENT_PARTICIPATION_FEE[0], Config.TVT_EVENT_PARTICIPATION_FEE[1], _lastNpcSpawn, true);
-	}
-	
-	public static String getParticipationFee()
-	{
-		final int itemId = Config.TVT_EVENT_PARTICIPATION_FEE[0];
-		final int itemNum = Config.TVT_EVENT_PARTICIPATION_FEE[1];
-		if ((itemId == 0) || (itemNum == 0))
-		{
-			return "-";
-		}
-		return itemNum + " " + ItemTable.getInstance().getTemplate(itemId).getName();
-	}
-	
-	/**
-	 * Send a SystemMessage to all participated players<br>
-	 * 1. Send the message to all players of team number one<br>
-	 * 2. Send the message to all players of team number two
-	 * @param message as String
-	 */
-	public static void sysMsgToAllParticipants(String message)
-	{
-		for (PlayerInstance playerInstance : _teams[0].getParticipatedPlayers().values())
-		{
-			if (playerInstance != null)
-			{
-				playerInstance.sendMessage(message);
-			}
-		}
-		
-		for (PlayerInstance playerInstance : _teams[1].getParticipatedPlayers().values())
-		{
-			if (playerInstance != null)
-			{
-				playerInstance.sendMessage(message);
-			}
-		}
-	}
-	
-	private static DoorInstance getDoor(int doorId)
-	{
-		DoorInstance door = null;
-		if (_TvTEventInstance <= 0)
-		{
-			door = DoorData.getInstance().getDoor(doorId);
-		}
-		else
-		{
-			final Instance inst = InstanceManager.getInstance().getInstance(_TvTEventInstance);
-			if (inst != null)
-			{
-				door = inst.getDoor(doorId);
-			}
-		}
-		return door;
-	}
-	
-	/**
-	 * Close doors specified in configs
-	 * @param doors
-	 */
-	private static void closeDoors(List<Integer> doors)
-	{
-		for (int doorId : doors)
-		{
-			final DoorInstance doorInstance = getDoor(doorId);
-			if (doorInstance != null)
-			{
-				doorInstance.closeMe();
-			}
-		}
-	}
-	
-	/**
-	 * Open doors specified in configs
-	 * @param doors
-	 */
-	private static void openDoors(List<Integer> doors)
-	{
-		for (int doorId : doors)
-		{
-			final DoorInstance doorInstance = getDoor(doorId);
-			if (doorInstance != null)
-			{
-				doorInstance.openMe();
-			}
-		}
-	}
-	
-	/**
-	 * UnSpawns the TvTEvent npc
-	 */
-	private static void unSpawnNpc()
-	{
-		// Delete the npc
-		_lastNpcSpawn.deleteMe();
-		SpawnTable.getInstance().deleteSpawn(_lastNpcSpawn.getSpawn(), false);
-		// Stop respawning of the npc
-		_npcSpawn.stopRespawn();
-		_npcSpawn = null;
-		_lastNpcSpawn = null;
-	}
-	
-	/**
-	 * Called when a player logs in
-	 * @param playerInstance as PlayerInstance
-	 */
-	public static void onLogin(PlayerInstance playerInstance)
-	{
-		if ((playerInstance == null) || (!isStarting() && !isStarted()))
-		{
-			return;
-		}
-		
-		final byte teamId = getParticipantTeamId(playerInstance.getObjectId());
-		if (teamId == -1)
-		{
-			return;
-		}
-		
-		_teams[teamId].addPlayer(playerInstance);
-		new TvTEventTeleporter(playerInstance, _teams[teamId].getCoordinates(), true, false);
-	}
-	
-	/**
-	 * Called when a player logs out
-	 * @param playerInstance as PlayerInstance
-	 */
-	public static void onLogout(PlayerInstance playerInstance)
-	{
-		if ((playerInstance != null) && (isStarting() || isStarted() || isParticipating()) && removeParticipant(playerInstance.getObjectId()))
-		{
-			playerInstance.setXYZInvisible((Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[0] + Rnd.get(101)) - 50, (Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[1] + Rnd.get(101)) - 50, Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[2]);
-		}
-	}
-	
-	/**
-	 * Called on every onAction in PlayerIstance
-	 * @param playerInstance
-	 * @param targetedPlayerObjectId
-	 * @return boolean: true if player is allowed to target, otherwise false
-	 */
-	public static boolean onAction(PlayerInstance playerInstance, int targetedPlayerObjectId)
-	{
-		if ((playerInstance == null) || !isStarted())
-		{
-			return true;
-		}
-		
-		if (playerInstance.isGM())
-		{
-			return true;
-		}
-		
-		final byte playerTeamId = getParticipantTeamId(playerInstance.getObjectId());
-		final byte targetedPlayerTeamId = getParticipantTeamId(targetedPlayerObjectId);
-		if (((playerTeamId != -1) && (targetedPlayerTeamId == -1)) || ((playerTeamId == -1) && (targetedPlayerTeamId != -1)))
-		{
-			return false;
-		}
-		
-		if ((playerTeamId != -1) && (targetedPlayerTeamId != -1) && (playerTeamId == targetedPlayerTeamId) && (playerInstance.getObjectId() != targetedPlayerObjectId) && !Config.TVT_EVENT_TARGET_TEAM_MEMBERS_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every scroll use
-	 * @param playerObjectId
-	 * @return boolean: true if player is allowed to use scroll, otherwise false
-	 */
-	public static boolean onScrollUse(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId) && !Config.TVT_EVENT_SCROLL_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every potion use
-	 * @param playerObjectId
-	 * @return boolean: true if player is allowed to use potions, otherwise false
-	 */
-	public static boolean onPotionUse(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId) && !Config.TVT_EVENT_POTIONS_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every escape use(thanks to nbd)
-	 * @param playerObjectId
-	 * @return boolean: true if player is not in tvt event, otherwise false
-	 */
-	public static boolean onEscapeUse(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId))
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Called on every summon item use
-	 * @param playerObjectId
-	 * @return boolean: true if player is allowed to summon by item, otherwise false
-	 */
-	public static boolean onItemSummon(int playerObjectId)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		
-		if (isPlayerParticipant(playerObjectId) && !Config.TVT_EVENT_SUMMON_BY_ITEM_ALLOWED)
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Is called when a player is killed
-	 * @param killerCharacter as Creature
-	 * @param killedPlayerInstance as PlayerInstance
-	 */
-	public static void onKill(Creature killerCharacter, PlayerInstance killedPlayerInstance)
-	{
-		if ((killedPlayerInstance == null) || !isStarted())
-		{
-			return;
-		}
-		
-		final byte killedTeamId = getParticipantTeamId(killedPlayerInstance.getObjectId());
-		if (killedTeamId == -1)
-		{
-			return;
-		}
-		
-		new TvTEventTeleporter(killedPlayerInstance, _teams[killedTeamId].getCoordinates(), false, false);
-		if (killerCharacter == null)
-		{
-			return;
-		}
-		
-		PlayerInstance killerPlayerInstance = null;
-		if (killerCharacter.isPet() || killerCharacter.isServitor())
-		{
-			killerPlayerInstance = ((Summon) killerCharacter).getOwner();
-			if (killerPlayerInstance == null)
-			{
-				return;
-			}
-		}
-		else if (killerCharacter.isPlayer())
-		{
-			killerPlayerInstance = (PlayerInstance) killerCharacter;
-		}
-		else
-		{
-			return;
-		}
-		
-		final byte killerTeamId = getParticipantTeamId(killerPlayerInstance.getObjectId());
-		if ((killerTeamId != -1) && (killedTeamId != -1) && (killerTeamId != killedTeamId))
-		{
-			final TvTEventTeam killerTeam = _teams[killerTeamId];
-			killerTeam.increasePoints();
-			
-			final CreatureSay cs = new CreatureSay(killerPlayerInstance, ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!");
-			for (PlayerInstance playerInstance : _teams[killerTeamId].getParticipatedPlayers().values())
-			{
-				if (playerInstance != null)
-				{
-					playerInstance.sendPacket(cs);
-				}
-			}
-			
-			// Notify to scripts.
-			EventDispatcher.getInstance().notifyEventAsync(new OnTvTEventKill(killerPlayerInstance, killedPlayerInstance, killerTeam));
-		}
-	}
-	
-	/**
-	 * Called on Appearing packet received (player finished teleporting)
-	 * @param playerInstance
-	 */
-	public static void onTeleported(PlayerInstance playerInstance)
-	{
-		if (!isStarted() || (playerInstance == null) || !isPlayerParticipant(playerInstance.getObjectId()))
-		{
-			return;
-		}
-		
-		if (playerInstance.isMageClass())
-		{
-			if ((Config.TVT_EVENT_MAGE_BUFFS != null) && !Config.TVT_EVENT_MAGE_BUFFS.isEmpty())
-			{
-				for (Entry<Integer, Integer> e : Config.TVT_EVENT_MAGE_BUFFS.entrySet())
-				{
-					final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue());
-					if (skill != null)
-					{
-						skill.applyEffects(playerInstance, playerInstance);
-					}
-				}
-			}
-		}
-		else if ((Config.TVT_EVENT_FIGHTER_BUFFS != null) && !Config.TVT_EVENT_FIGHTER_BUFFS.isEmpty())
-		{
-			for (Entry<Integer, Integer> e : Config.TVT_EVENT_FIGHTER_BUFFS.entrySet())
-			{
-				final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue());
-				if (skill != null)
-				{
-					skill.applyEffects(playerInstance, playerInstance);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * @param source
-	 * @param target
-	 * @param skill
-	 * @return true if player valid for skill
-	 */
-	public static boolean checkForTvTSkill(PlayerInstance source, PlayerInstance target, Skill skill)
-	{
-		if (!isStarted())
-		{
-			return true;
-		}
-		// TvT is started
-		final int sourcePlayerId = source.getObjectId();
-		final int targetPlayerId = target.getObjectId();
-		final boolean isSourceParticipant = isPlayerParticipant(sourcePlayerId);
-		final boolean isTargetParticipant = isPlayerParticipant(targetPlayerId);
-		
-		// both players not participating
-		if (!isSourceParticipant && !isTargetParticipant)
-		{
-			return true;
-		}
-		// one player not participating
-		if (!(isSourceParticipant && isTargetParticipant))
-		{
-			return false;
-		}
-		// players in the different teams ?
-		if ((getParticipantTeamId(sourcePlayerId) != getParticipantTeamId(targetPlayerId)) && !skill.isBad())
-		{
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Sets the TvTEvent state
-	 * @param state as EventState
-	 */
-	private static void setState(EventState state)
-	{
-		synchronized (_state)
-		{
-			_state = state;
-		}
-	}
-	
-	/**
-	 * Is TvTEvent inactive?
-	 * @return boolean: true if event is inactive(waiting for next event cycle), otherwise false
-	 */
-	public static boolean isInactive()
-	{
-		boolean isInactive;
-		
-		synchronized (_state)
-		{
-			isInactive = _state == EventState.INACTIVE;
-		}
-		return isInactive;
-	}
-	
-	/**
-	 * Is TvTEvent in inactivating?
-	 * @return boolean: true if event is in inactivating progress, otherwise false
-	 */
-	public static boolean isInactivating()
-	{
-		boolean isInactivating;
-		
-		synchronized (_state)
-		{
-			isInactivating = _state == EventState.INACTIVATING;
-		}
-		return isInactivating;
-	}
-	
-	/**
-	 * Is TvTEvent in participation?
-	 * @return boolean: true if event is in participation progress, otherwise false
-	 */
-	public static boolean isParticipating()
-	{
-		boolean isParticipating;
-		
-		synchronized (_state)
-		{
-			isParticipating = _state == EventState.PARTICIPATING;
-		}
-		return isParticipating;
-	}
-	
-	/**
-	 * Is TvTEvent starting?
-	 * @return boolean: true if event is starting up(setting up fighting spot, teleport players etc.), otherwise false
-	 */
-	public static boolean isStarting()
-	{
-		boolean isStarting;
-		
-		synchronized (_state)
-		{
-			isStarting = _state == EventState.STARTING;
-		}
-		return isStarting;
-	}
-	
-	/**
-	 * Is TvTEvent started?
-	 * @return boolean: true if event is started, otherwise false
-	 */
-	public static boolean isStarted()
-	{
-		boolean isStarted;
-		
-		synchronized (_state)
-		{
-			isStarted = _state == EventState.STARTED;
-		}
-		return isStarted;
-	}
-	
-	/**
-	 * Is TvTEvent rewarding?
-	 * @return boolean: true if event is currently rewarding, otherwise false
-	 */
-	public static boolean isRewarding()
-	{
-		boolean isRewarding;
-		
-		synchronized (_state)
-		{
-			isRewarding = _state == EventState.REWARDING;
-		}
-		return isRewarding;
-	}
-	
-	/**
-	 * Returns the team id of a player, if player is not participant it returns -1
-	 * @param playerObjectId
-	 * @return byte: team name of the given playerName, if not in event -1
-	 */
-	public static byte getParticipantTeamId(int playerObjectId)
-	{
-		return (byte) (_teams[0].containsPlayer(playerObjectId) ? 0 : (_teams[1].containsPlayer(playerObjectId) ? 1 : -1));
-	}
-	
-	/**
-	 * Returns the team of a player, if player is not participant it returns null
-	 * @param playerObjectId
-	 * @return TvTEventTeam: team of the given playerObjectId, if not in event null
-	 */
-	public static TvTEventTeam getParticipantTeam(int playerObjectId)
-	{
-		return _teams[0].containsPlayer(playerObjectId) ? _teams[0] : (_teams[1].containsPlayer(playerObjectId) ? _teams[1] : null);
-	}
-	
-	/**
-	 * Returns the enemy team of a player, if player is not participant it returns null
-	 * @param playerObjectId
-	 * @return TvTEventTeam: enemy team of the given playerObjectId, if not in event null
-	 */
-	public static TvTEventTeam getParticipantEnemyTeam(int playerObjectId)
-	{
-		return (_teams[0].containsPlayer(playerObjectId) ? _teams[1] : (_teams[1].containsPlayer(playerObjectId) ? _teams[0] : null));
-	}
-	
-	/**
-	 * Returns the team coordinates in which the player is in, if player is not in a team return null
-	 * @param playerObjectId
-	 * @return int[]: coordinates of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static int[] getParticipantTeamCoordinates(int playerObjectId)
-	{
-		return _teams[0].containsPlayer(playerObjectId) ? _teams[0].getCoordinates() : (_teams[1].containsPlayer(playerObjectId) ? _teams[1].getCoordinates() : null);
-	}
-	
-	/**
-	 * Is given player participant of the event?
-	 * @param playerObjectId
-	 * @return boolean: true if player is participant, ohterwise false
-	 */
-	public static boolean isPlayerParticipant(int playerObjectId)
-	{
-		return (isParticipating() || isStarting() || isStarted()) && (_teams[0].containsPlayer(playerObjectId) || _teams[1].containsPlayer(playerObjectId));
-	}
-	
-	/**
-	 * Returns participated player count
-	 * @return int: amount of players registered in the event
-	 */
-	public static int getParticipatedPlayersCount()
-	{
-		return !isParticipating() && !isStarting() && !isStarted() ? 0 : _teams[0].getParticipatedPlayerCount() + _teams[1].getParticipatedPlayerCount();
-	}
-	
-	/**
-	 * Returns teams names
-	 * @return String[]: names of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static String[] getTeamNames()
-	{
-		return new String[]
-		{
-			_teams[0].getName(),
-			_teams[1].getName()
-		};
-	}
-	
-	/**
-	 * Returns player count of both teams
-	 * @return int[]: player count of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static int[] getTeamsPlayerCounts()
-	{
-		return new int[]
-		{
-			_teams[0].getParticipatedPlayerCount(),
-			_teams[1].getParticipatedPlayerCount()
-		};
-	}
-	
-	/**
-	 * Returns points count of both teams
-	 * @return int[]: points of teams, 2 elements, index 0 for team 1 and index 1 for team 2
-	 */
-	public static int[] getTeamsPoints()
-	{
-		return new int[]
-		{
-			_teams[0].getPoints(),
-			_teams[1].getPoints()
-		};
-	}
-	
-	public static int getTvTEventInstance()
-	{
-		return _TvTEventInstance;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventListener.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventListener.java
deleted file mode 100644
index 43fe8e6d36..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventListener.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.interfaces.IEventListener;
-
-/**
- * @author UnAfraid
- */
-public class TvTEventListener implements IEventListener
-{
-	private final PlayerInstance _player;
-	
-	protected TvTEventListener(PlayerInstance player)
-	{
-		_player = player;
-	}
-	
-	@Override
-	public boolean isOnEvent()
-	{
-		return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_player.getObjectId());
-	}
-	
-	@Override
-	public boolean isBlockingExit()
-	{
-		return true;
-	}
-	
-	@Override
-	public boolean isBlockingDeathPenalty()
-	{
-		return true;
-	}
-	
-	@Override
-	public boolean canRevive()
-	{
-		return false;
-	}
-	
-	@Override
-	public PlayerInstance getPlayer()
-	{
-		return _player;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventPlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventPlayer.java
deleted file mode 100644
index bd7c43d75c..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventPlayer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-/**
- * @author UnAfraid
- */
-public class TvTEventPlayer
-{
-	private final PlayerInstance _player;
-	
-	protected TvTEventPlayer(PlayerInstance player)
-	{
-		_player = player;
-	}
-	
-	public boolean isOnEvent()
-	{
-		return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_player.getObjectId());
-	}
-	
-	public boolean isBlockingExit()
-	{
-		return true;
-	}
-	
-	public boolean isBlockingDeathPenalty()
-	{
-		return true;
-	}
-	
-	public boolean canRevive()
-	{
-		return false;
-	}
-	
-	public PlayerInstance getPlayer()
-	{
-		return _player;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeam.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeam.java
deleted file mode 100644
index 8997873c2e..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeam.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-/**
- * @author HorridoJoho
- */
-public class TvTEventTeam
-{
-	/**
-	 * The name of the team
-	 */
-	private final String _name;
-	/**
-	 * The team spot coordinated
-	 */
-	private int[] _coordinates = new int[3];
-	/**
-	 * The points of the team
-	 */
-	private short _points;
-	/** Name and instance of all participated players in map. */
-	private final Map<Integer, PlayerInstance> _participatedPlayers = new ConcurrentHashMap<>();
-	
-	/**
-	 * C'tor initialize the team
-	 * @param name as String
-	 * @param coordinates as int[]
-	 */
-	public TvTEventTeam(String name, int[] coordinates)
-	{
-		_name = name;
-		_coordinates = coordinates;
-		_points = 0;
-	}
-	
-	/**
-	 * Adds a player to the team
-	 * @param playerInstance as PlayerInstance
-	 * @return boolean: true if success, otherwise false
-	 */
-	public boolean addPlayer(PlayerInstance playerInstance)
-	{
-		if (playerInstance == null)
-		{
-			return false;
-		}
-		
-		_participatedPlayers.put(playerInstance.getObjectId(), playerInstance);
-		
-		return true;
-	}
-	
-	/**
-	 * Removes a player from the team
-	 * @param playerObjectId
-	 */
-	public void removePlayer(int playerObjectId)
-	{
-		_participatedPlayers.remove(playerObjectId);
-	}
-	
-	/**
-	 * Increases the points of the team
-	 */
-	public void increasePoints()
-	{
-		++_points;
-	}
-	
-	/**
-	 * Cleanup the team and make it ready for adding players again
-	 */
-	public void cleanMe()
-	{
-		_participatedPlayers.clear();
-		_points = 0;
-	}
-	
-	/**
-	 * Is given player in this team?
-	 * @param playerObjectId
-	 * @return boolean: true if player is in this team, otherwise false
-	 */
-	public boolean containsPlayer(int playerObjectId)
-	{
-		return _participatedPlayers.containsKey(playerObjectId);
-	}
-	
-	/**
-	 * Returns the name of the team
-	 * @return String: name of the team
-	 */
-	public String getName()
-	{
-		return _name;
-	}
-	
-	/**
-	 * Returns the coordinates of the team spot
-	 * @return int[]: team coordinates
-	 */
-	public int[] getCoordinates()
-	{
-		return _coordinates;
-	}
-	
-	/**
-	 * Returns the points of the team
-	 * @return short: team points
-	 */
-	public short getPoints()
-	{
-		return _points;
-	}
-	
-	/**
-	 * Returns name and instance of all participated players in Map
-	 * @return Map<String, PlayerInstance>: map of players in this team
-	 */
-	public Map<Integer, PlayerInstance> getParticipatedPlayers()
-	{
-		return _participatedPlayers;
-	}
-	
-	/**
-	 * Returns player count of this team
-	 * @return int: number of players in team
-	 */
-	public int getParticipatedPlayerCount()
-	{
-		return _participatedPlayers.size();
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeleporter.java
deleted file mode 100644
index 66c8683529..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTEventTeleporter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.enums.Team;
-import org.l2jmobius.gameserver.model.Duel;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-public class TvTEventTeleporter implements Runnable
-{
-	/** The instance of the player to teleport */
-	private PlayerInstance _playerInstance = null;
-	/** Coordinates of the spot to teleport to */
-	private int[] _coordinates = new int[3];
-	/** Admin removed this player from event */
-	private boolean _adminRemove = false;
-	
-	/**
-	 * Initialize the teleporter and start the delayed task.
-	 * @param playerInstance
-	 * @param coordinates
-	 * @param fastSchedule
-	 * @param adminRemove
-	 */
-	public TvTEventTeleporter(PlayerInstance playerInstance, int[] coordinates, boolean fastSchedule, boolean adminRemove)
-	{
-		_playerInstance = playerInstance;
-		_coordinates = coordinates;
-		_adminRemove = adminRemove;
-		ThreadPool.schedule(this, fastSchedule ? 0 : (TvTEvent.isStarted() ? Config.TVT_EVENT_RESPAWN_TELEPORT_DELAY : Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY) * 1000);
-	}
-	
-	/**
-	 * The task method to teleport the player<br>
-	 * 1. Unsummon pet if there is one<br>
-	 * 2. Remove all effects<br>
-	 * 3. Revive and full heal the player<br>
-	 * 4. Teleport the player<br>
-	 * 5. Broadcast status and user info
-	 */
-	@Override
-	public void run()
-	{
-		if (_playerInstance == null)
-		{
-			return;
-		}
-		
-		final Summon summon = _playerInstance.getSummon();
-		if (summon != null)
-		{
-			summon.unSummon(_playerInstance);
-		}
-		
-		if ((Config.TVT_EVENT_EFFECTS_REMOVAL == 0) || ((Config.TVT_EVENT_EFFECTS_REMOVAL == 1) && ((_playerInstance.getTeam() == Team.NONE) || (_playerInstance.isInDuel() && (_playerInstance.getDuelState() != Duel.DUELSTATE_INTERRUPTED)))))
-		{
-			_playerInstance.stopAllEffectsExceptThoseThatLastThroughDeath();
-		}
-		
-		if (_playerInstance.isInDuel())
-		{
-			_playerInstance.setDuelState(Duel.DUELSTATE_INTERRUPTED);
-		}
-		
-		final int TvTInstance = TvTEvent.getTvTEventInstance();
-		if (TvTInstance != 0)
-		{
-			if (TvTEvent.isStarted() && !_adminRemove)
-			{
-				_playerInstance.setInstanceId(TvTInstance);
-			}
-			else
-			{
-				_playerInstance.setInstanceId(0);
-			}
-		}
-		else
-		{
-			_playerInstance.setInstanceId(0);
-		}
-		
-		_playerInstance.doRevive();
-		
-		_playerInstance.teleToLocation((_coordinates[0] + Rnd.get(101)) - 50, (_coordinates[1] + Rnd.get(101)) - 50, _coordinates[2], false);
-		if (TvTEvent.isStarted() && !_adminRemove)
-		{
-			final int teamId = TvTEvent.getParticipantTeamId(_playerInstance.getObjectId()) + 1;
-			switch (teamId)
-			{
-				case 0:
-				{
-					_playerInstance.setTeam(Team.NONE);
-					break;
-				}
-				case 1:
-				{
-					_playerInstance.setTeam(Team.BLUE);
-					break;
-				}
-				case 2:
-				{
-					_playerInstance.setTeam(Team.RED);
-					break;
-				}
-			}
-		}
-		else
-		{
-			_playerInstance.setTeam(Team.NONE);
-		}
-		
-		_playerInstance.setCurrentCp(_playerInstance.getMaxCp());
-		_playerInstance.setCurrentHp(_playerInstance.getMaxHp());
-		_playerInstance.setCurrentMp(_playerInstance.getMaxMp());
-		
-		_playerInstance.broadcastStatusUpdate();
-		_playerInstance.broadcastUserInfo();
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTManager.java
deleted file mode 100644
index 56ab43c0e8..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTManager.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager.events;
-
-import java.util.Calendar;
-import java.util.concurrent.ScheduledFuture;
-import java.util.logging.Logger;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.commons.threads.ThreadPool;
-import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.gameserver.util.Broadcast;
-
-/**
- * @author HorridoJoho
- */
-public class TvTManager
-{
-	protected static final Logger LOGGER = Logger.getLogger(TvTManager.class.getName());
-	
-	/**
-	 * Task for event cycles
-	 */
-	private TvTStartTask _task;
-	
-	/**
-	 * New instance only by getInstance()
-	 */
-	protected TvTManager()
-	{
-		if (Config.TVT_EVENT_ENABLED)
-		{
-			TvTEvent.init();
-			
-			scheduleEventStart();
-			LOGGER.info("TvTEventEngine[TvTManager.TvTManager()]: Started.");
-		}
-		else
-		{
-			LOGGER.info("TvTEventEngine[TvTManager.TvTManager()]: Engine is disabled.");
-		}
-	}
-	
-	/**
-	 * Initialize new/Returns the one and only instance
-	 * @return TvTManager
-	 */
-	public static TvTManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	/**
-	 * Starts TvTStartTask
-	 */
-	public void scheduleEventStart()
-	{
-		try
-		{
-			final Calendar currentTime = Calendar.getInstance();
-			Calendar nextStartTime = null;
-			Calendar testStartTime = null;
-			for (String timeOfDay : Config.TVT_EVENT_INTERVAL)
-			{
-				// Creating a Calendar object from the specified interval value
-				testStartTime = Calendar.getInstance();
-				testStartTime.setLenient(true);
-				final String[] splitTimeOfDay = timeOfDay.split(":");
-				testStartTime.set(Calendar.HOUR_OF_DAY, Integer.parseInt(splitTimeOfDay[0]));
-				testStartTime.set(Calendar.MINUTE, Integer.parseInt(splitTimeOfDay[1]));
-				// If the date is in the past, make it the next day (Example: Checking for "1:00", when the time is 23:57.)
-				if (testStartTime.getTimeInMillis() < currentTime.getTimeInMillis())
-				{
-					testStartTime.add(Calendar.DAY_OF_MONTH, 1);
-				}
-				// Check for the test date to be the minimum (smallest in the specified list)
-				if ((nextStartTime == null) || (testStartTime.getTimeInMillis() < nextStartTime.getTimeInMillis()))
-				{
-					nextStartTime = testStartTime;
-				}
-			}
-			if (nextStartTime != null)
-			{
-				_task = new TvTStartTask(nextStartTime.getTimeInMillis());
-				ThreadPool.execute(_task);
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning("TvTEventEngine[TvTManager.scheduleEventStart()]: Error figuring out a start time. Check TvTEventInterval in config file.");
-		}
-	}
-	
-	/**
-	 * Method to start participation
-	 */
-	public void startReg()
-	{
-		if (!TvTEvent.startParticipation())
-		{
-			Broadcast.toAllOnlinePlayers("TvT Event: Event was cancelled.");
-			LOGGER.warning("TvTEventEngine[TvTManager.run()]: Error spawning event npc for participation.");
-			scheduleEventStart();
-		}
-		else
-		{
-			Broadcast.toAllOnlinePlayers("TvT Event: Registration opened for " + Config.TVT_EVENT_PARTICIPATION_TIME + " minute(s).");
-			
-			// schedule registration end
-			_task.setStartTime(Chronos.currentTimeMillis() + (60000 * Config.TVT_EVENT_PARTICIPATION_TIME));
-			ThreadPool.execute(_task);
-		}
-	}
-	
-	/**
-	 * Method to start the fight
-	 */
-	public void startEvent()
-	{
-		if (!TvTEvent.startFight())
-		{
-			Broadcast.toAllOnlinePlayers("TvT Event: Event cancelled due to lack of Participation.");
-			LOGGER.info("TvTEventEngine[TvTManager.run()]: Lack of registration, abort event.");
-			scheduleEventStart();
-		}
-		else
-		{
-			TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting participants to an arena in " + Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY + " second(s).");
-			_task.setStartTime(Chronos.currentTimeMillis() + (60000 * Config.TVT_EVENT_RUNNING_TIME));
-			ThreadPool.execute(_task);
-		}
-	}
-	
-	/**
-	 * Method to end the event and reward
-	 */
-	public void endEvent()
-	{
-		Broadcast.toAllOnlinePlayers(TvTEvent.calculateRewards());
-		TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting back to the registration npc in " + Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY + " second(s).");
-		TvTEvent.stopFight();
-		
-		scheduleEventStart();
-	}
-	
-	public void skipDelay()
-	{
-		if (_task.nextRun.cancel(false))
-		{
-			_task.setStartTime(Chronos.currentTimeMillis());
-			ThreadPool.execute(_task);
-		}
-	}
-	
-	/**
-	 * Class for TvT cycles
-	 */
-	class TvTStartTask implements Runnable
-	{
-		private long _startTime;
-		public ScheduledFuture<?> nextRun;
-		
-		public TvTStartTask(long startTime)
-		{
-			_startTime = startTime;
-		}
-		
-		public void setStartTime(long startTime)
-		{
-			_startTime = startTime;
-		}
-		
-		@Override
-		public void run()
-		{
-			final int delay = (int) Math.round((_startTime - Chronos.currentTimeMillis()) / 1000.0);
-			if (delay > 0)
-			{
-				announce(delay);
-			}
-			
-			int nextMsg = 0;
-			if (delay > 3600)
-			{
-				nextMsg = delay - 3600;
-			}
-			else if (delay > 1800)
-			{
-				nextMsg = delay - 1800;
-			}
-			else if (delay > 900)
-			{
-				nextMsg = delay - 900;
-			}
-			else if (delay > 600)
-			{
-				nextMsg = delay - 600;
-			}
-			else if (delay > 300)
-			{
-				nextMsg = delay - 300;
-			}
-			else if (delay > 60)
-			{
-				nextMsg = delay - 60;
-			}
-			else if (delay > 5)
-			{
-				nextMsg = delay - 5;
-			}
-			else if (delay > 0)
-			{
-				nextMsg = delay;
-			}
-			// start
-			else if (TvTEvent.isInactive())
-			{
-				startReg();
-			}
-			else if (TvTEvent.isParticipating())
-			{
-				startEvent();
-			}
-			else
-			{
-				endEvent();
-			}
-			
-			if (delay > 0)
-			{
-				nextRun = ThreadPool.schedule(this, nextMsg * 1000);
-			}
-		}
-		
-		private void announce(long time)
-		{
-			if ((time >= 3600) && ((time % 3600) == 0))
-			{
-				if (TvTEvent.isParticipating())
-				{
-					Broadcast.toAllOnlinePlayers("TvT Event: " + (time / 60 / 60) + " hour(s) until registration is closed!");
-				}
-				else if (TvTEvent.isStarted())
-				{
-					TvTEvent.sysMsgToAllParticipants("TvT Event: " + (time / 60 / 60) + " hour(s) until event is finished!");
-				}
-			}
-			else if (time >= 60)
-			{
-				if (TvTEvent.isParticipating())
-				{
-					Broadcast.toAllOnlinePlayers("TvT Event: " + (time / 60) + " minute(s) until registration is closed!");
-				}
-				else if (TvTEvent.isStarted())
-				{
-					TvTEvent.sysMsgToAllParticipants("TvT Event: " + (time / 60) + " minute(s) until the event is finished!");
-				}
-			}
-			else if (TvTEvent.isParticipating())
-			{
-				Broadcast.toAllOnlinePlayers("TvT Event: " + time + " second(s) until registration is closed!");
-			}
-			else if (TvTEvent.isStarted())
-			{
-				TvTEvent.sysMsgToAllParticipants("TvT Event: " + time + " second(s) until the event is finished!");
-			}
-		}
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final TvTManager INSTANCE = new TvTManager();
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3894517ade..85c1406342 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -258,11 +258,6 @@ public class Attackable extends Npc
 			}
 		}
 		
-		if (isEventMob())
-		{
-			return;
-		}
-		
 		// Add damage and hate to the attacker AggroInfo of the Attackable _aggroList
 		if (attacker != null)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a2ae303d9f..80ecb97dc7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -4790,7 +4790,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a PlayerInstance)
-		if ((target == null) || isAlikeDead() || (isNpc() && ((Npc) this).isEventMob()))
+		if ((target == null) || isAlikeDead())
 		{
 			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
 			return;
@@ -6528,7 +6528,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * Dummy method overriden in {@link PlayerInstance}
 	 * @return {@code true} if player is on event, {@code false} otherwise.
 	 */
-	public boolean isOnEvent()
+	public boolean isOnCustomEvent()
 	{
 		return false;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 9e37ec9fe8..439466e28b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -129,7 +129,6 @@ public class Npc extends Creature
 	private int _castleIndex = -2;
 	/** The fortress index in the array of Fort this NpcInstance belongs to */
 	private int _fortIndex = -2;
-	private boolean _eventMob = false;
 	private boolean _isInTown = false;
 	/** True if this Npc is autoattackable **/
 	private boolean _isAutoAttackable = false;
@@ -410,16 +409,6 @@ public class Npc extends Creature
 		});
 	}
 	
-	public boolean isEventMob()
-	{
-		return _eventMob;
-	}
-	
-	public void setEventMob(boolean value)
-	{
-		_eventMob = value;
-	}
-	
 	@Override
 	public boolean isAutoAttackable(Creature attacker)
 	{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
index c50618d10e..91a4bf8c30 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -1181,4 +1181,10 @@ public abstract class Summon extends Playable
 		}
 		return formId;
 	}
+	
+	@Override
+	public boolean isOnCustomEvent()
+	{
+		return (_owner != null) && _owner.isOnCustomEvent();
+	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
index 78d0b63525..81a64bbf01 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
@@ -28,8 +28,6 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.ai.CtrlEvent;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.instancemanager.DuelManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEventTeam;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Attackable;
@@ -287,14 +285,13 @@ public class CubicInstance implements IIdentifiable
 			{
 				return;
 			}
-			// TvT event targeting
-			if (TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_owner.getObjectId()))
+			// Custom event targeting
+			if (_owner.isOnCustomEvent())
 			{
-				final TvTEventTeam enemyTeam = TvTEvent.getParticipantEnemyTeam(_owner.getObjectId());
 				if (ownerTarget.getActingPlayer() != null)
 				{
 					final PlayerInstance target = ownerTarget.getActingPlayer();
-					if (enemyTeam.containsPlayer(target.getObjectId()) && !(target.isDead()))
+					if ((_owner.getTeam() != target.getTeam()) && !(target.isDead()))
 					{
 						_target = (Creature) ownerTarget;
 					}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
index dc507615a9..3bff488e0f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
@@ -80,7 +80,7 @@ public class MonsterInstance extends Attackable
 			return false;
 		}
 		
-		return super.isAutoAttackable(attacker) && !isEventMob();
+		return super.isAutoAttackable(attacker);
 	}
 	
 	/**
@@ -89,7 +89,7 @@ public class MonsterInstance extends Attackable
 	@Override
 	public boolean isAggressive()
 	{
-		return getTemplate().isAggressive() && !isEventMob() && !isAffected(EffectFlag.PASSIVE);
+		return getTemplate().isAggressive() && !isAffected(EffectFlag.PASSIVE);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6aa9e623a1..0af2702837 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -117,8 +117,6 @@ import org.l2jmobius.gameserver.instancemanager.RecipeManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.AccessLevel;
 import org.l2jmobius.gameserver.model.ArenaParticipantsHolder;
 import org.l2jmobius.gameserver.model.BlockList;
@@ -203,7 +201,6 @@ import org.l2jmobius.gameserver.model.fishing.Fishing;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.holders.MovieHolder;
-import org.l2jmobius.gameserver.model.holders.PlayerEventHolder;
 import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillUseHolder;
@@ -738,7 +735,8 @@ public class PlayerInstance extends Playable
 	protected Set<Integer> _activeSoulShots = ConcurrentHashMap.newKeySet(1);
 	
 	/** Event parameters */
-	private PlayerEventHolder eventStatus = null;
+	private boolean _isRegisteredOnCustomEvent = false;
+	private boolean _isOnCustomEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
 	
@@ -2865,11 +2863,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void standUp()
 	{
-		if (GameEvent.isParticipant(this) && eventStatus.isSitForced())
-		{
-			sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up...");
-		}
-		else if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
+		if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead())
 		{
 			if (getEffectList().isAffected(EffectFlag.RELAXING))
 			{
@@ -5041,11 +5035,6 @@ public class PlayerInstance extends Playable
 				if (pk != null)
 				{
 					EventDispatcher.getInstance().notifyEventAsync(new OnPlayerPvPKill(pk, this), this);
-					TvTEvent.onKill(killer, this);
-					if (GameEvent.isParticipant(pk))
-					{
-						pk.getEventStatus().getKills().add(this);
-					}
 					
 					// pvp/pk item rewards
 					if (!(Config.DISABLE_REWARDS_IN_INSTANCES && (getInstanceId() != 0)) && //
@@ -5219,7 +5208,7 @@ public class PlayerInstance extends Playable
 	
 	private void onDieDropItem(Creature killer)
 	{
-		if (GameEvent.isParticipant(this) || (killer == null))
+		if (isOnCustomEvent() || (killer == null))
 		{
 			return;
 		}
@@ -5587,7 +5576,7 @@ public class PlayerInstance extends Playable
 		
 		// Calculate the Experience loss
 		long lostExp = 0;
-		if (!GameEvent.isParticipant(this))
+		if (!isOnCustomEvent())
 		{
 			if (lvl < ExperienceData.getInstance().getMaxLevel())
 			{
@@ -8232,14 +8221,9 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isBlockedFromExit())
+		if (isRegisteredOnCustomEvent())
 		{
-			return false;
-		}
-		
-		if (GameEvent.isParticipant(this))
-		{
-			sendMessage("A superior power doesn't allow you to leave the event.");
+			sendMessage("A superior power doesn't allow you to leave.");
 			return false;
 		}
 		
@@ -8319,8 +8303,8 @@ public class PlayerInstance extends Playable
 			return _inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId());
 		}
 		
-		// Check if the attacker is in TvT and TvT is started
-		if (isOnEvent())
+		// Check if the attacker is in an event
+		if (isOnCustomEvent())
 		{
 			return true;
 		}
@@ -10750,8 +10734,6 @@ public class PlayerInstance extends Playable
 			_summon.updateAndBroadcastStatus(0);
 		}
 		
-		TvTEvent.onTeleported(this);
-		
 		// show movie if available
 		if (_movieHolder != null)
 		{
@@ -11404,16 +11386,6 @@ public class PlayerInstance extends Playable
 			LOGGER.log(Level.SEVERE, "deleteMe()", e);
 		}
 		
-		// TvT Event removal
-		try
-		{
-			TvTEvent.onLogout(this);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.SEVERE, "deleteMe()", e);
-		}
-		
 		// Update database with items in its inventory and remove them from the world
 		try
 		{
@@ -11484,12 +11456,6 @@ public class PlayerInstance extends Playable
 			player.removeSnooped(this);
 		}
 		
-		// we store all data from players who are disconnected while in an event in order to restore it in the next login
-		if (GameEvent.isParticipant(this))
-		{
-			GameEvent.savePlayerEventStatus(this);
-		}
-		
 		try
 		{
 			notifyFriends();
@@ -12291,10 +12257,11 @@ public class PlayerInstance extends Playable
 			return;
 		}
 		
-		if (isResurrectSpecialAffected() || isLucky() || isBlockedFromDeathPenalty() || isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE) || canOverrideCond(PlayerCondOverride.DEATH_PENALTY))
+		if (isResurrectSpecialAffected() || isLucky() || isOnCustomEvent() || isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE) || canOverrideCond(PlayerCondOverride.DEATH_PENALTY))
 		{
 			return;
 		}
+		
 		double percent = 1.0;
 		if (killer.isRaid())
 		{
@@ -14034,21 +14001,6 @@ public class PlayerInstance extends Playable
 		return _contactList;
 	}
 	
-	public void setEventStatus()
-	{
-		eventStatus = new PlayerEventHolder(this);
-	}
-	
-	public void setEventStatus(PlayerEventHolder pes)
-	{
-		eventStatus = pes;
-	}
-	
-	public PlayerEventHolder getEventStatus()
-	{
-		return eventStatus;
-	}
-	
 	public long getNotMoveUntil()
 	{
 		return _notMoveUntil;
@@ -14126,13 +14078,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean canRevive()
 	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent() && !listener.canRevive())
-			{
-				return false;
-			}
-		}
 		return _canRevive;
 	}
 	
@@ -14146,44 +14091,25 @@ public class PlayerInstance extends Playable
 		_canRevive = value;
 	}
 	
-	/**
-	 * @return {@code true} if player is on event, {@code false} otherwise.
-	 */
+	public boolean isRegisteredOnCustomEvent()
+	{
+		return _isRegisteredOnCustomEvent || _isOnCustomEvent;
+	}
+	
+	public void setRegisteredOnCustomEvent(boolean value)
+	{
+		_isRegisteredOnCustomEvent = value;
+	}
+	
 	@Override
-	public boolean isOnEvent()
+	public boolean isOnCustomEvent()
 	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent())
-			{
-				return true;
-			}
-		}
-		return super.isOnEvent();
+		return _isOnCustomEvent;
 	}
 	
-	public boolean isBlockedFromExit()
+	public void setOnCustomEvent(boolean value)
 	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent() && listener.isBlockingExit())
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public boolean isBlockedFromDeathPenalty()
-	{
-		for (IEventListener listener : _eventListeners)
-		{
-			if (listener.isOnEvent() && listener.isBlockingDeathPenalty())
-			{
-				return true;
-			}
-		}
-		return false;
+		_isOnCustomEvent = value;
 	}
 	
 	public void setOriginalCpHpMp(double cp, double hp, double mp)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
index 5651fb9d90..4466642299 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.conditions;
 
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
@@ -55,7 +54,7 @@ public class ConditionPlayerCallPc extends Condition
 		{
 			canCallPlayer = false;
 		}
-		else if (!TvTEvent.onEscapeUse(player.getObjectId()))
+		else if (player.isOnCustomEvent())
 		{
 			player.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
 			canCallPlayer = false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
index 27ddc09857..ce63ac33ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
@@ -17,7 +17,6 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -46,7 +45,7 @@ public class ConditionPlayerCanEscape extends Condition
 		{
 			canTeleport = false;
 		}
-		else if (!TvTEvent.onEscapeUse(player.getObjectId()))
+		else if (player.isOnCustomEvent())
 		{
 			canTeleport = false;
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTvTEvent.java
deleted file mode 100644
index d397d98bd1..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTvTEvent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.conditions;
-
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
-import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.items.Item;
-import org.l2jmobius.gameserver.model.skills.Skill;
-
-/**
- * The Class ConditionPlayerTvTEvent.
- */
-public class ConditionPlayerTvTEvent extends Condition
-{
-	private final boolean _value;
-	
-	/**
-	 * Instantiates a new condition player tv t event.
-	 * @param value the value
-	 */
-	public ConditionPlayerTvTEvent(boolean value)
-	{
-		_value = value;
-	}
-	
-	@Override
-	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
-	{
-		final PlayerInstance player = effector.getActingPlayer();
-		return (player == null) || !TvTEvent.isStarted() ? !_value : TvTEvent.isPlayerParticipant(player.getObjectId()) == _value;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventType.java
index 3365486be6..90a3c25a69 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventType.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventType.java
@@ -90,10 +90,6 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPl
 import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemTransfer;
 import org.l2jmobius.gameserver.model.events.impl.creature.trap.OnTrapAction;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventFinish;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventKill;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventRegistrationStart;
-import org.l2jmobius.gameserver.model.events.impl.events.OnTvTEventStart;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
@@ -219,13 +215,7 @@ public enum EventType
 	ON_PLAYER_TRANSFORM(OnPlayerTransform.class, void.class),
 	
 	// Trap events
-	ON_TRAP_ACTION(OnTrapAction.class, void.class),
-	
-	// TvT events.
-	ON_TVT_EVENT_FINISH(OnTvTEventFinish.class, void.class),
-	ON_TVT_EVENT_KILL(OnTvTEventKill.class, void.class),
-	ON_TVT_EVENT_REGISTRATION_START(OnTvTEventRegistrationStart.class, void.class),
-	ON_TVT_EVENT_START(OnTvTEventStart.class, void.class);
+	ON_TRAP_ACTION(OnTrapAction.class, void.class);
 	
 	private final Class<? extends IBaseEvent> _eventClass;
 	private final Class<?>[] _returnClass;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventFinish.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventFinish.java
deleted file mode 100644
index b20449db18..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventFinish.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventFinish implements IBaseEvent
-{
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_FINISH;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventKill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventKill.java
deleted file mode 100644
index 7e6d994779..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventKill.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.instancemanager.events.TvTEventTeam;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventKill implements IBaseEvent
-{
-	private final PlayerInstance _killer;
-	private final PlayerInstance _victim;
-	private final TvTEventTeam _killerTeam;
-	
-	public OnTvTEventKill(PlayerInstance killer, PlayerInstance victim, TvTEventTeam killerTeam)
-	{
-		_killer = killer;
-		_victim = victim;
-		_killerTeam = killerTeam;
-	}
-	
-	public PlayerInstance getKiller()
-	{
-		return _killer;
-	}
-	
-	public PlayerInstance getVictim()
-	{
-		return _victim;
-	}
-	
-	public TvTEventTeam getKillerTeam()
-	{
-		return _killerTeam;
-	}
-	
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_KILL;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventRegistrationStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventRegistrationStart.java
deleted file mode 100644
index 383858cd5a..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventRegistrationStart.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventRegistrationStart implements IBaseEvent
-{
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_REGISTRATION_START;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventStart.java
deleted file mode 100644
index 7f9293c91e..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/events/OnTvTEventStart.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.events.impl.events;
-
-import org.l2jmobius.gameserver.model.events.EventType;
-import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-
-/**
- * @author UnAfraid
- */
-public class OnTvTEventStart implements IBaseEvent
-{
-	@Override
-	public EventType getType()
-	{
-		return EventType.ON_TVT_EVENT_START;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PlayerEventHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PlayerEventHolder.java
deleted file mode 100644
index 08b5881876..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PlayerEventHolder.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.model.holders;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.l2jmobius.gameserver.data.sql.ClanTable;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-
-/**
- * Player event holder, meant for restoring player after event has finished.<br>
- * Allows you to restore following information about player:
- * <ul>
- * <li>Name</li>
- * <li>Title</li>
- * <li>Clan</li>
- * <li>Location</li>
- * <li>PvP Kills</li>
- * <li>PK Kills</li>
- * <li>Karma</li>
- * </ul>
- * @author Nik, xban1x
- */
-public class PlayerEventHolder
-{
-	private final PlayerInstance _player;
-	private final String _name;
-	private final String _title;
-	private final int _clanId;
-	private final Location _loc;
-	private final int _pvpKills;
-	private final int _pkKills;
-	private final int _karma;
-	
-	private final Collection<PlayerInstance> _kills = ConcurrentHashMap.newKeySet();
-	private boolean _sitForced;
-	
-	public PlayerEventHolder(PlayerInstance player)
-	{
-		this(player, false);
-	}
-	
-	public PlayerEventHolder(PlayerInstance player, boolean sitForced)
-	{
-		_player = player;
-		_name = player.getName();
-		_title = player.getTitle();
-		_clanId = player.getClanId();
-		_loc = new Location(player);
-		_pvpKills = player.getPvpKills();
-		_pkKills = player.getPkKills();
-		_karma = player.getKarma();
-		_sitForced = sitForced;
-	}
-	
-	public void restorePlayerStats()
-	{
-		_player.setName(_name);
-		_player.setTitle(_title);
-		_player.setClan(ClanTable.getInstance().getClan(_clanId));
-		_player.teleToLocation(_loc, true);
-		_player.setPvpKills(_pvpKills);
-		_player.setPkKills(_pkKills);
-		_player.setKarma(_karma);
-	}
-	
-	public void setSitForced(boolean sitForced)
-	{
-		_sitForced = sitForced;
-	}
-	
-	public boolean isSitForced()
-	{
-		return _sitForced;
-	}
-	
-	public Collection<PlayerInstance> getKills()
-	{
-		return _kills;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 2e9c6d68ae..17d1609c23 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -878,7 +878,7 @@ public class Instance
 	 */
 	public void notifyDeath(PlayerInstance player)
 	{
-		if (!player.isOnEvent() && (_ejectTime > 0))
+		if (!player.isOnCustomEvent() && (_ejectTime > 0))
 		{
 			// Send message
 			final SystemMessage sm = new SystemMessage(SystemMessageId.IF_YOU_ARE_NOT_RESURRECTED_WITHIN_S1_MINUTES_YOU_WILL_BE_EXPELLED_FROM_THE_INSTANT_ZONE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java
index ebe37243d3..c286b07fbe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/interfaces/IEventListener.java
@@ -23,11 +23,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  */
 public interface IEventListener
 {
-	/**
-	 * @return {@code true} if player is on event, {@code false} otherwise.
-	 */
-	boolean isOnEvent();
-	
 	/**
 	 * @return {@code true} if player is blocked from leaving the game, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
index 85f7ec9365..c9da67e4bb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
@@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.Party.MessageType;
@@ -122,7 +121,7 @@ public abstract class AbstractOlympiadGame
 		}
 		
 		// safety precautions
-		if (player.inObserverMode() || TvTEvent.isPlayerParticipant(player.getObjectId()))
+		if (player.inObserverMode() || player.isRegisteredOnCustomEvent())
 		{
 			return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index a233904649..47b10b469f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -487,9 +487,9 @@ public class OlympiadManager
 		}
 		
 		final int charId = noble.getObjectId();
-		if (noble.isOnEvent())
+		if (noble.isRegisteredOnCustomEvent())
 		{
-			player.sendMessage("You can't join olympiad while participating on TvT Event.");
+			player.sendMessage("You can't join olympiad while participating on an event.");
 			return false;
 		}
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 7e8e536a33..0bead7643e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.ITargetTypeHandler;
 import org.l2jmobius.gameserver.handler.TargetHandler;
 import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.ArenaParticipantsHolder;
 import org.l2jmobius.gameserver.model.ExtractableProductItem;
 import org.l2jmobius.gameserver.model.ExtractableSkill;
@@ -1130,7 +1129,7 @@ public class Skill implements IIdentifiable
 					}
 				}
 				
-				if (!TvTEvent.checkForTvTSkill(player, targetPlayer, skill))
+				if (player.isOnCustomEvent() && targetPlayer.isOnCustomEvent() && (player.getTeam() == target.getTeam()))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index fa4e82f4f8..97a58ae076 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -46,8 +46,6 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
 import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
-import org.l2jmobius.gameserver.instancemanager.events.GameEvent;
-import org.l2jmobius.gameserver.instancemanager.events.TvTEvent;
 import org.l2jmobius.gameserver.model.Couple;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
 import org.l2jmobius.gameserver.model.World;
@@ -435,11 +433,6 @@ public class EnterWorld implements IClientIncomingPacket
 		player.sendPacket(new ExRotation(player.getObjectId(), player.getHeading()));
 		player.getInventory().applyItemSkills();
 		
-		if (GameEvent.isParticipant(player))
-		{
-			GameEvent.restorePlayerEventStatus(player);
-		}
-		
 		// Wedding Checks
 		if (Config.ALLOW_WEDDING)
 		{
@@ -585,8 +578,6 @@ public class EnterWorld implements IClientIncomingPacket
 			client.sendPacket(ExNoticePostArrived.valueOf(false));
 		}
 		
-		TvTEvent.onLogin(player);
-		
 		if (Config.WELCOME_MESSAGE_ENABLED)
 		{
 			player.sendPacket(new ExShowScreenMessage(Config.WELCOME_MESSAGE_TEXT, Config.WELCOME_MESSAGE_TIME));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 861de4fbdc..31acc383b6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -110,13 +110,6 @@ public class RequestRestart implements IClientIncomingPacket
 			}
 		}
 		
-		if (player.isBlockedFromExit())
-		{
-			client.sendPacket(RestartResponse.valueOf(false));
-			player.sendPacket(ActionFailed.STATIC_PACKET);
-			return;
-		}
-		
 		if (!player.canLogout())
 		{
 			client.sendPacket(RestartResponse.valueOf(false));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
index c2a226df96..2b076382bb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
@@ -24,11 +24,13 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
+import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance;
+import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.residences.ClanHall;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.siege.Fort;
@@ -90,6 +92,19 @@ public class RequestRestartPoint implements IClientIncomingPacket
 			return;
 		}
 		
+		// Custom event resurrection management.
+		if (player.isOnCustomEvent())
+		{
+			// This is an example, replace EventScriptName with proper event script name.
+			final Quest eventScript = QuestManager.getInstance().getQuest("EventScriptName");
+			if (eventScript != null)
+			{
+				// Notify onAdvEvent ResurrectPlayer event.
+				eventScript.notifyEvent("ResurrectPlayer", null, player);
+				return;
+			}
+		}
+		
 		final Castle castle = CastleManager.getInstance().getCastle(player.getX(), player.getY(), player.getZ());
 		if ((castle != null) && castle.getSiege().isInProgress() && (player.getClan() != null) && castle.getSiege().checkIsAttacker(player.getClan()))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
index fa8b0ce0d5..b30dbcc085 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -68,7 +68,7 @@ public class Die implements IClientOutgoingPacket
 		
 		if (_creature.isPlayer())
 		{
-			if (!OlympiadManager.getInstance().isRegistered(_creature.getActingPlayer()) && !_creature.isOnEvent())
+			if (!OlympiadManager.getInstance().isRegistered(_creature.getActingPlayer()) && !_creature.getActingPlayer().isOnCustomEvent())
 			{
 				_staticRes = _creature.getInventory().haveItemForSelfResurrection();
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java
index ff68e85984..9e475541c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java
@@ -98,7 +98,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionPlayerSouls;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerState;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerSubclass;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerTransformationId;
-import org.l2jmobius.gameserver.model.conditions.ConditionPlayerTvTEvent;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerVehicleMounted;
 import org.l2jmobius.gameserver.model.conditions.ConditionPlayerWeight;
 import org.l2jmobius.gameserver.model.conditions.ConditionSiegeZone;
@@ -651,12 +650,6 @@ public abstract class DocumentBase
 					cond = joinAnd(cond, new ConditionPlayerIsClanLeader(val));
 					break;
 				}
-				case "ontvtevent":
-				{
-					final boolean val = Boolean.parseBoolean(a.getNodeValue());
-					cond = joinAnd(cond, new ConditionPlayerTvTEvent(val));
-					break;
-				}
 				case "pledgeclass":
 				{
 					final int pledgeClass = Integer.decode(getValue(a.getNodeValue(), null));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
index f2ef61b606..64f56752df 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
@@ -48,7 +48,7 @@ public class OfflineTradeUtil
 	 */
 	private static boolean offlineMode(PlayerInstance player)
 	{
-		if ((player == null) || player.isInOlympiadMode() || player.isBlockedFromExit() || player.isJailed() || (player.getVehicle() != null))
+		if ((player == null) || player.isInOlympiadMode() || player.isRegisteredOnCustomEvent() || player.isJailed() || (player.getVehicle() != null))
 		{
 			return false;
 		}