diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 2cec290722..deffe2b1e5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -101,7 +101,7 @@ public final class Kamaloka extends AbstractInstance
 	{
 		4322, 4323, 4324, 4325, 4326, 4327, 4328, 4329, 4330, 4331, 5632, 5637, 5950
 	};
-	// @formatter:on
+	
 	// Teleport points into instances x, y, z
 	private static final Location[] TELEPORTS =
 	{
@@ -137,65 +137,12 @@ public final class Kamaloka extends AbstractInstance
 	 */
 	private static final int[][] FIRST_ROOM =
 	{
-		null,
-		null,
-		{
-			22485,
-			22486,
-			5699,
-			1
-		},
-		null,
-		null,
-		{
-			22488,
-			22489,
-			5699,
-			2
-		},
-		null,
-		null,
-		{
-			22491,
-			22492,
-			5699,
-			3
-		},
-		null,
-		null,
-		{
-			22494,
-			22495,
-			5699,
-			4
-		},
-		null,
-		null,
-		{
-			22497,
-			22498,
-			5699,
-			5
-		},
-		null,
-		{
-			22500,
-			22501,
-			5699,
-			6
-		},
-		{
-			22503,
-			22504,
-			5699,
-			7
-		},
-		{
-			25706,
-			25707,
-			5699,
-			7
-		}
+		null, null, {22485, 22486, 5699, 1},
+		null, null, {22488, 22489, 5699, 2},
+		null, null, {22491, 22492, 5699, 3},
+		null, null, {22494, 22495, 5699, 4},
+		null, null, {22497, 22498, 5699, 5},
+		null, {22500 ,22501, 5699, 6}, {22503, 22504, 5699, 7}, {25706, 25707, 5699, 7}
 	};
 	
 	/*
@@ -203,393 +150,86 @@ public final class Kamaloka extends AbstractInstance
 	 */
 	private static final int[][][] FIRST_ROOM_SPAWNS =
 	{
-		null,
-		null,
-		{
-			{
-				-12381,
-				-174973,
-				-10955
-			},
-			{
-				-12413,
-				-174905,
-				-10955
-			},
-			{
-				-12377,
-				-174838,
-				-10953
-			},
-			{
-				-12316,
-				-174903,
-				-10953
-			},
-			{
-				-12326,
-				-174786,
-				-10953
-			},
-			{
-				-12330,
-				-175024,
-				-10953
-			},
-			{
-				-12211,
-				-174900,
-				-10955
-			},
-			{
-				-12238,
-				-174849,
-				-10953
-			},
-			{
-				-12233,
-				-174954,
-				-10953
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-12381,
-				-174973,
-				-10955
-			},
-			{
-				-12413,
-				-174905,
-				-10955
-			},
-			{
-				-12377,
-				-174838,
-				-10953
-			},
-			{
-				-12316,
-				-174903,
-				-10953
-			},
-			{
-				-12326,
-				-174786,
-				-10953
-			},
-			{
-				-12330,
-				-175024,
-				-10953
-			},
-			{
-				-12211,
-				-174900,
-				-10955
-			},
-			{
-				-12238,
-				-174849,
-				-10953
-			},
-			{
-				-12233,
-				-174954,
-				-10953
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-12381,
-				-174973,
-				-10955
-			},
-			{
-				-12413,
-				-174905,
-				-10955
-			},
-			{
-				-12377,
-				-174838,
-				-10953
-			},
-			{
-				-12316,
-				-174903,
-				-10953
-			},
-			{
-				-12326,
-				-174786,
-				-10953
-			},
-			{
-				-12330,
-				-175024,
-				-10953
-			},
-			{
-				-12211,
-				-174900,
-				-10955
-			},
-			{
-				-12238,
-				-174849,
-				-10953
-			},
-			{
-				-12233,
-				-174954,
-				-10953
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-12381,
-				-174973,
-				-10955
-			},
-			{
-				-12413,
-				-174905,
-				-10955
-			},
-			{
-				-12377,
-				-174838,
-				-10953
-			},
-			{
-				-12316,
-				-174903,
-				-10953
-			},
-			{
-				-12326,
-				-174786,
-				-10953
-			},
-			{
-				-12330,
-				-175024,
-				-10953
-			},
-			{
-				-12211,
-				-174900,
-				-10955
-			},
-			{
-				-12238,
-				-174849,
-				-10953
-			},
-			{
-				-12233,
-				-174954,
-				-10953
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-12381,
-				-174973,
-				-10955
-			},
-			{
-				-12413,
-				-174905,
-				-10955
-			},
-			{
-				-12377,
-				-174838,
-				-10953
-			},
-			{
-				-12316,
-				-174903,
-				-10953
-			},
-			{
-				-12326,
-				-174786,
-				-10953
-			},
-			{
-				-12330,
-				-175024,
-				-10953
-			},
-			{
-				-12211,
-				-174900,
-				-10955
-			},
-			{
-				-12238,
-				-174849,
-				-10953
-			},
-			{
-				-12233,
-				-174954,
-				-10953
-			}
-		},
-		null,
-		{
-			{
-				-12381,
-				-174973,
-				-10955
-			},
-			{
-				-12413,
-				-174905,
-				-10955
-			},
-			{
-				-12377,
-				-174838,
-				-10953
-			},
-			{
-				-12316,
-				-174903,
-				-10953
-			},
-			{
-				-12326,
-				-174786,
-				-10953
-			},
-			{
-				-12330,
-				-175024,
-				-10953
-			},
-			{
-				-12211,
-				-174900,
-				-10955
-			},
-			{
-				-12238,
-				-174849,
-				-10953
-			},
-			{
-				-12233,
-				-174954,
-				-10953
-			}
-		},
-		{
-			{
-				-12381,
-				-174973,
-				-10955
-			},
-			{
-				-12413,
-				-174905,
-				-10955
-			},
-			{
-				-12377,
-				-174838,
-				-10953
-			},
-			{
-				-12316,
-				-174903,
-				-10953
-			},
-			{
-				-12326,
-				-174786,
-				-10953
-			},
-			{
-				-12330,
-				-175024,
-				-10953
-			},
-			{
-				-12211,
-				-174900,
-				-10955
-			},
-			{
-				-12238,
-				-174849,
-				-10953
-			},
-			{
-				-12233,
-				-174954,
-				-10953
-			}
-		},
-		{
-			{
-				20409,
-				-174827,
-				-10912
-			},
-			{
-				20409,
-				-174947,
-				-10912
-			},
-			{
-				20494,
-				-174887,
-				-10912
-			},
-			{
-				20494,
-				-174767,
-				-10912
-			},
-			{
-				20614,
-				-174887,
-				-10912
-			},
-			{
-				20579,
-				-174827,
-				-10912
-			},
-			{
-				20579,
-				-174947,
-				-10912
-			},
-			{
-				20494,
-				-175007,
-				-10912
-			},
-			{
-				20374,
-				-174887,
-				-10912
-			}
-		}
+		null, null, {
+			{-12381, -174973, -10955},
+			{-12413, -174905, -10955},
+			{-12377, -174838, -10953},
+			{-12316, -174903, -10953},
+			{-12326, -174786, -10953},
+			{-12330, -175024, -10953},
+			{-12211, -174900, -10955},
+			{-12238, -174849, -10953},
+			{-12233, -174954, -10953}},
+		null, null, {
+			{-12381, -174973, -10955},
+			{-12413, -174905, -10955},
+			{-12377, -174838, -10953},
+			{-12316, -174903, -10953},
+			{-12326, -174786, -10953},
+			{-12330, -175024, -10953},
+			{-12211, -174900, -10955},
+			{-12238, -174849, -10953},
+			{-12233, -174954, -10953}},
+		null, null, {
+			{-12381, -174973, -10955},
+			{-12413, -174905, -10955},
+			{-12377, -174838, -10953},
+			{-12316, -174903, -10953},
+			{-12326, -174786, -10953},
+			{-12330, -175024, -10953},
+			{-12211, -174900, -10955},
+			{-12238, -174849, -10953},
+			{-12233, -174954, -10953}},
+		null, null, {
+			{-12381, -174973, -10955},
+			{-12413, -174905, -10955},
+			{-12377, -174838, -10953},
+			{-12316, -174903, -10953},
+			{-12326, -174786, -10953},
+			{-12330, -175024, -10953},
+			{-12211, -174900, -10955},
+			{-12238, -174849, -10953},
+			{-12233, -174954, -10953}},
+		null, null, {
+			{-12381, -174973, -10955},
+			{-12413, -174905, -10955},
+			{-12377, -174838, -10953},
+			{-12316, -174903, -10953},
+			{-12326, -174786, -10953},
+			{-12330, -175024, -10953},
+			{-12211, -174900, -10955},
+			{-12238, -174849, -10953},
+			{-12233, -174954, -10953}},
+		null, {
+			{-12381, -174973, -10955},
+			{-12413, -174905, -10955},
+			{-12377, -174838, -10953},
+			{-12316, -174903, -10953},
+			{-12326, -174786, -10953},
+			{-12330, -175024, -10953},
+			{-12211, -174900, -10955},
+			{-12238, -174849, -10953},
+			{-12233, -174954, -10953}},
+			{
+			{-12381, -174973, -10955},
+			{-12413, -174905, -10955},
+			{-12377, -174838, -10953},
+			{-12316, -174903, -10953},
+			{-12326, -174786, -10953},
+			{-12330, -175024, -10953},
+			{-12211, -174900, -10955},
+			{-12238, -174849, -10953},
+			{-12233, -174954, -10953}},
+			{
+			{20409, -174827, -10912},
+			{20409, -174947, -10912},
+			{20494, -174887, -10912},
+			{20494, -174767, -10912},
+			{20614, -174887, -10912},
+			{20579, -174827, -10912},
+			{20579, -174947, -10912},
+			{20494, -175007, -10912},
+			{20374, -174887, -10912}}
 	};
 	
 	/*
@@ -597,58 +237,12 @@ public final class Kamaloka extends AbstractInstance
 	 */
 	private static final int[][] SECOND_ROOM =
 	{
-		null,
-		null,
-		{
-			22487,
-			5700,
-			1
-		},
-		null,
-		null,
-		{
-			22490,
-			5700,
-			2
-		},
-		null,
-		null,
-		{
-			22493,
-			5700,
-			3
-		},
-		null,
-		null,
-		{
-			22496,
-			5700,
-			4
-		},
-		null,
-		null,
-		{
-			22499,
-			5700,
-			5
-		},
-		null,
-		{
-			22502,
-			5700,
-			6
-		},
-		{
-			22505,
-			5700,
-			7
-		},
-		{
-			25708,
-			5700,
-			7
-		}
-		
+		null, null, {22487, 5700, 1},
+		null, null, {22490, 5700, 2},
+		null, null, {22493, 5700, 3},
+		null, null, {22496, 5700, 4},
+		null, null, {22499, 5700, 5},
+		null, {22502, 5700, 6}, {22505, 5700, 7}, {25708, 5700, 7}
 	};
 	
 	/*
@@ -656,233 +250,54 @@ public final class Kamaloka extends AbstractInstance
 	 */
 	private static final int[][][] SECOND_ROOM_SPAWNS =
 	{
-		null,
-		null,
-		{
+		null, null, {
+			{-14547, -174901, -10690},
+			{-14543, -175030, -10690},
+			{-14668, -174900, -10690},
+			{-14538, -174774, -10690},
+			{-14410, -174904, -10690}},
+		null, null, {
+			{-14547, -174901, -10690},
+			{-14543, -175030, -10690},
+			{-14668, -174900, -10690},
+			{-14538, -174774, -10690},
+			{-14410, -174904, -10690}},
+		null, null, {
+			{-14547, -174901, -10690},
+			{-14543, -175030, -10690},
+			{-14668, -174900, -10690},
+			{-14538, -174774, -10690},
+			{-14410, -174904, -10690}},
+		null, null, {
+			{-14547, -174901, -10690},
+			{-14543, -175030, -10690},
+			{-14668, -174900, -10690},
+			{-14538, -174774, -10690},
+			{-14410, -174904, -10690}},
+		null, null, {
+			{-14547, -174901, -10690},
+			{-14543, -175030, -10690},
+			{-14668, -174900, -10690},
+			{-14538, -174774, -10690},
+			{-14410, -174904, -10690}},
+		null, {
+			{-14547, -174901, -10690},
+			{-14543, -175030, -10690},
+			{-14668, -174900, -10690},
+			{-14538, -174774, -10690},
+			{-14410, -174904, -10690}},
 			{
-				-14547,
-				-174901,
-				-10690
-			},
+			{-14547, -174901, -10690},
+			{-14543, -175030, -10690},
+			{-14668, -174900, -10690},
+			{-14538, -174774, -10690},
+			{-14410, -174904, -10690}},
 			{
-				-14543,
-				-175030,
-				-10690
-			},
-			{
-				-14668,
-				-174900,
-				-10690
-			},
-			{
-				-14538,
-				-174774,
-				-10690
-			},
-			{
-				-14410,
-				-174904,
-				-10690
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-14547,
-				-174901,
-				-10690
-			},
-			{
-				-14543,
-				-175030,
-				-10690
-			},
-			{
-				-14668,
-				-174900,
-				-10690
-			},
-			{
-				-14538,
-				-174774,
-				-10690
-			},
-			{
-				-14410,
-				-174904,
-				-10690
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-14547,
-				-174901,
-				-10690
-			},
-			{
-				-14543,
-				-175030,
-				-10690
-			},
-			{
-				-14668,
-				-174900,
-				-10690
-			},
-			{
-				-14538,
-				-174774,
-				-10690
-			},
-			{
-				-14410,
-				-174904,
-				-10690
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-14547,
-				-174901,
-				-10690
-			},
-			{
-				-14543,
-				-175030,
-				-10690
-			},
-			{
-				-14668,
-				-174900,
-				-10690
-			},
-			{
-				-14538,
-				-174774,
-				-10690
-			},
-			{
-				-14410,
-				-174904,
-				-10690
-			}
-		},
-		null,
-		null,
-		{
-			{
-				-14547,
-				-174901,
-				-10690
-			},
-			{
-				-14543,
-				-175030,
-				-10690
-			},
-			{
-				-14668,
-				-174900,
-				-10690
-			},
-			{
-				-14538,
-				-174774,
-				-10690
-			},
-			{
-				-14410,
-				-174904,
-				-10690
-			}
-		},
-		null,
-		{
-			{
-				-14547,
-				-174901,
-				-10690
-			},
-			{
-				-14543,
-				-175030,
-				-10690
-			},
-			{
-				-14668,
-				-174900,
-				-10690
-			},
-			{
-				-14538,
-				-174774,
-				-10690
-			},
-			{
-				-14410,
-				-174904,
-				-10690
-			}
-		},
-		{
-			{
-				-14547,
-				-174901,
-				-10690
-			},
-			{
-				-14543,
-				-175030,
-				-10690
-			},
-			{
-				-14668,
-				-174900,
-				-10690
-			},
-			{
-				-14538,
-				-174774,
-				-10690
-			},
-			{
-				-14410,
-				-174904,
-				-10690
-			}
-		},
-		{
-			{
-				18175,
-				-174991,
-				-10653
-			},
-			{
-				18070,
-				-174890,
-				-10655
-			},
-			{
-				18157,
-				-174886,
-				-10655
-			},
-			{
-				18249,
-				-174885,
-				-10653
-			},
-			{
-				18144,
-				-174821,
-				-10648
-			}
-		}
+			{18175, -174991, -10653},
+			{18070, -174890, -10655},
+			{18157, -174886, -10655},
+			{18249, -174885, -10653},
+			{18144, -174821, -10648}}
 	};
 	
 	// miniboss info
@@ -893,81 +308,12 @@ public final class Kamaloka extends AbstractInstance
 	 */
 	private static final int[][] MINIBOSS =
 	{
-		null,
-		null,
-		{
-			25616,
-			-16874,
-			-174900,
-			-10427,
-			5701,
-			1
-		},
-		null,
-		null,
-		{
-			25617,
-			-16874,
-			-174900,
-			-10427,
-			5701,
-			2
-		},
-		null,
-		null,
-		{
-			25618,
-			-16874,
-			-174900,
-			-10427,
-			5701,
-			3
-		},
-		null,
-		null,
-		{
-			25619,
-			-16874,
-			-174900,
-			-10427,
-			5701,
-			4
-		},
-		null,
-		null,
-		{
-			25620,
-			-16874,
-			-174900,
-			-10427,
-			5701,
-			5
-		},
-		null,
-		{
-			25621,
-			-16874,
-			-174900,
-			-10427,
-			5701,
-			6
-		},
-		{
-			25622,
-			-16874,
-			-174900,
-			-10427,
-			5701,
-			7
-		},
-		{
-			25709,
-			15828,
-			-174885,
-			-10384,
-			5701,
-			7
-		}
+		null, null, {25616, -16874, -174900, -10427, 5701, 1},
+		null, null, {25617, -16874, -174900, -10427, 5701, 2},
+		null, null, {25618, -16874, -174900, -10427, 5701, 3},
+		null, null, {25619, -16874, -174900, -10427, 5701, 4},
+		null, null, {25620, -16874, -174900, -10427, 5701, 5},
+		null, {25621, -16874, -174900, -10427, 5701, 6}, {25622, -16874, -174900, -10427, 5701, 7}, {25709, 15828, -174885, -10384, 5701, 7}
 	};
 	
 	/*
@@ -975,120 +321,25 @@ public final class Kamaloka extends AbstractInstance
 	 */
 	private static final int[][] BOSS =
 	{
-		{
-			18554,
-			-88998,
-			-220077,
-			-7892
-		},
-		{
-			18555,
-			-81891,
-			-220078,
-			-7893
-		},
-		{
-			29129,
-			-20659,
-			-174903,
-			-9983
-		},
-		{
-			18558,
-			-89183,
-			-213564,
-			-8100
-		},
-		{
-			18559,
-			-81937,
-			-213566,
-			-8100
-		},
-		{
-			29132,
-			-20659,
-			-174903,
-			-9983
-		},
-		{
-			18562,
-			-89054,
-			-206144,
-			-8115
-		},
-		{
-			18564,
-			-81937,
-			-206077,
-			-8100
-		},
-		{
-			29135,
-			-20659,
-			-174903,
-			-9983
-		},
-		{
-			18566,
-			-56281,
-			-219859,
-			-8115
-		},
-		{
-			18568,
-			-49336,
-			-220260,
-			-8068
-		},
-		{
-			29138,
-			-20659,
-			-174903,
-			-9983
-		},
-		{
-			18571,
-			-56415,
-			-212939,
-			-8068
-		},
-		{
-			18573,
-			-56281,
-			-206140,
-			-8115
-		},
-		{
-			29141,
-			-20659,
-			-174903,
-			-9983
-		},
-		{
-			18577,
-			-49084,
-			-206140,
-			-8115
-		},
-		{
-			29144,
-			-20659,
-			-174903,
-			-9983
-		},
-		{
-			29147,
-			-20659,
-			-174903,
-			-9983
-		},
-		{
-			25710,
-			12047,
-			-174887,
-			-9944
-		}
+		{18554, -88998, -220077, -7892},
+		{18555, -81891, -220078, -7893},
+		{29129, -20659, -174903, -9983},
+		{18558, -89183, -213564, -8100},
+		{18559, -81937, -213566, -8100},
+		{29132, -20659, -174903, -9983},
+		{18562, -89054, -206144, -8115},
+		{18564, -81937, -206077, -8100},
+		{29135, -20659, -174903, -9983},
+		{18566, -56281, -219859, -8115},
+		{18568, -49336, -220260, -8068},
+		{29138, -20659, -174903, -9983},
+		{18571, -56415, -212939, -8068},
+		{18573, -56281, -206140, -8115},
+		{29141, -20659, -174903, -9983},
+		{18577, -49084, -206140, -8115},
+		{29144, -20659, -174903, -9983},
+		{29147, -20659, -174903, -9983},
+		{25710, 12047, -174887, -9944}
 	};
 	
 	/*
@@ -1096,58 +347,14 @@ public final class Kamaloka extends AbstractInstance
 	 */
 	private static final int[][] TELEPORTERS =
 	{
-		null,
-		null,
-		{
-			-10865,
-			-174905,
-			-10944
-		},
-		null,
-		null,
-		{
-			-10865,
-			-174905,
-			-10944
-		},
-		null,
-		null,
-		{
-			-10865,
-			-174905,
-			-10944
-		},
-		null,
-		null,
-		{
-			-10865,
-			-174905,
-			-10944
-		},
-		null,
-		null,
-		{
-			-10865,
-			-174905,
-			-10944
-		},
-		null,
-		{
-			-10865,
-			-174905,
-			-10944
-		},
-		{
-			-10865,
-			-174905,
-			-10944
-		},
-		{
-			21837,
-			-174885,
-			-10904
-		}
+		null, null, {-10865, -174905, -10944},
+		null, null, {-10865, -174905, -10944},
+		null, null, {-10865, -174905, -10944},
+		null, null, {-10865, -174905, -10944},
+		null, null, {-10865, -174905, -10944},
+		null, {-10865, -174905, -10944}, {-10865, -174905, -10944}, {21837, -174885, -10904}
 	};
+	// @formatter:on
 	
 	/*
 	 * Escape teleporter npcId
@@ -1451,7 +658,6 @@ public final class Kamaloka extends AbstractInstance
 	 * Spawn all NPCs in kamaloka
 	 * @param world instanceWorld
 	 */
-	@SuppressWarnings("all")
 	private final void spawnKama(KamaWorld world)
 	{
 		int[] npcs;
@@ -1464,7 +670,7 @@ public final class Kamaloka extends AbstractInstance
 		spawns = FIRST_ROOM_SPAWNS[index];
 		if (npcs != null)
 		{
-			world.firstRoom = new ArrayList<L2Spawn>(spawns.length - 1);
+			world.firstRoom = new ArrayList<>(spawns.length - 1);
 			final int shaman = getRandom(spawns.length); // random position for shaman
 			
 			for (int i = 0; i < spawns.length; i++)
@@ -1493,7 +699,7 @@ public final class Kamaloka extends AbstractInstance
 		spawns = SECOND_ROOM_SPAWNS[index];
 		if (npcs != null)
 		{
-			world.secondRoom = new ArrayList<Integer>(spawns.length);
+			world.secondRoom = new ArrayList<>(spawns.length);
 			
 			for (int[] spawn : spawns)
 			{
@@ -1529,20 +735,18 @@ public final class Kamaloka extends AbstractInstance
 	@Override
 	public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (npc == null)
+		if (npc != null)
 		{
-			return "";
+			try
+			{
+				enterInstance(player, Integer.parseInt(event));
+			}
+			catch (Exception e)
+			{
+				_log.log(Level.WARNING, "", e);
+			}
 		}
-		
-		try
-		{
-			enterInstance(player, Integer.parseInt(event));
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.WARNING, "", e);
-		}
-		return "";
+		return null;
 	}
 	
 	/**
@@ -1584,7 +788,7 @@ public final class Kamaloka extends AbstractInstance
 			return npcId + ".htm";
 		}
 		
-		return "";
+		return null;
 	}
 	
 	/**
@@ -1601,7 +805,7 @@ public final class Kamaloka extends AbstractInstance
 			}
 			return "32496-no.htm";
 		}
-		return "";
+		return null;
 	}
 	
 	@Override