diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml b/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml
index 5c950f6b4f..e13a988301 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml
@@ -163,10 +163,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -237,8 +233,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -435,9 +429,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/effects_menu.htm
index ca2623c4a4..c9f2df314e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index bcd1197689..f8def00096 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -136,7 +136,7 @@ public final class TeredorWarzone extends AbstractInstance
 				}
 				case "TEREDOR_LAIR_CHECK":
 				{
-					final Location spawnLoc = npc.getSpawn().getLocation();
+					final Location spawnLoc = npc.getSpawn();
 					
 					if (((spawnLoc.getX() - npc.getX()) > 1000) || ((spawnLoc.getX() - npc.getX()) < -2000))
 					{
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java
index 4398dee5c5..b120fdac71 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java
@@ -112,7 +112,6 @@ import handlers.admincommandhandlers.AdminPcCafePoints;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPrimePoints;
 import handlers.admincommandhandlers.AdminPunishment;
@@ -134,6 +133,7 @@ import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
@@ -445,7 +445,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPrimePoints.class,
 			AdminPunishment.class,
@@ -467,6 +466,7 @@ public class MasterHandler
 			AdminTargetSay.class,
 			AdminTeleport.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
 			AdminZone.class,
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f4c750c59d..74ff8b1526 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -58,7 +58,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -89,10 +88,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -369,25 +364,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index e85c59974a..b0110c6100 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -65,8 +65,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -305,38 +303,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -557,7 +523,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -566,7 +532,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 7d5f27c846..19857bc7da 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -482,9 +482,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
@@ -530,9 +528,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.setAmount(1);
 			spawn.setHeading(h);
 			spawn.setRespawnDelay(60);
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index d6809021ab..35508761a2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(template1);
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -583,9 +581,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
similarity index 60%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index 7a423a5bdc..edda44bde2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -1,198 +1,121 @@
-/*
- * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-import com.l2jmobius.gameserver.util.BuilderUtil;
-import com.l2jmobius.gameserver.util.Util;
-
-/**
- * Polymorph admin command implementation.
- * @author Zoey76
- */
-public class AdminPolymorph implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_polymorph",
-		"admin_unpolymorph",
-		"admin_transform",
-		"admin_untransform",
-		"admin_transform_menu",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (command.equals("admin_transform_menu"))
-		{
-			AdminHtml.showAdminHtml(activeChar, "transform.htm");
-			return true;
-		}
-		else if (command.startsWith("admin_untransform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-			}
-		}
-		else if (command.startsWith("admin_transform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if ((obj == null) || !obj.isPlayer())
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-				return false;
-			}
-			
-			final L2PcInstance player = obj.getActingPlayer();
-			if (activeChar.isSitting())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
-				return false;
-			}
-			
-			if (player.isTransformed())
-			{
-				if (!command.contains(" "))
-				{
-					player.untransform();
-					return true;
-				}
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
-				return false;
-			}
-			
-			if (player.isInWater())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
-				return false;
-			}
-			
-			if (player.isFlyingMounted() || player.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
-				return false;
-			}
-			
-			final String[] parts = command.split(" ");
-			if ((parts.length != 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
-				return false;
-			}
-			
-			final int id = Integer.parseInt(parts[1]);
-			if (!player.transform(id, true))
-			{
-				player.sendMessage("Unknown transformation ID: " + id);
-				return false;
-			}
-		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(activeChar.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-}
+/*
+ * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * @author Mobius
+ */
+public class AdminTransform implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_transform",
+		"admin_untransform",
+		"admin_transform_menu",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance activeChar)
+	{
+		if (command.equals("admin_transform_menu"))
+		{
+			AdminHtml.showAdminHtml(activeChar, "transform.htm");
+			return true;
+		}
+		else if (command.startsWith("admin_untransform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if (obj.isCharacter())
+			{
+				((L2Character) obj).stopTransformation(true);
+			}
+			else
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+			}
+		}
+		else if (command.startsWith("admin_transform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if ((obj == null) || !obj.isPlayer())
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
+			}
+			
+			final L2PcInstance player = obj.getActingPlayer();
+			if (activeChar.isSitting())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
+				return false;
+			}
+			
+			if (player.isTransformed())
+			{
+				if (!command.contains(" "))
+				{
+					player.untransform();
+					return true;
+				}
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+				return false;
+			}
+			
+			if (player.isInWater())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+				return false;
+			}
+			
+			if (player.isFlyingMounted() || player.isMounted())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
+				return false;
+			}
+			
+			final String[] parts = command.split(" ");
+			if ((parts.length != 2) || !Util.isDigit(parts[1]))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
+				return false;
+			}
+			
+			final int id = Integer.parseInt(parts[1]);
+			if (!player.transform(id, true))
+			{
+				player.sendMessage("Unknown transformation ID: " + id);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 77a1c41d05..d3bd33d2bd 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -166,9 +166,7 @@ public final class SummonNpc extends AbstractEffect
 					return;
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(z);
+				spawn.setXYZ(x, y, z);
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index dc3e4e89db..47532438f4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -236,7 +236,7 @@ public class L2AttackableAI extends L2CharacterAI
 				}
 				else if (npc.getSpawn() != null)
 				{
-					final Location loc = npc.getSpawn().getLocation();
+					final Location loc = npc.getSpawn();
 					final int range = Config.MAX_DRIFT_RANGE;
 					
 					if (!npc.isInsideRadius3D(loc, range + range))
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 6f14d18350..ced8c5abd2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -95,9 +95,7 @@ public class DBSpawnManager
 				if (template != null)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(rset.getInt("x"));
-					spawn.setY(rset.getInt("y"));
-					spawn.setZ(rset.getInt("z"));
+					spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 					spawn.setAmount(1);
 					spawn.setHeading(rset.getInt("heading"));
 					
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index dd51e17d3a..b99c5e77d5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -261,9 +261,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java
index 99c7644d62..7818e92ace 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.ActionHandler;
@@ -29,7 +28,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -58,18 +56,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private Instance _instance = null;
+	private Instance _instance;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	private boolean _isTargetable = true;
@@ -253,12 +251,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -546,7 +538,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -556,7 +548,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -566,7 +558,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -576,7 +568,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -614,37 +606,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading);
 	}
 	
 	/**
@@ -656,9 +618,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -693,7 +655,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -745,10 +707,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
 	}
 	
 	/**
@@ -760,7 +722,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -782,7 +744,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -804,7 +766,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -826,7 +788,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -848,7 +810,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 15a8278ba2..8a79e5a62e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -32,9 +32,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 
@@ -45,7 +43,7 @@ import com.l2jmobius.gameserver.model.zone.ZoneId;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -59,10 +57,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	private int _currentCount;
 	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
 	protected int _scheduledCount;
-	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0);
+	/** The spawn instance id */
 	private int _instanceId = 0;
 	/** Minimum respawn delay */
 	private int _respawnMinDelay;
@@ -121,6 +118,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -145,6 +143,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		_template = Objects.requireNonNull(NpcData.getInstance().getTemplate(npcId), "NpcTemplate not found for NPC ID: " + npcId);
 		
 		final String className = "com.l2jmobius.gameserver.model.actor.instance." + _template.getType() + "Instance";
@@ -187,122 +186,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -511,7 +394,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocz = loc.getZ();
 			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -519,9 +402,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -541,13 +424,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		// Set custom Npc server side name and title
@@ -666,12 +549,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		_instanceId = instanceId;
 	}
 	
-	@Override
-	public String toString()
-	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -691,4 +568,10 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	{
 		return _spawnTemplate;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
+	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java
index 3794527a37..58d1d53b7a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java
@@ -67,16 +67,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -87,16 +77,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -107,16 +87,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -126,9 +96,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java
index ef36048457..2fd7bbd949 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -152,9 +152,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 32f94719bb..0000000000
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
index 1e0c221723..5105984804 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -258,7 +258,7 @@ public final class Transform implements IIdentifiable
 			}
 			
 			// Get player a bit higher so he doesn't drops underground after transformation happens
-			creature.setZ(creature.getZ() + (int) getCollisionHeight(creature, 0));
+			creature.setXYZ(creature.getX(), creature.getY(), (int) (creature.getZ() + getCollisionHeight(creature, 0)));
 			
 			if (creature.isPlayer())
 			{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 4e95946a36..ddf453be2f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -482,9 +482,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -517,9 +515,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java
index c6da2bb89a..2f1da41c76 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java
@@ -1188,9 +1188,7 @@ public final class Castle extends AbstractResidence
 					LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
 					return;
 				}
-				spawn.setX(holder.getX());
-				spawn.setY(holder.getY());
-				spawn.setZ(holder.getZ());
+				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
 				npc.broadcastInfo();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 2433d41209..e6262fdc29 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1141,9 +1141,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1172,9 +1170,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1201,9 +1197,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1235,9 +1229,7 @@ public final class Fort extends AbstractResidence
 					final int npcId = rs.getInt("npcId");
 					final L2Spawn spawnDat = new L2Spawn(npcId);
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index c7a8bd6dfa..ffba04e6c3 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1107,9 +1107,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
@@ -1159,9 +1157,7 @@ public class FortSiege implements Siegable
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index 30f14f06d1..e6e46b43b3 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -165,9 +165,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -284,7 +282,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 9bcd361cf1..83d2d134a0 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2239,9 +2239,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 69ea87477d..f074b2d205 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index e82ff33af3..4c640e9cc1 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -46,27 +45,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (object.isVisibleFor(activeChar))
 			{
-				client.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 5bf6a45dbd..e71b29cd3f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index 879e19683b..e67d9d48d7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,45 +17,16 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-		}
+		_item = item;
 	}
 	
 	@Override
@@ -63,15 +34,14 @@ public final class SpawnItem implements IClientOutgoingPacket
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
 		
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
-		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
 		return true;
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/readme.txt b/L2J_Mobius_1.0_Ertheia/readme.txt
index 40300675f2..5fa255c84d 100644
--- a/L2J_Mobius_1.0_Ertheia/readme.txt
+++ b/L2J_Mobius_1.0_Ertheia/readme.txt
@@ -108,6 +108,7 @@ Others:
 -Reworked quest system
 -Reworked spawn system
 -Reworked drop system
+-Reworked L2World, L2WorldRegion and L2Object
 -Skill system from L2jUnity
 -GeoEngine from aCis
 
diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml b/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml
index 5c950f6b4f..e13a988301 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml
@@ -163,10 +163,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -237,8 +233,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -435,9 +429,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/effects_menu.htm
index ca2623c4a4..c9f2df314e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index bcd1197689..f8def00096 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -136,7 +136,7 @@ public final class TeredorWarzone extends AbstractInstance
 				}
 				case "TEREDOR_LAIR_CHECK":
 				{
-					final Location spawnLoc = npc.getSpawn().getLocation();
+					final Location spawnLoc = npc.getSpawn();
 					
 					if (((spawnLoc.getX() - npc.getX()) > 1000) || ((spawnLoc.getX() - npc.getX()) < -2000))
 					{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java
index 732d4ba43c..b7205aed76 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java
@@ -112,7 +112,6 @@ import handlers.admincommandhandlers.AdminPcCafePoints;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPrimePoints;
 import handlers.admincommandhandlers.AdminPunishment;
@@ -134,6 +133,7 @@ import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
@@ -446,7 +446,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPrimePoints.class,
 			AdminPunishment.class,
@@ -468,6 +467,7 @@ public class MasterHandler
 			AdminTargetSay.class,
 			AdminTeleport.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
 			AdminZone.class,
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f4c750c59d..74ff8b1526 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -58,7 +58,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -89,10 +88,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -369,25 +364,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index e85c59974a..b0110c6100 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -65,8 +65,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -305,38 +303,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -557,7 +523,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -566,7 +532,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 7d5f27c846..19857bc7da 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -482,9 +482,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
@@ -530,9 +528,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.setAmount(1);
 			spawn.setHeading(h);
 			spawn.setRespawnDelay(60);
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index d6809021ab..35508761a2 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(template1);
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -583,9 +581,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
similarity index 60%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index 7a423a5bdc..edda44bde2 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -1,198 +1,121 @@
-/*
- * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-import com.l2jmobius.gameserver.util.BuilderUtil;
-import com.l2jmobius.gameserver.util.Util;
-
-/**
- * Polymorph admin command implementation.
- * @author Zoey76
- */
-public class AdminPolymorph implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_polymorph",
-		"admin_unpolymorph",
-		"admin_transform",
-		"admin_untransform",
-		"admin_transform_menu",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (command.equals("admin_transform_menu"))
-		{
-			AdminHtml.showAdminHtml(activeChar, "transform.htm");
-			return true;
-		}
-		else if (command.startsWith("admin_untransform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-			}
-		}
-		else if (command.startsWith("admin_transform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if ((obj == null) || !obj.isPlayer())
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-				return false;
-			}
-			
-			final L2PcInstance player = obj.getActingPlayer();
-			if (activeChar.isSitting())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
-				return false;
-			}
-			
-			if (player.isTransformed())
-			{
-				if (!command.contains(" "))
-				{
-					player.untransform();
-					return true;
-				}
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
-				return false;
-			}
-			
-			if (player.isInWater())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
-				return false;
-			}
-			
-			if (player.isFlyingMounted() || player.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
-				return false;
-			}
-			
-			final String[] parts = command.split(" ");
-			if ((parts.length != 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
-				return false;
-			}
-			
-			final int id = Integer.parseInt(parts[1]);
-			if (!player.transform(id, true))
-			{
-				player.sendMessage("Unknown transformation ID: " + id);
-				return false;
-			}
-		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(activeChar.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-}
+/*
+ * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * @author Mobius
+ */
+public class AdminTransform implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_transform",
+		"admin_untransform",
+		"admin_transform_menu",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance activeChar)
+	{
+		if (command.equals("admin_transform_menu"))
+		{
+			AdminHtml.showAdminHtml(activeChar, "transform.htm");
+			return true;
+		}
+		else if (command.startsWith("admin_untransform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if (obj.isCharacter())
+			{
+				((L2Character) obj).stopTransformation(true);
+			}
+			else
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+			}
+		}
+		else if (command.startsWith("admin_transform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if ((obj == null) || !obj.isPlayer())
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
+			}
+			
+			final L2PcInstance player = obj.getActingPlayer();
+			if (activeChar.isSitting())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
+				return false;
+			}
+			
+			if (player.isTransformed())
+			{
+				if (!command.contains(" "))
+				{
+					player.untransform();
+					return true;
+				}
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+				return false;
+			}
+			
+			if (player.isInWater())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+				return false;
+			}
+			
+			if (player.isFlyingMounted() || player.isMounted())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
+				return false;
+			}
+			
+			final String[] parts = command.split(" ");
+			if ((parts.length != 2) || !Util.isDigit(parts[1]))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
+				return false;
+			}
+			
+			final int id = Integer.parseInt(parts[1]);
+			if (!player.transform(id, true))
+			{
+				player.sendMessage("Unknown transformation ID: " + id);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 77a1c41d05..d3bd33d2bd 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -166,9 +166,7 @@ public final class SummonNpc extends AbstractEffect
 					return;
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(z);
+				spawn.setXYZ(x, y, z);
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5e58bae9c1..9b49df1495 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -236,7 +236,7 @@ public class L2AttackableAI extends L2CharacterAI
 				}
 				else if (npc.getSpawn() != null)
 				{
-					final Location loc = npc.getSpawn().getLocation();
+					final Location loc = npc.getSpawn();
 					final int range = Config.MAX_DRIFT_RANGE;
 					
 					if (!npc.isInsideRadius3D(loc, range + range))
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 6f14d18350..ced8c5abd2 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -95,9 +95,7 @@ public class DBSpawnManager
 				if (template != null)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(rset.getInt("x"));
-					spawn.setY(rset.getInt("y"));
-					spawn.setZ(rset.getInt("z"));
+					spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 					spawn.setAmount(1);
 					spawn.setHeading(rset.getInt("heading"));
 					
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index dd51e17d3a..b99c5e77d5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -261,9 +261,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java
index 99c7644d62..7818e92ace 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.ActionHandler;
@@ -29,7 +28,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -58,18 +56,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private Instance _instance = null;
+	private Instance _instance;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	private boolean _isTargetable = true;
@@ -253,12 +251,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -546,7 +538,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -556,7 +548,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -566,7 +558,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -576,7 +568,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -614,37 +606,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading);
 	}
 	
 	/**
@@ -656,9 +618,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -693,7 +655,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -745,10 +707,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
 	}
 	
 	/**
@@ -760,7 +722,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -782,7 +744,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -804,7 +766,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -826,7 +788,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -848,7 +810,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 15a8278ba2..8a79e5a62e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -32,9 +32,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 
@@ -45,7 +43,7 @@ import com.l2jmobius.gameserver.model.zone.ZoneId;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -59,10 +57,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	private int _currentCount;
 	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
 	protected int _scheduledCount;
-	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0);
+	/** The spawn instance id */
 	private int _instanceId = 0;
 	/** Minimum respawn delay */
 	private int _respawnMinDelay;
@@ -121,6 +118,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -145,6 +143,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		_template = Objects.requireNonNull(NpcData.getInstance().getTemplate(npcId), "NpcTemplate not found for NPC ID: " + npcId);
 		
 		final String className = "com.l2jmobius.gameserver.model.actor.instance." + _template.getType() + "Instance";
@@ -187,122 +186,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -511,7 +394,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocz = loc.getZ();
 			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -519,9 +402,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -541,13 +424,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		// Set custom Npc server side name and title
@@ -666,12 +549,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		_instanceId = instanceId;
 	}
 	
-	@Override
-	public String toString()
-	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -691,4 +568,10 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	{
 		return _spawnTemplate;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
+	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java
index 3794527a37..58d1d53b7a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java
@@ -67,16 +67,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -87,16 +77,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -107,16 +87,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -126,9 +96,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java
index ef36048457..2fd7bbd949 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -152,9 +152,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 32f94719bb..0000000000
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
index 1e0c221723..5105984804 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -258,7 +258,7 @@ public final class Transform implements IIdentifiable
 			}
 			
 			// Get player a bit higher so he doesn't drops underground after transformation happens
-			creature.setZ(creature.getZ() + (int) getCollisionHeight(creature, 0));
+			creature.setXYZ(creature.getX(), creature.getY(), (int) (creature.getZ() + getCollisionHeight(creature, 0)));
 			
 			if (creature.isPlayer())
 			{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 4e95946a36..ddf453be2f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -482,9 +482,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -517,9 +515,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java
index c6da2bb89a..2f1da41c76 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java
@@ -1188,9 +1188,7 @@ public final class Castle extends AbstractResidence
 					LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
 					return;
 				}
-				spawn.setX(holder.getX());
-				spawn.setY(holder.getY());
-				spawn.setZ(holder.getZ());
+				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
 				npc.broadcastInfo();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 2433d41209..e6262fdc29 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1141,9 +1141,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1172,9 +1170,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1201,9 +1197,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1235,9 +1229,7 @@ public final class Fort extends AbstractResidence
 					final int npcId = rs.getInt("npcId");
 					final L2Spawn spawnDat = new L2Spawn(npcId);
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index c7a8bd6dfa..ffba04e6c3 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1107,9 +1107,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
@@ -1159,9 +1157,7 @@ public class FortSiege implements Siegable
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index 30f14f06d1..e6e46b43b3 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -165,9 +165,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -284,7 +282,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 9bcd361cf1..83d2d134a0 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2239,9 +2239,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 69ea87477d..f074b2d205 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index e82ff33af3..4c640e9cc1 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -46,27 +45,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (object.isVisibleFor(activeChar))
 			{
-				client.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 5bf6a45dbd..e71b29cd3f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index 879e19683b..e67d9d48d7 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,45 +17,16 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-		}
+		_item = item;
 	}
 	
 	@Override
@@ -63,15 +34,14 @@ public final class SpawnItem implements IClientOutgoingPacket
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
 		
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
-		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
 		return true;
 	}
diff --git a/L2J_Mobius_2.5_Underground/readme.txt b/L2J_Mobius_2.5_Underground/readme.txt
index 0691919395..fe29a6eb6e 100644
--- a/L2J_Mobius_2.5_Underground/readme.txt
+++ b/L2J_Mobius_2.5_Underground/readme.txt
@@ -122,6 +122,7 @@ Others:
 -Reworked quest system
 -Reworked spawn system
 -Reworked drop system
+-Reworked L2World, L2WorldRegion and L2Object
 -Skill system from L2jUnity
 -GeoEngine from aCis
 
diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml b/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml
index 5c950f6b4f..e13a988301 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml
@@ -163,10 +163,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -237,8 +233,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -435,9 +429,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/effects_menu.htm
index ca2623c4a4..c9f2df314e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index bcd1197689..f8def00096 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -136,7 +136,7 @@ public final class TeredorWarzone extends AbstractInstance
 				}
 				case "TEREDOR_LAIR_CHECK":
 				{
-					final Location spawnLoc = npc.getSpawn().getLocation();
+					final Location spawnLoc = npc.getSpawn();
 					
 					if (((spawnLoc.getX() - npc.getX()) > 1000) || ((spawnLoc.getX() - npc.getX()) < -2000))
 					{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java
index b861a892b4..821323df46 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java
@@ -112,7 +112,6 @@ import handlers.admincommandhandlers.AdminPcCafePoints;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPrimePoints;
 import handlers.admincommandhandlers.AdminPunishment;
@@ -134,6 +133,7 @@ import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
@@ -447,7 +447,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPrimePoints.class,
 			AdminPunishment.class,
@@ -469,6 +468,7 @@ public class MasterHandler
 			AdminTargetSay.class,
 			AdminTeleport.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
 			AdminZone.class,
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f4c750c59d..74ff8b1526 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -58,7 +58,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -89,10 +88,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -369,25 +364,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index e85c59974a..b0110c6100 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -65,8 +65,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -305,38 +303,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -557,7 +523,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -566,7 +532,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 7d5f27c846..19857bc7da 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -482,9 +482,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
@@ -530,9 +528,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.setAmount(1);
 			spawn.setHeading(h);
 			spawn.setRespawnDelay(60);
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index d6809021ab..35508761a2 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(template1);
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -583,9 +581,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
similarity index 60%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index 7a423a5bdc..edda44bde2 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -1,198 +1,121 @@
-/*
- * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-import com.l2jmobius.gameserver.util.BuilderUtil;
-import com.l2jmobius.gameserver.util.Util;
-
-/**
- * Polymorph admin command implementation.
- * @author Zoey76
- */
-public class AdminPolymorph implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_polymorph",
-		"admin_unpolymorph",
-		"admin_transform",
-		"admin_untransform",
-		"admin_transform_menu",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (command.equals("admin_transform_menu"))
-		{
-			AdminHtml.showAdminHtml(activeChar, "transform.htm");
-			return true;
-		}
-		else if (command.startsWith("admin_untransform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-			}
-		}
-		else if (command.startsWith("admin_transform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if ((obj == null) || !obj.isPlayer())
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-				return false;
-			}
-			
-			final L2PcInstance player = obj.getActingPlayer();
-			if (activeChar.isSitting())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
-				return false;
-			}
-			
-			if (player.isTransformed())
-			{
-				if (!command.contains(" "))
-				{
-					player.untransform();
-					return true;
-				}
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
-				return false;
-			}
-			
-			if (player.isInWater())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
-				return false;
-			}
-			
-			if (player.isFlyingMounted() || player.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
-				return false;
-			}
-			
-			final String[] parts = command.split(" ");
-			if ((parts.length != 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
-				return false;
-			}
-			
-			final int id = Integer.parseInt(parts[1]);
-			if (!player.transform(id, true))
-			{
-				player.sendMessage("Unknown transformation ID: " + id);
-				return false;
-			}
-		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(activeChar.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-}
+/*
+ * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * @author Mobius
+ */
+public class AdminTransform implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_transform",
+		"admin_untransform",
+		"admin_transform_menu",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance activeChar)
+	{
+		if (command.equals("admin_transform_menu"))
+		{
+			AdminHtml.showAdminHtml(activeChar, "transform.htm");
+			return true;
+		}
+		else if (command.startsWith("admin_untransform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if (obj.isCharacter())
+			{
+				((L2Character) obj).stopTransformation(true);
+			}
+			else
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+			}
+		}
+		else if (command.startsWith("admin_transform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if ((obj == null) || !obj.isPlayer())
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
+			}
+			
+			final L2PcInstance player = obj.getActingPlayer();
+			if (activeChar.isSitting())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
+				return false;
+			}
+			
+			if (player.isTransformed())
+			{
+				if (!command.contains(" "))
+				{
+					player.untransform();
+					return true;
+				}
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+				return false;
+			}
+			
+			if (player.isInWater())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+				return false;
+			}
+			
+			if (player.isFlyingMounted() || player.isMounted())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
+				return false;
+			}
+			
+			final String[] parts = command.split(" ");
+			if ((parts.length != 2) || !Util.isDigit(parts[1]))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
+				return false;
+			}
+			
+			final int id = Integer.parseInt(parts[1]);
+			if (!player.transform(id, true))
+			{
+				player.sendMessage("Unknown transformation ID: " + id);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 77a1c41d05..d3bd33d2bd 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -166,9 +166,7 @@ public final class SummonNpc extends AbstractEffect
 					return;
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(z);
+				spawn.setXYZ(x, y, z);
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5e58bae9c1..9b49df1495 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -236,7 +236,7 @@ public class L2AttackableAI extends L2CharacterAI
 				}
 				else if (npc.getSpawn() != null)
 				{
-					final Location loc = npc.getSpawn().getLocation();
+					final Location loc = npc.getSpawn();
 					final int range = Config.MAX_DRIFT_RANGE;
 					
 					if (!npc.isInsideRadius3D(loc, range + range))
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 6f14d18350..ced8c5abd2 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -95,9 +95,7 @@ public class DBSpawnManager
 				if (template != null)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(rset.getInt("x"));
-					spawn.setY(rset.getInt("y"));
-					spawn.setZ(rset.getInt("z"));
+					spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 					spawn.setAmount(1);
 					spawn.setHeading(rset.getInt("heading"));
 					
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index dd51e17d3a..b99c5e77d5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -261,9 +261,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java
index 99c7644d62..7818e92ace 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.ActionHandler;
@@ -29,7 +28,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -58,18 +56,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private Instance _instance = null;
+	private Instance _instance;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	private boolean _isTargetable = true;
@@ -253,12 +251,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -546,7 +538,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -556,7 +548,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -566,7 +558,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -576,7 +568,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -614,37 +606,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading);
 	}
 	
 	/**
@@ -656,9 +618,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -693,7 +655,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -745,10 +707,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
 	}
 	
 	/**
@@ -760,7 +722,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -782,7 +744,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -804,7 +766,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -826,7 +788,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -848,7 +810,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 15a8278ba2..8a79e5a62e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -32,9 +32,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 
@@ -45,7 +43,7 @@ import com.l2jmobius.gameserver.model.zone.ZoneId;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -59,10 +57,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	private int _currentCount;
 	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
 	protected int _scheduledCount;
-	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0);
+	/** The spawn instance id */
 	private int _instanceId = 0;
 	/** Minimum respawn delay */
 	private int _respawnMinDelay;
@@ -121,6 +118,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -145,6 +143,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		_template = Objects.requireNonNull(NpcData.getInstance().getTemplate(npcId), "NpcTemplate not found for NPC ID: " + npcId);
 		
 		final String className = "com.l2jmobius.gameserver.model.actor.instance." + _template.getType() + "Instance";
@@ -187,122 +186,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -511,7 +394,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocz = loc.getZ();
 			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -519,9 +402,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -541,13 +424,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		// Set custom Npc server side name and title
@@ -666,12 +549,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		_instanceId = instanceId;
 	}
 	
-	@Override
-	public String toString()
-	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -691,4 +568,10 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	{
 		return _spawnTemplate;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
+	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java
index 3794527a37..58d1d53b7a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java
@@ -67,16 +67,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -87,16 +77,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -107,16 +87,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -126,9 +96,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java
index ef36048457..2fd7bbd949 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -152,9 +152,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 32f94719bb..0000000000
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
index 1e0c221723..5105984804 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -258,7 +258,7 @@ public final class Transform implements IIdentifiable
 			}
 			
 			// Get player a bit higher so he doesn't drops underground after transformation happens
-			creature.setZ(creature.getZ() + (int) getCollisionHeight(creature, 0));
+			creature.setXYZ(creature.getX(), creature.getY(), (int) (creature.getZ() + getCollisionHeight(creature, 0)));
 			
 			if (creature.isPlayer())
 			{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 4e95946a36..ddf453be2f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -482,9 +482,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -517,9 +515,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java
index c6da2bb89a..2f1da41c76 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java
@@ -1188,9 +1188,7 @@ public final class Castle extends AbstractResidence
 					LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
 					return;
 				}
-				spawn.setX(holder.getX());
-				spawn.setY(holder.getY());
-				spawn.setZ(holder.getZ());
+				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
 				npc.broadcastInfo();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 2433d41209..e6262fdc29 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1141,9 +1141,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1172,9 +1170,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1201,9 +1197,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1235,9 +1229,7 @@ public final class Fort extends AbstractResidence
 					final int npcId = rs.getInt("npcId");
 					final L2Spawn spawnDat = new L2Spawn(npcId);
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index c7a8bd6dfa..ffba04e6c3 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1107,9 +1107,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
@@ -1159,9 +1157,7 @@ public class FortSiege implements Siegable
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index 30f14f06d1..e6e46b43b3 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -165,9 +165,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -284,7 +282,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 25a3f9ccdc..5eead0123d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2240,9 +2240,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 69ea87477d..f074b2d205 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index e82ff33af3..4c640e9cc1 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -46,27 +45,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (object.isVisibleFor(activeChar))
 			{
-				client.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 5bf6a45dbd..e71b29cd3f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index 879e19683b..e67d9d48d7 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,45 +17,16 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-		}
+		_item = item;
 	}
 	
 	@Override
@@ -63,15 +34,14 @@ public final class SpawnItem implements IClientOutgoingPacket
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
 		
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
-		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
 		return true;
 	}
diff --git a/L2J_Mobius_3.0_Helios/readme.txt b/L2J_Mobius_3.0_Helios/readme.txt
index 743f3af5c7..488906fed1 100644
--- a/L2J_Mobius_3.0_Helios/readme.txt
+++ b/L2J_Mobius_3.0_Helios/readme.txt
@@ -131,6 +131,7 @@ Others:
 -Reworked quest system
 -Reworked spawn system
 -Reworked drop system
+-Reworked L2World, L2WorldRegion and L2Object
 -Skill system from L2jUnity
 -GeoEngine from aCis
 
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml
index 5c950f6b4f..e13a988301 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml
@@ -163,10 +163,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -237,8 +233,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -435,9 +429,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/effects_menu.htm
index ca2623c4a4..c9f2df314e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index bcd1197689..f8def00096 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -136,7 +136,7 @@ public final class TeredorWarzone extends AbstractInstance
 				}
 				case "TEREDOR_LAIR_CHECK":
 				{
-					final Location spawnLoc = npc.getSpawn().getLocation();
+					final Location spawnLoc = npc.getSpawn();
 					
 					if (((spawnLoc.getX() - npc.getX()) > 1000) || ((spawnLoc.getX() - npc.getX()) < -2000))
 					{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java
index b861a892b4..821323df46 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java
@@ -112,7 +112,6 @@ import handlers.admincommandhandlers.AdminPcCafePoints;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPrimePoints;
 import handlers.admincommandhandlers.AdminPunishment;
@@ -134,6 +133,7 @@ import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
@@ -447,7 +447,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPrimePoints.class,
 			AdminPunishment.class,
@@ -469,6 +468,7 @@ public class MasterHandler
 			AdminTargetSay.class,
 			AdminTeleport.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
 			AdminZone.class,
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f4c750c59d..74ff8b1526 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -58,7 +58,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -89,10 +88,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -369,25 +364,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index e85c59974a..b0110c6100 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -65,8 +65,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -305,38 +303,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -557,7 +523,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -566,7 +532,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 7d5f27c846..19857bc7da 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -482,9 +482,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
@@ -530,9 +528,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.setAmount(1);
 			spawn.setHeading(h);
 			spawn.setRespawnDelay(60);
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index d6809021ab..35508761a2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(template1);
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -583,9 +581,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
similarity index 60%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index 7a423a5bdc..edda44bde2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -1,198 +1,121 @@
-/*
- * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-import com.l2jmobius.gameserver.util.BuilderUtil;
-import com.l2jmobius.gameserver.util.Util;
-
-/**
- * Polymorph admin command implementation.
- * @author Zoey76
- */
-public class AdminPolymorph implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_polymorph",
-		"admin_unpolymorph",
-		"admin_transform",
-		"admin_untransform",
-		"admin_transform_menu",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (command.equals("admin_transform_menu"))
-		{
-			AdminHtml.showAdminHtml(activeChar, "transform.htm");
-			return true;
-		}
-		else if (command.startsWith("admin_untransform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-			}
-		}
-		else if (command.startsWith("admin_transform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if ((obj == null) || !obj.isPlayer())
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-				return false;
-			}
-			
-			final L2PcInstance player = obj.getActingPlayer();
-			if (activeChar.isSitting())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
-				return false;
-			}
-			
-			if (player.isTransformed())
-			{
-				if (!command.contains(" "))
-				{
-					player.untransform();
-					return true;
-				}
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
-				return false;
-			}
-			
-			if (player.isInWater())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
-				return false;
-			}
-			
-			if (player.isFlyingMounted() || player.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
-				return false;
-			}
-			
-			final String[] parts = command.split(" ");
-			if ((parts.length != 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
-				return false;
-			}
-			
-			final int id = Integer.parseInt(parts[1]);
-			if (!player.transform(id, true))
-			{
-				player.sendMessage("Unknown transformation ID: " + id);
-				return false;
-			}
-		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(activeChar.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-}
+/*
+ * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * @author Mobius
+ */
+public class AdminTransform implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_transform",
+		"admin_untransform",
+		"admin_transform_menu",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance activeChar)
+	{
+		if (command.equals("admin_transform_menu"))
+		{
+			AdminHtml.showAdminHtml(activeChar, "transform.htm");
+			return true;
+		}
+		else if (command.startsWith("admin_untransform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if (obj.isCharacter())
+			{
+				((L2Character) obj).stopTransformation(true);
+			}
+			else
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+			}
+		}
+		else if (command.startsWith("admin_transform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if ((obj == null) || !obj.isPlayer())
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
+			}
+			
+			final L2PcInstance player = obj.getActingPlayer();
+			if (activeChar.isSitting())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
+				return false;
+			}
+			
+			if (player.isTransformed())
+			{
+				if (!command.contains(" "))
+				{
+					player.untransform();
+					return true;
+				}
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+				return false;
+			}
+			
+			if (player.isInWater())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+				return false;
+			}
+			
+			if (player.isFlyingMounted() || player.isMounted())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
+				return false;
+			}
+			
+			final String[] parts = command.split(" ");
+			if ((parts.length != 2) || !Util.isDigit(parts[1]))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
+				return false;
+			}
+			
+			final int id = Integer.parseInt(parts[1]);
+			if (!player.transform(id, true))
+			{
+				player.sendMessage("Unknown transformation ID: " + id);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 77a1c41d05..d3bd33d2bd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -166,9 +166,7 @@ public final class SummonNpc extends AbstractEffect
 					return;
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(z);
+				spawn.setXYZ(x, y, z);
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5e58bae9c1..9b49df1495 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -236,7 +236,7 @@ public class L2AttackableAI extends L2CharacterAI
 				}
 				else if (npc.getSpawn() != null)
 				{
-					final Location loc = npc.getSpawn().getLocation();
+					final Location loc = npc.getSpawn();
 					final int range = Config.MAX_DRIFT_RANGE;
 					
 					if (!npc.isInsideRadius3D(loc, range + range))
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 6f14d18350..ced8c5abd2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -95,9 +95,7 @@ public class DBSpawnManager
 				if (template != null)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(rset.getInt("x"));
-					spawn.setY(rset.getInt("y"));
-					spawn.setZ(rset.getInt("z"));
+					spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 					spawn.setAmount(1);
 					spawn.setHeading(rset.getInt("heading"));
 					
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index dd51e17d3a..b99c5e77d5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -261,9 +261,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java
index 99c7644d62..7818e92ace 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.ActionHandler;
@@ -29,7 +28,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -58,18 +56,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private Instance _instance = null;
+	private Instance _instance;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	private boolean _isTargetable = true;
@@ -253,12 +251,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -546,7 +538,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -556,7 +548,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -566,7 +558,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -576,7 +568,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -614,37 +606,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading);
 	}
 	
 	/**
@@ -656,9 +618,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -693,7 +655,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -745,10 +707,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
 	}
 	
 	/**
@@ -760,7 +722,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -782,7 +744,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -804,7 +766,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -826,7 +788,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -848,7 +810,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 15a8278ba2..8a79e5a62e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -32,9 +32,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 
@@ -45,7 +43,7 @@ import com.l2jmobius.gameserver.model.zone.ZoneId;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -59,10 +57,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	private int _currentCount;
 	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
 	protected int _scheduledCount;
-	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0);
+	/** The spawn instance id */
 	private int _instanceId = 0;
 	/** Minimum respawn delay */
 	private int _respawnMinDelay;
@@ -121,6 +118,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -145,6 +143,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		_template = Objects.requireNonNull(NpcData.getInstance().getTemplate(npcId), "NpcTemplate not found for NPC ID: " + npcId);
 		
 		final String className = "com.l2jmobius.gameserver.model.actor.instance." + _template.getType() + "Instance";
@@ -187,122 +186,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -511,7 +394,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocz = loc.getZ();
 			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -519,9 +402,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -541,13 +424,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		// Set custom Npc server side name and title
@@ -666,12 +549,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		_instanceId = instanceId;
 	}
 	
-	@Override
-	public String toString()
-	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -691,4 +568,10 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	{
 		return _spawnTemplate;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
+	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java
index 3794527a37..58d1d53b7a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java
@@ -67,16 +67,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -87,16 +77,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -107,16 +87,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -126,9 +96,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java
index ef36048457..2fd7bbd949 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -152,9 +152,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 32f94719bb..0000000000
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
index 1e0c221723..5105984804 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -258,7 +258,7 @@ public final class Transform implements IIdentifiable
 			}
 			
 			// Get player a bit higher so he doesn't drops underground after transformation happens
-			creature.setZ(creature.getZ() + (int) getCollisionHeight(creature, 0));
+			creature.setXYZ(creature.getX(), creature.getY(), (int) (creature.getZ() + getCollisionHeight(creature, 0)));
 			
 			if (creature.isPlayer())
 			{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 4e95946a36..ddf453be2f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -482,9 +482,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -517,9 +515,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java
index c6da2bb89a..2f1da41c76 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java
@@ -1188,9 +1188,7 @@ public final class Castle extends AbstractResidence
 					LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
 					return;
 				}
-				spawn.setX(holder.getX());
-				spawn.setY(holder.getY());
-				spawn.setZ(holder.getZ());
+				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
 				npc.broadcastInfo();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 2433d41209..e6262fdc29 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1141,9 +1141,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1172,9 +1170,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1201,9 +1197,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1235,9 +1229,7 @@ public final class Fort extends AbstractResidence
 					final int npcId = rs.getInt("npcId");
 					final L2Spawn spawnDat = new L2Spawn(npcId);
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index c7a8bd6dfa..ffba04e6c3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1107,9 +1107,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
@@ -1159,9 +1157,7 @@ public class FortSiege implements Siegable
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index 30f14f06d1..e6e46b43b3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -165,9 +165,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -284,7 +282,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 25a3f9ccdc..5eead0123d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2240,9 +2240,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 69ea87477d..f074b2d205 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index e82ff33af3..4c640e9cc1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -46,27 +45,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (object.isVisibleFor(activeChar))
 			{
-				client.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 1f17844940..73fa406dbd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index ac99402638..105d97138c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,54 +17,16 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
-	private int _enchantLevl;
-	private int _isAugmented;
-	private int _saCount;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-			_enchantLevl = item.getEnchantLevel();
-			_isAugmented = item.getAugmentation() != null ? 1 : 0;
-			_saCount = item.getSpecialAbilities().size();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-			_enchantLevl = 0;
-			_isAugmented = 0;
-			_saCount = 0;
-		}
+		_item = item;
 	}
 	
 	@Override
@@ -72,20 +34,18 @@ public final class SpawnItem implements IClientOutgoingPacket
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
 		
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
-		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
-		
-		packet.writeC(_enchantLevl); // Grand Crusade
-		packet.writeC(_isAugmented); // Grand Crusade
-		packet.writeC(_saCount); // Grand Crusade
+		packet.writeC(_item.getEnchantLevel()); // Grand Crusade
+		packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade
+		packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade
 		return true;
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/readme.txt b/L2J_Mobius_4.0_GrandCrusade/readme.txt
index 588aa56599..936ac268fa 100644
--- a/L2J_Mobius_4.0_GrandCrusade/readme.txt
+++ b/L2J_Mobius_4.0_GrandCrusade/readme.txt
@@ -135,6 +135,7 @@ Others:
 -Reworked quest system
 -Reworked spawn system
 -Reworked drop system
+-Reworked L2World, L2WorldRegion and L2Object
 -Skill system from L2jUnity
 -GeoEngine from aCis
 
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 f8ec28a692..f7ca1e8879 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
@@ -158,10 +158,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -232,8 +228,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -424,9 +418,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/effects_menu.htm
index 02ecb6ec46..b9d08c9546 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
index dfa7e4457a..bed0333b05 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
@@ -227,9 +227,7 @@ public class TarBeetleSpawn implements IGameXmlReader
 					{
 						final L2Spawn spawn = new L2Spawn(18804);
 						spawn.setHeading(Rnd.get(65535));
-						spawn.setX(location.getX());
-						spawn.setY(location.getY());
-						spawn.setZ(GeoEngine.getInstance().getHeight(location.getX(), location.getY(), location.getZ()));
+						spawn.setXYZ(location.getX(), location.getY(), GeoEngine.getInstance().getHeight(location.getX(), location.getY(), location.getZ()));
 						
 						final L2Npc npc = spawn.doSpawn();
 						npc.setRandomWalking(false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
index 5db6e6bd8a..86aba69118 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
@@ -745,9 +745,7 @@ public final class TowerOfNaia extends AbstractNpcAI
 			_sporeSpawn.add(npc);
 			npc.setWalking();
 			final int[] coord = SPORES_MOVE_POINTS[getRandom(SPORES_MOVE_POINTS.length)];
-			npc.getSpawn().setX(coord[0]);
-			npc.getSpawn().setY(coord[1]);
-			npc.getSpawn().setZ(coord[2]);
+			npc.getSpawn().setXYZ(coord[0], coord[1], coord[2]);
 			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(coord[0], coord[1], coord[2], 0));
 			startQuestTimer("despawn_spore", 60000, npc, null);
 		}
@@ -836,9 +834,7 @@ public final class TowerOfNaia extends AbstractNpcAI
 			npc.disableCoreAI(true);
 			npc.setRandomWalking(false);
 			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(coords[0], coords[1], coords[2], heading));
-			npc.getSpawn().setX(coords[0]);
-			npc.getSpawn().setY(coords[1]);
-			npc.getSpawn().setZ(coords[2]);
+			npc.getSpawn().setXYZ(coords[0], coords[1], coords[2]);
 		}
 		return time == 0 ? 100 : time;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 29bc44f5df..be7760d9de 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -717,9 +717,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 				try
 				{
 					_gourds[i] = new L2Spawn(GOURDS[i]);
-					_gourds[i].setX(ARENAS[i].getX() + 150);
-					_gourds[i].setY(ARENAS[i].getY() + 150);
-					_gourds[i].setZ(ARENAS[i].getZ());
+					_gourds[i].setXYZ(ARENAS[i].getX() + 150, ARENAS[i].getY() + 150, ARENAS[i].getZ());
 					_gourds[i].setHeading(1);
 					_gourds[i].setAmount(1);
 				}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index e4d4e764bd..eeec79ae92 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -82,7 +82,7 @@ public final class RaidbossInfo extends AbstractNpcAI
 				final L2Spawn spawn = SpawnTable.getInstance().getAnySpawn(bossId);
 				if (spawn != null)
 				{
-					final Location loc = spawn.getLocation();
+					final Location loc = spawn;
 					player.getRadar().addMarker(loc.getX(), loc.getY(), loc.getZ());
 				}
 			}
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 e686a858b5..7eff18e8f8 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
@@ -106,7 +106,6 @@ import handlers.admincommandhandlers.AdminPathNode;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPunishment;
 import handlers.admincommandhandlers.AdminQuest;
@@ -129,6 +128,7 @@ import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTerritoryWar;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminTvTEvent;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
@@ -406,7 +406,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPunishment.class,
 			AdminQuest.class,
@@ -429,6 +428,7 @@ public class MasterHandler
 			AdminTeleport.class,
 			AdminTerritoryWar.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminTvTEvent.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index 035b313608..881f2f8937 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -120,7 +120,7 @@ public class L2NpcActionShift implements IActionShiftHandler
 				if (((L2Npc) target).getSpawn().isTerritoryBased())
 				{
 					html.replace("%spawntype%", "Random");
-					final Location spawnLoc = ((L2Npc) target).getSpawn().getLocation();
+					final Location spawnLoc = ((L2Npc) target).getSpawn();
 					html.replace("%spawn%", spawnLoc.getX() + " " + spawnLoc.getY() + " " + spawnLoc.getZ());
 				}
 				else
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index a74c3a632b..799642665d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -50,7 +50,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -81,10 +80,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -349,27 +344,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.decayMe();
-			activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ());
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
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
index 05e4b52ccd..0034b41d2b 100644
--- 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
@@ -66,8 +66,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -307,38 +305,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -562,7 +528,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -571,7 +537,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index e395b0caa8..9ead73c334 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -458,9 +458,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index ea467da117..84f2d078bf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(target.getTemplate().getId());
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -587,9 +585,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
similarity index 57%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index 1917490f2b..1943eb7fc5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -22,21 +22,16 @@ import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
 import com.l2jmobius.gameserver.util.BuilderUtil;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
- * Polymorph admin command implementation.
- * @author Zoey76
+ * @author Mobius
  */
-public class AdminPolymorph implements IAdminCommandHandler
+public class AdminTransform implements IAdminCommandHandler
 {
 	private static final String[] ADMIN_COMMANDS =
 	{
-		"admin_polymorph",
-		"admin_unpolymorph",
 		"admin_transform",
 		"admin_untransform",
 		"admin_transform_menu",
@@ -115,28 +110,6 @@ public class AdminPolymorph implements IAdminCommandHandler
 				return false;
 			}
 		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
 		
 		return true;
 	}
@@ -146,56 +119,4 @@ public class AdminPolymorph implements IAdminCommandHandler
 	{
 		return ADMIN_COMMANDS;
 	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(Char.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.decayMe();
-			obj.spawnMe(obj.getX(), obj.getY(), obj.getZ());
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.decayMe();
-			target.spawnMe(target.getX(), target.getY(), target.getZ());
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 890d1d0987..5cdb8d9c3d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -159,9 +159,7 @@ public final class SummonNpc extends AbstractEffect
 					y += (Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20));
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(player.getZ());
+				spawn.setXYZ(x, y, player.getZ());
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java
index a27065bcd3..4a427bfc2b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java
@@ -2138,9 +2138,7 @@ public class SevenSignsFestival implements SpawnListener
 			{
 				final L2Spawn npcSpawn = new L2Spawn(_witchSpawn._npcId);
 				
-				npcSpawn.setX(_witchSpawn._x);
-				npcSpawn.setY(_witchSpawn._y);
-				npcSpawn.setZ(_witchSpawn._z);
+				npcSpawn.setXYZ(_witchSpawn._x, _witchSpawn._y, _witchSpawn._z);
 				npcSpawn.setHeading(_witchSpawn._heading);
 				npcSpawn.setAmount(1);
 				npcSpawn.setRespawnDelay(1);
@@ -2268,9 +2266,7 @@ public class SevenSignsFestival implements SpawnListener
 				{
 					final L2Spawn npcSpawn = new L2Spawn(currSpawn._npcId);
 					
-					npcSpawn.setX(currSpawn._x);
-					npcSpawn.setY(currSpawn._y);
-					npcSpawn.setZ(currSpawn._z);
+					npcSpawn.setXYZ(currSpawn._x, currSpawn._y, currSpawn._z);
 					npcSpawn.setHeading(Rnd.nextInt(65536));
 					npcSpawn.setAmount(1);
 					npcSpawn.setRespawnDelay(respawnDelay);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
index 91f87a9c86..1a5d1109c9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
@@ -263,9 +263,7 @@ public final class SpawnTable implements IGameXmlReader
 		{
 			spawnDat = new L2Spawn(spawnInfo.getInt("npcTemplateid"));
 			spawnDat.setAmount(spawnInfo.getInt("count", 1));
-			spawnDat.setX(spawnInfo.getInt("x", 0));
-			spawnDat.setY(spawnInfo.getInt("y", 0));
-			spawnDat.setZ(spawnInfo.getInt("z", 0));
+			spawnDat.setXYZ(spawnInfo.getInt("x", 0), spawnInfo.getInt("y", 0), spawnInfo.getInt("z", 0));
 			spawnDat.setHeading(spawnInfo.getInt("heading", -1));
 			spawnDat.setRespawnDelay(spawnInfo.getInt("respawnDelay", 0), spawnInfo.getInt("respawnRandom", 0));
 			spawnDat.setLocationId(spawnInfo.getInt("locId", 0));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java
index 898dd775ab..1c8aadeddc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java
@@ -188,9 +188,7 @@ public final class DimensionalRiftManager
 												{
 													final L2Spawn spawnDat = new L2Spawn(mobId);
 													spawnDat.setAmount(1);
-													spawnDat.setX(x);
-													spawnDat.setY(y);
-													spawnDat.setZ(z);
+													spawnDat.setXYZ(x, y, z);
 													spawnDat.setHeading(-1);
 													spawnDat.setRespawnDelay(delay);
 													SpawnTable.getInstance().addNewSpawn(spawnDat, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java
index e3be1761bd..8c462404aa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java
@@ -116,9 +116,7 @@ public final class FortSiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
index 6fe932cf97..2d088162f7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
@@ -281,33 +281,25 @@ public final class FourSepulchersManager
 				{
 					case 31921: // conquerors
 					{
-						spawnDat.setX(181061);
-						spawnDat.setY(-85595);
-						spawnDat.setZ(-7200);
+						spawnDat.setXYZ(181061, -85595, -7200);
 						spawnDat.setHeading(-32584);
 						break;
 					}
 					case 31922: // emperors
 					{
-						spawnDat.setX(179292);
-						spawnDat.setY(-88981);
-						spawnDat.setZ(-7200);
+						spawnDat.setXYZ(179292, -88981, -7200);
 						spawnDat.setHeading(-33272);
 						break;
 					}
 					case 31923: // sages
 					{
-						spawnDat.setX(173202);
-						spawnDat.setY(-87004);
-						spawnDat.setZ(-7200);
+						spawnDat.setXYZ(173202, -87004, -7200);
 						spawnDat.setHeading(-16248);
 						break;
 					}
 					case 31924: // judges
 					{
-						spawnDat.setX(175606);
-						spawnDat.setY(-82853);
-						spawnDat.setZ(-7200);
+						spawnDat.setXYZ(175606, -82853, -7200);
 						spawnDat.setHeading(-16248);
 						break;
 					}
@@ -422,9 +414,7 @@ public final class FourSepulchersManager
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npc_templateid"));
 					spawnDat.setAmount(rs.getInt("count"));
-					spawnDat.setX(rs.getInt("locx"));
-					spawnDat.setY(rs.getInt("locy"));
-					spawnDat.setZ(rs.getInt("locz"));
+					spawnDat.setXYZ(rs.getInt("locx"), rs.getInt("locy"), rs.getInt("locz"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(rs.getInt("respawn_delay"));
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -449,9 +439,7 @@ public final class FourSepulchersManager
 			{
 				final L2Spawn spawnDat = new L2Spawn(keyNpc.getValue());
 				spawnDat.setAmount(1);
-				spawnDat.setX(0);
-				spawnDat.setY(0);
-				spawnDat.setZ(0);
+				spawnDat.setXYZ(0, 0, 0);
 				spawnDat.setHeading(0);
 				spawnDat.setRespawnDelay(3600);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -489,9 +477,7 @@ public final class FourSepulchersManager
 						{
 							final L2Spawn spawnDat = new L2Spawn(rs2.getInt("npc_templateid"));
 							spawnDat.setAmount(rs2.getInt("count"));
-							spawnDat.setX(rs2.getInt("locx"));
-							spawnDat.setY(rs2.getInt("locy"));
-							spawnDat.setZ(rs2.getInt("locz"));
+							spawnDat.setXYZ(rs2.getInt("locx"), rs2.getInt("locy"), rs2.getInt("locz"));
 							spawnDat.setHeading(rs2.getInt("heading"));
 							spawnDat.setRespawnDelay(rs2.getInt("respawn_delay"));
 							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -537,9 +523,7 @@ public final class FourSepulchersManager
 						{
 							final L2Spawn spawnDat = new L2Spawn(rset2.getInt("npc_templateid"));
 							spawnDat.setAmount(rset2.getInt("count"));
-							spawnDat.setX(rset2.getInt("locx"));
-							spawnDat.setY(rset2.getInt("locy"));
-							spawnDat.setZ(rset2.getInt("locz"));
+							spawnDat.setXYZ(rset2.getInt("locx"), rset2.getInt("locy"), rset2.getInt("locz"));
 							spawnDat.setHeading(rset2.getInt("heading"));
 							spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
 							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -588,9 +572,7 @@ public final class FourSepulchersManager
 						{
 							final L2Spawn spawnDat = new L2Spawn(rset2.getInt("npc_templateid"));
 							spawnDat.setAmount(rset2.getInt("count"));
-							spawnDat.setX(rset2.getInt("locx"));
-							spawnDat.setY(rset2.getInt("locy"));
-							spawnDat.setZ(rset2.getInt("locz"));
+							spawnDat.setXYZ(rset2.getInt("locx"), rset2.getInt("locy"), rset2.getInt("locz"));
 							spawnDat.setHeading(rset2.getInt("heading"));
 							spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
 							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -637,9 +619,7 @@ public final class FourSepulchersManager
 						{
 							final L2Spawn spawnDat = new L2Spawn(rs2.getInt("npc_templateid"));
 							spawnDat.setAmount(rs2.getInt("count"));
-							spawnDat.setX(rs2.getInt("locx"));
-							spawnDat.setY(rs2.getInt("locy"));
-							spawnDat.setZ(rs2.getInt("locz"));
+							spawnDat.setXYZ(rs2.getInt("locx"), rs2.getInt("locy"), rs2.getInt("locz"));
 							spawnDat.setHeading(rs2.getInt("heading"));
 							spawnDat.setRespawnDelay(rs2.getInt("respawn_delay"));
 							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -678,9 +658,7 @@ public final class FourSepulchersManager
 			{
 				final L2Spawn spawnDat = new L2Spawn(_shadowSpawnLoc[locNo][i][0]);
 				spawnDat.setAmount(1);
-				spawnDat.setX(_shadowSpawnLoc[locNo][i][1]);
-				spawnDat.setY(_shadowSpawnLoc[locNo][i][2]);
-				spawnDat.setZ(_shadowSpawnLoc[locNo][i][3]);
+				spawnDat.setXYZ(_shadowSpawnLoc[locNo][i][1], _shadowSpawnLoc[locNo][i][2], _shadowSpawnLoc[locNo][i][3]);
 				spawnDat.setHeading(_shadowSpawnLoc[locNo][i][4]);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
 				_shadowSpawns.put(gateKeeper[i], spawnDat);
@@ -700,9 +678,7 @@ public final class FourSepulchersManager
 			{
 				final L2Spawn spawnDat = new L2Spawn(_victim.get(keyNpcId));
 				spawnDat.setAmount(1);
-				spawnDat.setX(0);
-				spawnDat.setY(0);
-				spawnDat.setZ(0);
+				spawnDat.setXYZ(0, 0, 0);
 				spawnDat.setHeading(0);
 				spawnDat.setRespawnDelay(3600);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1131,7 +1107,7 @@ public final class FourSepulchersManager
 				{
 					final L2Spawn keyBoxMobSpawn = new L2Spawn(18149);
 					keyBoxMobSpawn.setAmount(1);
-					keyBoxMobSpawn.setLocation(spawnDat.getLocation());
+					keyBoxMobSpawn.setLocation(spawnDat);
 					keyBoxMobSpawn.setRespawnDelay(3600);
 					SpawnTable.getInstance().addNewSpawn(keyBoxMobSpawn, false);
 					mob = (L2SepulcherMonsterInstance) keyBoxMobSpawn.doSpawn();
@@ -1241,9 +1217,7 @@ public final class FourSepulchersManager
 		if (spawnDat != null)
 		{
 			spawnDat.setAmount(1);
-			spawnDat.setX(activeChar.getX());
-			spawnDat.setY(activeChar.getY());
-			spawnDat.setZ(activeChar.getZ());
+			spawnDat.setXYZ(activeChar);
 			spawnDat.setHeading(activeChar.getHeading());
 			spawnDat.setRespawnDelay(3600);
 			_allMobs.add(spawnDat.doSpawn());
@@ -1262,9 +1236,7 @@ public final class FourSepulchersManager
 		if (spawnDat != null)
 		{
 			spawnDat.setAmount(1);
-			spawnDat.setX(activeChar.getX());
-			spawnDat.setY(activeChar.getY());
-			spawnDat.setZ(activeChar.getZ());
+			spawnDat.setXYZ(activeChar);
 			spawnDat.setHeading(activeChar.getHeading());
 			spawnDat.setRespawnDelay(3600);
 			_allMobs.add(spawnDat.doSpawn());
@@ -1332,9 +1304,7 @@ public final class FourSepulchersManager
 		{
 			final int keyNpcId = gateKeeper[i];
 			final L2Spawn spawnDat = _shadowSpawns.get(keyNpcId);
-			spawnDat.setX(_shadowSpawnLoc[locNo][i][1]);
-			spawnDat.setY(_shadowSpawnLoc[locNo][i][2]);
-			spawnDat.setZ(_shadowSpawnLoc[locNo][i][3]);
+			spawnDat.setXYZ(_shadowSpawnLoc[locNo][i][1], _shadowSpawnLoc[locNo][i][2], _shadowSpawnLoc[locNo][i][3]);
 			spawnDat.setHeading(_shadowSpawnLoc[locNo][i][4]);
 			_shadowSpawns.put(keyNpcId, spawnDat);
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
index d7d7514cd1..a80c726d07 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
@@ -82,9 +82,7 @@ public class RaidBossSpawnManager
 			while (rs.next())
 			{
 				final L2Spawn spawnDat = new L2Spawn(rs.getInt("boss_id"));
-				spawnDat.setX(rs.getInt("loc_x"));
-				spawnDat.setY(rs.getInt("loc_y"));
-				spawnDat.setZ(rs.getInt("loc_z"));
+				spawnDat.setXYZ(rs.getInt("loc_x"), rs.getInt("loc_y"), rs.getInt("loc_z"));
 				spawnDat.setAmount(rs.getInt("amount"));
 				spawnDat.setHeading(rs.getInt("heading"));
 				spawnDat.setRespawnDelay(rs.getInt("respawn_delay"), rs.getInt("respawn_random"));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index 5682868358..1ab184e465 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -202,9 +202,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
index ef3bc12244..5cfa8202f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
@@ -734,9 +734,7 @@ public final class TerritoryWarManager implements Siegable
 		{
 			final L2Spawn spawnDat = new L2Spawn(npcId);
 			spawnDat.setAmount(1);
-			spawnDat.setX(loc.getX());
-			spawnDat.setY(loc.getY());
-			spawnDat.setZ(loc.getZ());
+			spawnDat.setXYZ(loc);
 			spawnDat.setHeading(loc.getHeading());
 			spawnDat.stopRespawn();
 			return spawnDat.doSpawn(false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java
index 533f63de04..e19a54f2b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java
@@ -450,9 +450,7 @@ public class AutoSpawnHandler
 				final int heading = locationList[locationIndex].getHeading();
 				
 				final L2Spawn newSpawn = new L2Spawn(spawnInst.getId());
-				newSpawn.setX(x);
-				newSpawn.setY(y);
-				newSpawn.setZ(z);
+				newSpawn.setXYZ(x, y, z);
 				if (heading != -1)
 				{
 					newSpawn.setHeading(heading);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java
index a51ec1b48a..e952cfad5f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.enums.ShotType;
@@ -31,7 +30,6 @@ import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -61,18 +59,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private final AtomicInteger _instanceId = new AtomicInteger(0);
+	private volatile int _instanceId = 0;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	
@@ -255,12 +253,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -559,7 +551,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -569,7 +561,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -579,7 +571,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -589,7 +581,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -599,7 +591,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getInstanceId()
 	{
-		return _instanceId.get();
+		return _instanceId;
 	}
 	
 	/**
@@ -609,37 +601,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get(), _instanceId.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading, _instanceId);
 	}
 	
 	/**
@@ -651,9 +613,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -688,7 +650,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -699,7 +661,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setInstanceId(int instanceId)
 	{
-		if ((instanceId < 0) || (_instanceId.get() == instanceId))
+		if ((instanceId < 0) || (_instanceId == instanceId))
 		{
 			return;
 		}
@@ -714,7 +676,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		if (isPlayer())
 		{
 			final L2PcInstance player = getActingPlayer();
-			if ((_instanceId.get() > 0) && (oldI != null))
+			if ((_instanceId > 0) && (oldI != null))
 			{
 				oldI.removePlayer(_objectId);
 				if (oldI.isShowTimer())
@@ -738,7 +700,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		else if (isNpc())
 		{
 			final L2Npc npc = (L2Npc) this;
-			if ((_instanceId.get() > 0) && (oldI != null))
+			if ((_instanceId > 0) && (oldI != null))
 			{
 				oldI.removeNpc(npc);
 			}
@@ -748,7 +710,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 			}
 		}
 		
-		_instanceId.set(instanceId);
+		_instanceId = instanceId;
 	}
 	
 	/**
@@ -777,11 +739,11 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
-		_instanceId.set(loc.getInstanceId());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
+		_instanceId = loc.getInstanceId();
 	}
 	
 	/**
@@ -793,7 +755,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -815,7 +777,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -837,7 +799,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -859,7 +821,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -881,7 +843,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 467a7af8c5..13767423f8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -35,9 +35,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 import com.l2jmobius.gameserver.model.zone.type.NpcSpawnTerritory;
 
@@ -48,7 +46,7 @@ import com.l2jmobius.gameserver.model.zone.type.NpcSpawnTerritory;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -64,8 +62,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	protected int _scheduledCount;
 	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0, 0);
 	/** Link to NPC spawn territory */
 	private NpcSpawnTerritory _spawnTerritory = null;
 	/** Minimum respawn delay */
@@ -126,6 +122,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -184,122 +181,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -473,7 +354,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			
 			// Call the constructor of the L2Npc
 			final L2Npc npc = _constructor.newInstance(_template);
-			npc.setInstanceId(_location.getInstanceId()); // Must be done before object is spawned into visible world
+			npc.setInstanceId(getInstanceId()); // Must be done before object is spawned into visible world
 			if (isSummonSpawn)
 			{
 				npc.setShowSummonAnimation(isSummonSpawn);
@@ -506,8 +387,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocx = loc.getX();
 			newlocy = loc.getY();
 			newlocz = loc.getZ();
+			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -515,9 +397,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -549,13 +431,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		if (npc.isAttackable())
@@ -566,7 +448,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		if (Config.CHAMPION_ENABLE)
 		{
 			// Set champion on next spawn
-			if (npc.isMonster() && !npc.isQuestMonster() && !_template.isUndying() && !npc.isRaid() && !npc.isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (npc.getLevel() >= Config.CHAMP_MIN_LVL) && (npc.getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (_location.getInstanceId() == 0)))
+			if (npc.isMonster() && !npc.isQuestMonster() && !_template.isUndying() && !npc.isRaid() && !npc.isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (npc.getLevel() >= Config.CHAMP_MIN_LVL) && (npc.getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0)))
 			{
 				if (Rnd.get(100) < Config.CHAMPION_FREQUENCY)
 				{
@@ -679,7 +561,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public boolean isTerritoryBased()
 	{
-		return (_spawnTerritory != null) && (_location.getX() == 0) && (_location.getY() == 0);
+		return (_spawnTerritory != null) && (getX() == 0) && (getY() == 0);
 	}
 	
 	public L2Npc getLastSpawn()
@@ -697,18 +579,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _template;
 	}
 	
-	@Override
-	public int getInstanceId()
-	{
-		return _location.getInstanceId();
-	}
-	
-	@Override
-	public void setInstanceId(int instanceId)
-	{
-		_location.setInstanceId(instanceId);
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -732,6 +602,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	@Override
 	public String toString()
 	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java
index 64ca59fe1d..19776d38c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java
@@ -34,12 +34,12 @@ public class Location implements IPositionable
 	
 	public Location(int x, int y, int z)
 	{
-		this(x, y, z, 0, -1);
+		this(x, y, z, 0, 0);
 	}
 	
 	public Location(int x, int y, int z, int heading)
 	{
-		this(x, y, z, heading, -1);
+		this(x, y, z, heading, 0);
 	}
 	
 	public Location(L2Object obj)
@@ -66,16 +66,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -86,16 +76,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -106,16 +86,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -125,9 +95,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java
index 98acd02709..db099d3fa7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -151,9 +151,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 1c676a271b..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 79b293b863..271ae7da81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -478,9 +478,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(18672);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -506,9 +504,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 74d882d227..8d80280e75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1130,9 +1130,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1161,9 +1159,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1190,9 +1186,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1223,9 +1217,7 @@ public final class Fort extends AbstractResidence
 					final int castleId = rs.getInt("castleId");
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index 892a46cbad..a264d70085 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1101,9 +1101,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index ceb7744a4c..e66fb68471 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -156,9 +156,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -275,7 +273,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
index 8c282285cb..26228654ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
@@ -122,9 +122,7 @@ public class TvTEvent
 		{
 			_npcSpawn = new L2Spawn(Config.TVT_EVENT_PARTICIPATION_NPC_ID);
 			
-			_npcSpawn.setX(Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[0]);
-			_npcSpawn.setY(Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[1]);
-			_npcSpawn.setZ(Config.TVT_EVENT_PARTICIPATION_NPC_COORDINATES[2]);
+			_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);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
index 42c6f82bb4..aae7267265 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
@@ -156,9 +156,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 			while (rset.next())
 			{
 				final L2Spawn spawn = new L2Spawn(rset.getInt("npcId"));
-				spawn.setX(rset.getInt("x"));
-				spawn.setY(rset.getInt("y"));
-				spawn.setZ(rset.getInt("z"));
+				spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 				spawn.setHeading(rset.getInt("heading"));
 				spawn.setRespawnDelay(rset.getInt("respawnDelay"));
 				spawn.setAmount(1);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 6be79478de..25d219de73 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -1877,9 +1877,7 @@ public abstract class AbstractScript extends ManagedScript
 			final L2Spawn spawn = new L2Spawn(npcId);
 			spawn.setInstanceId(instanceId);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java
index 137b91c7cf..8e5df0ab43 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -429,9 +429,7 @@ public final class Instance
 				{
 					final L2Spawn spawnDat = new L2Spawn(set.getInt("npcId"));
 					
-					spawnDat.setX(set.getInt("x"));
-					spawnDat.setY(set.getInt("y"));
-					spawnDat.setZ(set.getInt("z"));
+					spawnDat.setXYZ(set.getInt("x"), set.getInt("y"), set.getInt("z"));
 					spawnDat.setAmount(1);
 					spawnDat.setHeading(set.getInt("heading"));
 					spawnDat.setRespawnDelay(set.getInt("respawn"), set.getInt("respawnRandom"));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 6b9f2a6728..5934a5b38d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 8a952011dd..e290c3dd54 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExBrExtraUserInfo;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -48,27 +47,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (!object.isVisibleFor(activeChar))
 			{
-				activeChar.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (!object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
index ac46019042..5a2e95688d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
@@ -18,11 +18,9 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.actor.L2Decoy;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
@@ -41,7 +39,6 @@ public class CharInfo implements IClientOutgoingPacket
 	private final int _flyRunSpd;
 	private final int _flyWalkSpd;
 	private final double _moveMultiplier;
-	private final float _attackSpeedMultiplier;
 	
 	private int _vehicleId = 0;
 	private final boolean _gmSeeInvis;
@@ -91,7 +88,6 @@ public class CharInfo implements IClientOutgoingPacket
 		_heading = _activeChar.getHeading();
 		_mAtkSpd = _activeChar.getMAtkSpd();
 		_pAtkSpd = (int) _activeChar.getPAtkSpd();
-		_attackSpeedMultiplier = _activeChar.getAttackSpeedMultiplier();
 		
 		_moveMultiplier = cha.getMovementSpeedMultiplier();
 		_runSpd = (int) Math.round(cha.getRunSpeed() / _moveMultiplier);
@@ -116,206 +112,135 @@ public class CharInfo implements IClientOutgoingPacket
 	@Override
 	public boolean write(PacketWriter packet)
 	{
-		final L2NpcTemplate template = _activeChar.getPoly().isMorphed() ? NpcData.getInstance().getTemplate(_activeChar.getPoly().getPolyId()) : null;
-		if (template != null)
+		OutgoingPackets.CHAR_INFO.writeId(packet);
+		packet.writeD(_x);
+		packet.writeD(_y);
+		packet.writeD(_z);
+		packet.writeD(_vehicleId);
+		packet.writeD(_objId);
+		packet.writeS(_activeChar.getAppearance().getVisibleName());
+		packet.writeD(_activeChar.getRace().ordinal());
+		packet.writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
+		packet.writeD(_activeChar.getBaseClass());
+		
+		for (int slot : getPaperdollOrder())
 		{
-			OutgoingPackets.NPC_INFO.writeId(packet);
-			packet.writeD(_objId);
-			packet.writeD(template.getId() + 1000000); // npctype id
-			packet.writeD(_activeChar.getKarma() > 0 ? 1 : 0);
-			packet.writeD(_x);
-			packet.writeD(_y);
-			packet.writeD(_z);
-			packet.writeD(_heading);
-			packet.writeD(0x00);
-			packet.writeD(_mAtkSpd);
-			packet.writeD(_pAtkSpd);
-			packet.writeD(_runSpd);
-			packet.writeD(_walkSpd);
-			packet.writeD(_swimRunSpd);
-			packet.writeD(_swimWalkSpd);
-			packet.writeD(_flyRunSpd);
-			packet.writeD(_flyWalkSpd);
-			packet.writeD(_flyRunSpd);
-			packet.writeD(_flyWalkSpd);
-			packet.writeF(_moveMultiplier);
-			packet.writeF(_attackSpeedMultiplier);
-			packet.writeF(template.getfCollisionRadius());
-			packet.writeF(template.getfCollisionHeight());
-			packet.writeD(template.getRHandId()); // right hand weapon
-			packet.writeD(template.getChestId()); // chest
-			packet.writeD(template.getLHandId()); // left hand weapon
-			packet.writeC(1); // name above char 1=true ... ??
-			packet.writeC(_activeChar.isRunning() ? 1 : 0);
-			packet.writeC(_activeChar.isInCombat() ? 1 : 0);
-			packet.writeC(_activeChar.isAlikeDead() ? 1 : 0);
-			packet.writeC(!_gmSeeInvis && _activeChar.isInvisible() ? 1 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
-			
-			packet.writeD(-1); // High Five NPCString ID
-			packet.writeS(_activeChar.getAppearance().getVisibleName());
-			packet.writeD(-1); // High Five NPCString ID
-			packet.writeS(_gmSeeInvis ? "Invisible" : _activeChar.getAppearance().getVisibleTitle());
-			
-			packet.writeD(_activeChar.getAppearance().getTitleColor()); // Title color 0=client default
-			packet.writeD(_activeChar.getPvpFlag()); // pvp flag
-			packet.writeD(_activeChar.getKarma()); // karma ??
-			
-			packet.writeD(_gmSeeInvis ? (_activeChar.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _activeChar.getAbnormalVisualEffects()); // C2
-			
-			packet.writeD(_activeChar.getClanId()); // clan id
-			packet.writeD(_activeChar.getClanCrestId()); // crest id
-			packet.writeD(_activeChar.getAllyId()); // ally id
-			packet.writeD(_activeChar.getAllyCrestId()); // all crest
-			
-			packet.writeC(_activeChar.isFlying() ? 2 : 0); // is Flying
-			packet.writeC(_activeChar.getTeam().getId());
-			
-			packet.writeF(template.getfCollisionRadius());
-			packet.writeF(template.getfCollisionHeight());
-			
-			packet.writeD(0x00); // enchant effect
-			packet.writeD(_activeChar.isFlying() ? 2 : 0); // is Flying again?
-			
-			packet.writeD(0x00);
-			
-			packet.writeD(0x00); // CT1.5 Pet form and skills, Color effect
-			packet.writeC(template.isTargetable() ? 1 : 0); // targetable
-			packet.writeC(template.isShowName() ? 1 : 0); // show name
-			packet.writeC(_activeChar.getAbnormalVisualEffectSpecial());
-			packet.writeD(0x00);
+			packet.writeD(_activeChar.getInventory().getPaperdollItemDisplayId(slot));
+		}
+		
+		for (int slot : getPaperdollOrder())
+		{
+			packet.writeD(_activeChar.getInventory().getPaperdollAugmentationId(slot));
+		}
+		
+		packet.writeD(_activeChar.getInventory().getTalismanSlots());
+		packet.writeD(_activeChar.getInventory().canEquipCloak() ? 1 : 0);
+		
+		packet.writeD(_activeChar.getPvpFlag());
+		packet.writeD(_activeChar.getKarma());
+		
+		packet.writeD(_mAtkSpd);
+		packet.writeD(_pAtkSpd);
+		
+		packet.writeD(0x00); // ?
+		
+		packet.writeD(_runSpd);
+		packet.writeD(_walkSpd);
+		packet.writeD(_swimRunSpd);
+		packet.writeD(_swimWalkSpd);
+		packet.writeD(_flyRunSpd);
+		packet.writeD(_flyWalkSpd);
+		packet.writeD(_flyRunSpd);
+		packet.writeD(_flyWalkSpd);
+		packet.writeF(_moveMultiplier);
+		packet.writeF(_activeChar.getAttackSpeedMultiplier());
+		
+		packet.writeF(_activeChar.getCollisionRadius());
+		packet.writeF(_activeChar.getCollisionHeight());
+		
+		packet.writeD(_activeChar.getAppearance().getHairStyle());
+		packet.writeD(_activeChar.getAppearance().getHairColor());
+		packet.writeD(_activeChar.getAppearance().getFace());
+		
+		packet.writeS(_gmSeeInvis ? "Invisible" : _activeChar.getAppearance().getVisibleTitle());
+		
+		if (!_activeChar.isCursedWeaponEquipped())
+		{
+			packet.writeD(_activeChar.getClanId());
+			packet.writeD(_activeChar.getClanCrestId());
+			packet.writeD(_activeChar.getAllyId());
+			packet.writeD(_activeChar.getAllyCrestId());
 		}
 		else
 		{
-			OutgoingPackets.CHAR_INFO.writeId(packet);
-			packet.writeD(_x);
-			packet.writeD(_y);
-			packet.writeD(_z);
-			packet.writeD(_vehicleId);
-			packet.writeD(_objId);
-			packet.writeS(_activeChar.getAppearance().getVisibleName());
-			packet.writeD(_activeChar.getRace().ordinal());
-			packet.writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
-			packet.writeD(_activeChar.getBaseClass());
-			
-			for (int slot : getPaperdollOrder())
-			{
-				packet.writeD(_activeChar.getInventory().getPaperdollItemDisplayId(slot));
-			}
-			
-			for (int slot : getPaperdollOrder())
-			{
-				packet.writeD(_activeChar.getInventory().getPaperdollAugmentationId(slot));
-			}
-			
-			packet.writeD(_activeChar.getInventory().getTalismanSlots());
-			packet.writeD(_activeChar.getInventory().canEquipCloak() ? 1 : 0);
-			
-			packet.writeD(_activeChar.getPvpFlag());
-			packet.writeD(_activeChar.getKarma());
-			
-			packet.writeD(_mAtkSpd);
-			packet.writeD(_pAtkSpd);
-			
-			packet.writeD(0x00); // ?
-			
-			packet.writeD(_runSpd);
-			packet.writeD(_walkSpd);
-			packet.writeD(_swimRunSpd);
-			packet.writeD(_swimWalkSpd);
-			packet.writeD(_flyRunSpd);
-			packet.writeD(_flyWalkSpd);
-			packet.writeD(_flyRunSpd);
-			packet.writeD(_flyWalkSpd);
-			packet.writeF(_moveMultiplier);
-			packet.writeF(_activeChar.getAttackSpeedMultiplier());
-			
-			packet.writeF(_activeChar.getCollisionRadius());
-			packet.writeF(_activeChar.getCollisionHeight());
-			
-			packet.writeD(_activeChar.getAppearance().getHairStyle());
-			packet.writeD(_activeChar.getAppearance().getHairColor());
-			packet.writeD(_activeChar.getAppearance().getFace());
-			
-			packet.writeS(_gmSeeInvis ? "Invisible" : _activeChar.getAppearance().getVisibleTitle());
-			
-			if (!_activeChar.isCursedWeaponEquipped())
-			{
-				packet.writeD(_activeChar.getClanId());
-				packet.writeD(_activeChar.getClanCrestId());
-				packet.writeD(_activeChar.getAllyId());
-				packet.writeD(_activeChar.getAllyCrestId());
-			}
-			else
-			{
-				packet.writeD(0x00);
-				packet.writeD(0x00);
-				packet.writeD(0x00);
-				packet.writeD(0x00);
-			}
-			
-			packet.writeC(_activeChar.isSitting() ? 0 : 1); // standing = 1 sitting = 0
-			packet.writeC(_activeChar.isRunning() ? 1 : 0); // running = 1 walking = 0
-			packet.writeC(_activeChar.isInCombat() ? 1 : 0);
-			
-			packet.writeC(!_activeChar.isInOlympiadMode() && _activeChar.isAlikeDead() ? 1 : 0);
-			
-			packet.writeC(!_gmSeeInvis && _activeChar.isInvisible() ? 1 : 0); // invisible = 1 visible =0
-			
-			packet.writeC(_activeChar.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
-			packet.writeC(_activeChar.getPrivateStoreType().getId());
-			
-			packet.writeH(_activeChar.getCubics().size());
-			for (int cubicId : _activeChar.getCubics().keySet())
-			{
-				packet.writeH(cubicId);
-			}
-			
-			packet.writeC(_activeChar.isInPartyMatchRoom() ? 1 : 0);
-			
-			packet.writeD(_gmSeeInvis ? (_activeChar.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _activeChar.getAbnormalVisualEffects());
-			
-			packet.writeC(_activeChar.isInsideZone(ZoneId.WATER) ? 1 : _activeChar.isFlyingMounted() ? 2 : 0);
-			
-			packet.writeH(_activeChar.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue)
-			packet.writeD(_activeChar.getMountNpcId() + 1000000);
-			packet.writeD(_activeChar.getClassId().getId());
-			packet.writeD(0x00); // ?
-			packet.writeC(_activeChar.isMounted() ? 0 : _activeChar.getEnchantEffect());
-			
-			packet.writeC(_activeChar.getTeam().getId());
-			
-			packet.writeD(_activeChar.getClanCrestLargeId());
-			packet.writeC(_activeChar.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I
-			packet.writeC(_activeChar.isHero() || (_activeChar.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura
-			
-			packet.writeC(_activeChar.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0)
-			packet.writeD(_activeChar.getFishx());
-			packet.writeD(_activeChar.getFishy());
-			packet.writeD(_activeChar.getFishz());
-			
-			packet.writeD(_activeChar.getAppearance().getNameColor());
-			
-			packet.writeD(_heading);
-			
-			packet.writeD(_activeChar.getPledgeClass());
-			packet.writeD(_activeChar.getPledgeType());
-			
-			packet.writeD(_activeChar.getAppearance().getTitleColor());
-			
-			packet.writeD(_activeChar.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_activeChar.getCursedWeaponEquippedId()) : 0);
-			
-			packet.writeD(_activeChar.getClanId() > 0 ? _activeChar.getClan().getReputationScore() : 0);
-			
-			// T1
-			packet.writeD(_activeChar.getTransformationDisplayId());
-			packet.writeD(_activeChar.getAgathionId());
-			
-			// T2
-			packet.writeD(0x01);
-			
-			// T2.3
-			packet.writeD(_activeChar.getAbnormalVisualEffectSpecial());
+			packet.writeD(0x00);
+			packet.writeD(0x00);
+			packet.writeD(0x00);
+			packet.writeD(0x00);
 		}
+		
+		packet.writeC(_activeChar.isSitting() ? 0 : 1); // standing = 1 sitting = 0
+		packet.writeC(_activeChar.isRunning() ? 1 : 0); // running = 1 walking = 0
+		packet.writeC(_activeChar.isInCombat() ? 1 : 0);
+		
+		packet.writeC(!_activeChar.isInOlympiadMode() && _activeChar.isAlikeDead() ? 1 : 0);
+		
+		packet.writeC(!_gmSeeInvis && _activeChar.isInvisible() ? 1 : 0); // invisible = 1 visible =0
+		
+		packet.writeC(_activeChar.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
+		packet.writeC(_activeChar.getPrivateStoreType().getId());
+		
+		packet.writeH(_activeChar.getCubics().size());
+		for (int cubicId : _activeChar.getCubics().keySet())
+		{
+			packet.writeH(cubicId);
+		}
+		
+		packet.writeC(_activeChar.isInPartyMatchRoom() ? 1 : 0);
+		
+		packet.writeD(_gmSeeInvis ? (_activeChar.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _activeChar.getAbnormalVisualEffects());
+		
+		packet.writeC(_activeChar.isInsideZone(ZoneId.WATER) ? 1 : _activeChar.isFlyingMounted() ? 2 : 0);
+		
+		packet.writeH(_activeChar.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue)
+		packet.writeD(_activeChar.getMountNpcId() + 1000000);
+		packet.writeD(_activeChar.getClassId().getId());
+		packet.writeD(0x00); // ?
+		packet.writeC(_activeChar.isMounted() ? 0 : _activeChar.getEnchantEffect());
+		
+		packet.writeC(_activeChar.getTeam().getId());
+		
+		packet.writeD(_activeChar.getClanCrestLargeId());
+		packet.writeC(_activeChar.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I
+		packet.writeC(_activeChar.isHero() || (_activeChar.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura
+		
+		packet.writeC(_activeChar.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0)
+		packet.writeD(_activeChar.getFishx());
+		packet.writeD(_activeChar.getFishy());
+		packet.writeD(_activeChar.getFishz());
+		
+		packet.writeD(_activeChar.getAppearance().getNameColor());
+		
+		packet.writeD(_heading);
+		
+		packet.writeD(_activeChar.getPledgeClass());
+		packet.writeD(_activeChar.getPledgeType());
+		
+		packet.writeD(_activeChar.getAppearance().getTitleColor());
+		
+		packet.writeD(_activeChar.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_activeChar.getCursedWeaponEquippedId()) : 0);
+		
+		packet.writeD(_activeChar.getClanId() > 0 ? _activeChar.getClan().getReputationScore() : 0);
+		
+		// T1
+		packet.writeD(_activeChar.getTransformationDisplayId());
+		packet.writeD(_activeChar.getAgathionId());
+		
+		// T2
+		packet.writeD(0x01);
+		
+		// T2.3
+		packet.writeD(_activeChar.getAbnormalVisualEffectSpecial());
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 6ec9438892..b7dee785b6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index 3b9267a72f..a60466dbab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,60 +17,31 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-		}
+		_item = item;
 	}
 	
 	@Override
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
 		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
 		packet.writeD(0x00); // freya unk
 		return true;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
index 90517c7c08..4832caaa0d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
@@ -19,12 +19,10 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.ExperienceData;
-import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jmobius.gameserver.model.Elementals;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
@@ -173,14 +171,6 @@ public final class UserInfo implements IClientOutgoingPacket
 		{
 			title = "[Invisible]";
 		}
-		if (_activeChar.getPoly().isMorphed())
-		{
-			final L2NpcTemplate polyObj = NpcData.getInstance().getTemplate(_activeChar.getPoly().getPolyId());
-			if (polyObj != null)
-			{
-				title += " - " + polyObj.getName();
-			}
-		}
 		packet.writeS(title);
 		
 		packet.writeD(_activeChar.getClanId());
diff --git a/L2J_Mobius_CT_2.6_HighFive/readme.txt b/L2J_Mobius_CT_2.6_HighFive/readme.txt
index 29f2b861b3..7bff725dd2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/readme.txt
+++ b/L2J_Mobius_CT_2.6_HighFive/readme.txt
@@ -36,3 +36,4 @@ What is done
 -Faction System (Good vs Evil)
 -Fake players
 -Automated database backups
+-Reworked L2World, L2WorldRegion and L2Object
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml
index baec80a50b..1ea2f3ecb3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml
@@ -163,10 +163,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -237,8 +233,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -432,9 +426,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/effects_menu.htm
index ca2623c4a4..c9f2df314e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java
index a492afd034..2995b13721 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java
@@ -111,7 +111,6 @@ import handlers.admincommandhandlers.AdminPcCafePoints;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPrimePoints;
 import handlers.admincommandhandlers.AdminPunishment;
@@ -133,6 +132,7 @@ import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
@@ -446,7 +446,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPrimePoints.class,
 			AdminPunishment.class,
@@ -468,6 +467,7 @@ public class MasterHandler
 			AdminTargetSay.class,
 			AdminTeleport.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
 			AdminZone.class,
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f4c750c59d..74ff8b1526 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -58,7 +58,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -89,10 +88,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -369,25 +364,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index e85c59974a..b0110c6100 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -65,8 +65,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -305,38 +303,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -557,7 +523,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -566,7 +532,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
deleted file mode 100644
index 7a423a5bdc..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ /dev/null
@@ -1,198 +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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-import com.l2jmobius.gameserver.util.BuilderUtil;
-import com.l2jmobius.gameserver.util.Util;
-
-/**
- * Polymorph admin command implementation.
- * @author Zoey76
- */
-public class AdminPolymorph implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_polymorph",
-		"admin_unpolymorph",
-		"admin_transform",
-		"admin_untransform",
-		"admin_transform_menu",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (command.equals("admin_transform_menu"))
-		{
-			AdminHtml.showAdminHtml(activeChar, "transform.htm");
-			return true;
-		}
-		else if (command.startsWith("admin_untransform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-			}
-		}
-		else if (command.startsWith("admin_transform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if ((obj == null) || !obj.isPlayer())
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-				return false;
-			}
-			
-			final L2PcInstance player = obj.getActingPlayer();
-			if (activeChar.isSitting())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
-				return false;
-			}
-			
-			if (player.isTransformed())
-			{
-				if (!command.contains(" "))
-				{
-					player.untransform();
-					return true;
-				}
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
-				return false;
-			}
-			
-			if (player.isInWater())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
-				return false;
-			}
-			
-			if (player.isFlyingMounted() || player.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
-				return false;
-			}
-			
-			final String[] parts = command.split(" ");
-			if ((parts.length != 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
-				return false;
-			}
-			
-			final int id = Integer.parseInt(parts[1]);
-			if (!player.transform(id, true))
-			{
-				player.sendMessage("Unknown transformation ID: " + id);
-				return false;
-			}
-		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(activeChar.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 7d5f27c846..19857bc7da 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -482,9 +482,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
@@ -530,9 +528,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.setAmount(1);
 			spawn.setHeading(h);
 			spawn.setRespawnDelay(60);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index d6809021ab..35508761a2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(template1);
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -583,9 +581,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
new file mode 100644
index 0000000000..edda44bde2
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -0,0 +1,121 @@
+/*
+ * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * @author Mobius
+ */
+public class AdminTransform implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_transform",
+		"admin_untransform",
+		"admin_transform_menu",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance activeChar)
+	{
+		if (command.equals("admin_transform_menu"))
+		{
+			AdminHtml.showAdminHtml(activeChar, "transform.htm");
+			return true;
+		}
+		else if (command.startsWith("admin_untransform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if (obj.isCharacter())
+			{
+				((L2Character) obj).stopTransformation(true);
+			}
+			else
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+			}
+		}
+		else if (command.startsWith("admin_transform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if ((obj == null) || !obj.isPlayer())
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
+			}
+			
+			final L2PcInstance player = obj.getActingPlayer();
+			if (activeChar.isSitting())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
+				return false;
+			}
+			
+			if (player.isTransformed())
+			{
+				if (!command.contains(" "))
+				{
+					player.untransform();
+					return true;
+				}
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+				return false;
+			}
+			
+			if (player.isInWater())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+				return false;
+			}
+			
+			if (player.isFlyingMounted() || player.isMounted())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
+				return false;
+			}
+			
+			final String[] parts = command.split(" ");
+			if ((parts.length != 2) || !Util.isDigit(parts[1]))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
+				return false;
+			}
+			
+			final int id = Integer.parseInt(parts[1]);
+			if (!player.transform(id, true))
+			{
+				player.sendMessage("Unknown transformation ID: " + id);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 77a1c41d05..d3bd33d2bd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -166,9 +166,7 @@ public final class SummonNpc extends AbstractEffect
 					return;
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(z);
+				spawn.setXYZ(x, y, z);
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5e58bae9c1..9b49df1495 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -236,7 +236,7 @@ public class L2AttackableAI extends L2CharacterAI
 				}
 				else if (npc.getSpawn() != null)
 				{
-					final Location loc = npc.getSpawn().getLocation();
+					final Location loc = npc.getSpawn();
 					final int range = Config.MAX_DRIFT_RANGE;
 					
 					if (!npc.isInsideRadius3D(loc, range + range))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 6f14d18350..ced8c5abd2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -95,9 +95,7 @@ public class DBSpawnManager
 				if (template != null)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(rset.getInt("x"));
-					spawn.setY(rset.getInt("y"));
-					spawn.setZ(rset.getInt("z"));
+					spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 					spawn.setAmount(1);
 					spawn.setHeading(rset.getInt("heading"));
 					
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index dd51e17d3a..b99c5e77d5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -261,9 +261,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java
index 99c7644d62..7818e92ace 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.ActionHandler;
@@ -29,7 +28,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -58,18 +56,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private Instance _instance = null;
+	private Instance _instance;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	private boolean _isTargetable = true;
@@ -253,12 +251,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -546,7 +538,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -556,7 +548,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -566,7 +558,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -576,7 +568,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -614,37 +606,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading);
 	}
 	
 	/**
@@ -656,9 +618,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -693,7 +655,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -745,10 +707,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
 	}
 	
 	/**
@@ -760,7 +722,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -782,7 +744,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -804,7 +766,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -826,7 +788,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -848,7 +810,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 15a8278ba2..8a79e5a62e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -32,9 +32,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 
@@ -45,7 +43,7 @@ import com.l2jmobius.gameserver.model.zone.ZoneId;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -59,10 +57,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	private int _currentCount;
 	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
 	protected int _scheduledCount;
-	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0);
+	/** The spawn instance id */
 	private int _instanceId = 0;
 	/** Minimum respawn delay */
 	private int _respawnMinDelay;
@@ -121,6 +118,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -145,6 +143,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		_template = Objects.requireNonNull(NpcData.getInstance().getTemplate(npcId), "NpcTemplate not found for NPC ID: " + npcId);
 		
 		final String className = "com.l2jmobius.gameserver.model.actor.instance." + _template.getType() + "Instance";
@@ -187,122 +186,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -511,7 +394,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocz = loc.getZ();
 			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -519,9 +402,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -541,13 +424,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		// Set custom Npc server side name and title
@@ -666,12 +549,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		_instanceId = instanceId;
 	}
 	
-	@Override
-	public String toString()
-	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -691,4 +568,10 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	{
 		return _spawnTemplate;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
+	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java
index 3794527a37..58d1d53b7a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java
@@ -67,16 +67,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -87,16 +77,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -107,16 +87,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -126,9 +96,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java
index ef36048457..2fd7bbd949 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -152,9 +152,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 32f94719bb..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
index 1e0c221723..5105984804 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -258,7 +258,7 @@ public final class Transform implements IIdentifiable
 			}
 			
 			// Get player a bit higher so he doesn't drops underground after transformation happens
-			creature.setZ(creature.getZ() + (int) getCollisionHeight(creature, 0));
+			creature.setXYZ(creature.getX(), creature.getY(), (int) (creature.getZ() + getCollisionHeight(creature, 0)));
 			
 			if (creature.isPlayer())
 			{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 4e95946a36..ddf453be2f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -482,9 +482,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -517,9 +515,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java
index 9b249a9069..ca9513714d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java
@@ -1187,9 +1187,7 @@ public final class Castle extends AbstractResidence
 					LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
 					return;
 				}
-				spawn.setX(holder.getX());
-				spawn.setY(holder.getY());
-				spawn.setZ(holder.getZ());
+				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
 				npc.broadcastInfo();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 2433d41209..e6262fdc29 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1141,9 +1141,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1172,9 +1170,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1201,9 +1197,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1235,9 +1229,7 @@ public final class Fort extends AbstractResidence
 					final int npcId = rs.getInt("npcId");
 					final L2Spawn spawnDat = new L2Spawn(npcId);
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index c7a8bd6dfa..ffba04e6c3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1107,9 +1107,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
@@ -1159,9 +1157,7 @@ public class FortSiege implements Siegable
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index 30f14f06d1..e6e46b43b3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -165,9 +165,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -284,7 +282,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 7a518a5d31..a8702bd970 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2214,9 +2214,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 69ea87477d..f074b2d205 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index e82ff33af3..4c640e9cc1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -46,27 +45,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (object.isVisibleFor(activeChar))
 			{
-				client.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 5bf6a45dbd..e71b29cd3f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index 879e19683b..e67d9d48d7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,45 +17,16 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-		}
+		_item = item;
 	}
 	
 	@Override
@@ -63,15 +34,14 @@ public final class SpawnItem implements IClientOutgoingPacket
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
 		
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
-		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/AdminCommands.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/AdminCommands.xml
index baec80a50b..1ea2f3ecb3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/AdminCommands.xml
@@ -163,10 +163,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -237,8 +233,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -432,9 +426,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/effects_menu.htm
index ca2623c4a4..c9f2df314e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/MasterHandler.java
index a492afd034..2995b13721 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/MasterHandler.java
@@ -111,7 +111,6 @@ import handlers.admincommandhandlers.AdminPcCafePoints;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPrimePoints;
 import handlers.admincommandhandlers.AdminPunishment;
@@ -133,6 +132,7 @@ import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
@@ -446,7 +446,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPrimePoints.class,
 			AdminPunishment.class,
@@ -468,6 +467,7 @@ public class MasterHandler
 			AdminTargetSay.class,
 			AdminTeleport.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
 			AdminZone.class,
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f4c750c59d..74ff8b1526 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -58,7 +58,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -89,10 +88,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -369,25 +364,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index e85c59974a..b0110c6100 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -65,8 +65,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -305,38 +303,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -557,7 +523,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -566,7 +532,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
deleted file mode 100644
index 7a423a5bdc..0000000000
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ /dev/null
@@ -1,198 +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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-import com.l2jmobius.gameserver.util.BuilderUtil;
-import com.l2jmobius.gameserver.util.Util;
-
-/**
- * Polymorph admin command implementation.
- * @author Zoey76
- */
-public class AdminPolymorph implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_polymorph",
-		"admin_unpolymorph",
-		"admin_transform",
-		"admin_untransform",
-		"admin_transform_menu",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (command.equals("admin_transform_menu"))
-		{
-			AdminHtml.showAdminHtml(activeChar, "transform.htm");
-			return true;
-		}
-		else if (command.startsWith("admin_untransform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-			}
-		}
-		else if (command.startsWith("admin_transform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if ((obj == null) || !obj.isPlayer())
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-				return false;
-			}
-			
-			final L2PcInstance player = obj.getActingPlayer();
-			if (activeChar.isSitting())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
-				return false;
-			}
-			
-			if (player.isTransformed())
-			{
-				if (!command.contains(" "))
-				{
-					player.untransform();
-					return true;
-				}
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
-				return false;
-			}
-			
-			if (player.isInWater())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
-				return false;
-			}
-			
-			if (player.isFlyingMounted() || player.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
-				return false;
-			}
-			
-			final String[] parts = command.split(" ");
-			if ((parts.length != 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
-				return false;
-			}
-			
-			final int id = Integer.parseInt(parts[1]);
-			if (!player.transform(id, true))
-			{
-				player.sendMessage("Unknown transformation ID: " + id);
-				return false;
-			}
-		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(activeChar.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 7d5f27c846..19857bc7da 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -482,9 +482,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
@@ -530,9 +528,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.setAmount(1);
 			spawn.setHeading(h);
 			spawn.setRespawnDelay(60);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index d6809021ab..35508761a2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(template1);
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -583,9 +581,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
new file mode 100644
index 0000000000..edda44bde2
--- /dev/null
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -0,0 +1,121 @@
+/*
+ * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * @author Mobius
+ */
+public class AdminTransform implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_transform",
+		"admin_untransform",
+		"admin_transform_menu",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance activeChar)
+	{
+		if (command.equals("admin_transform_menu"))
+		{
+			AdminHtml.showAdminHtml(activeChar, "transform.htm");
+			return true;
+		}
+		else if (command.startsWith("admin_untransform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if (obj.isCharacter())
+			{
+				((L2Character) obj).stopTransformation(true);
+			}
+			else
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+			}
+		}
+		else if (command.startsWith("admin_transform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if ((obj == null) || !obj.isPlayer())
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
+			}
+			
+			final L2PcInstance player = obj.getActingPlayer();
+			if (activeChar.isSitting())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
+				return false;
+			}
+			
+			if (player.isTransformed())
+			{
+				if (!command.contains(" "))
+				{
+					player.untransform();
+					return true;
+				}
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+				return false;
+			}
+			
+			if (player.isInWater())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+				return false;
+			}
+			
+			if (player.isFlyingMounted() || player.isMounted())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
+				return false;
+			}
+			
+			final String[] parts = command.split(" ");
+			if ((parts.length != 2) || !Util.isDigit(parts[1]))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
+				return false;
+			}
+			
+			final int id = Integer.parseInt(parts[1]);
+			if (!player.transform(id, true))
+			{
+				player.sendMessage("Unknown transformation ID: " + id);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 77a1c41d05..d3bd33d2bd 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -166,9 +166,7 @@ public final class SummonNpc extends AbstractEffect
 					return;
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(z);
+				spawn.setXYZ(x, y, z);
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5e58bae9c1..9b49df1495 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -236,7 +236,7 @@ public class L2AttackableAI extends L2CharacterAI
 				}
 				else if (npc.getSpawn() != null)
 				{
-					final Location loc = npc.getSpawn().getLocation();
+					final Location loc = npc.getSpawn();
 					final int range = Config.MAX_DRIFT_RANGE;
 					
 					if (!npc.isInsideRadius3D(loc, range + range))
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 6f14d18350..ced8c5abd2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -95,9 +95,7 @@ public class DBSpawnManager
 				if (template != null)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(rset.getInt("x"));
-					spawn.setY(rset.getInt("y"));
-					spawn.setZ(rset.getInt("z"));
+					spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 					spawn.setAmount(1);
 					spawn.setHeading(rset.getInt("heading"));
 					
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index dd51e17d3a..b99c5e77d5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -261,9 +261,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java
index 99c7644d62..7818e92ace 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.ActionHandler;
@@ -29,7 +28,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -58,18 +56,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private Instance _instance = null;
+	private Instance _instance;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	private boolean _isTargetable = true;
@@ -253,12 +251,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -546,7 +538,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -556,7 +548,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -566,7 +558,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -576,7 +568,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -614,37 +606,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading);
 	}
 	
 	/**
@@ -656,9 +618,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -693,7 +655,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -745,10 +707,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
 	}
 	
 	/**
@@ -760,7 +722,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -782,7 +744,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -804,7 +766,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -826,7 +788,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -848,7 +810,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 15a8278ba2..8a79e5a62e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -32,9 +32,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 
@@ -45,7 +43,7 @@ import com.l2jmobius.gameserver.model.zone.ZoneId;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -59,10 +57,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	private int _currentCount;
 	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
 	protected int _scheduledCount;
-	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0);
+	/** The spawn instance id */
 	private int _instanceId = 0;
 	/** Minimum respawn delay */
 	private int _respawnMinDelay;
@@ -121,6 +118,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -145,6 +143,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		_template = Objects.requireNonNull(NpcData.getInstance().getTemplate(npcId), "NpcTemplate not found for NPC ID: " + npcId);
 		
 		final String className = "com.l2jmobius.gameserver.model.actor.instance." + _template.getType() + "Instance";
@@ -187,122 +186,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -511,7 +394,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocz = loc.getZ();
 			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -519,9 +402,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -541,13 +424,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		// Set custom Npc server side name and title
@@ -666,12 +549,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		_instanceId = instanceId;
 	}
 	
-	@Override
-	public String toString()
-	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -691,4 +568,10 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	{
 		return _spawnTemplate;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
+	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java
index 3794527a37..58d1d53b7a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java
@@ -67,16 +67,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -87,16 +77,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -107,16 +87,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -126,9 +96,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java
index ef36048457..2fd7bbd949 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -152,9 +152,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 32f94719bb..0000000000
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
index 1e0c221723..5105984804 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -258,7 +258,7 @@ public final class Transform implements IIdentifiable
 			}
 			
 			// Get player a bit higher so he doesn't drops underground after transformation happens
-			creature.setZ(creature.getZ() + (int) getCollisionHeight(creature, 0));
+			creature.setXYZ(creature.getX(), creature.getY(), (int) (creature.getZ() + getCollisionHeight(creature, 0)));
 			
 			if (creature.isPlayer())
 			{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 4e95946a36..ddf453be2f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -482,9 +482,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -517,9 +515,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java
index 9b249a9069..ca9513714d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java
@@ -1187,9 +1187,7 @@ public final class Castle extends AbstractResidence
 					LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
 					return;
 				}
-				spawn.setX(holder.getX());
-				spawn.setY(holder.getY());
-				spawn.setZ(holder.getZ());
+				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
 				npc.broadcastInfo();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 2433d41209..e6262fdc29 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1141,9 +1141,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1172,9 +1170,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1201,9 +1197,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1235,9 +1229,7 @@ public final class Fort extends AbstractResidence
 					final int npcId = rs.getInt("npcId");
 					final L2Spawn spawnDat = new L2Spawn(npcId);
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index c7a8bd6dfa..ffba04e6c3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1107,9 +1107,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
@@ -1159,9 +1157,7 @@ public class FortSiege implements Siegable
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index 30f14f06d1..e6e46b43b3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -165,9 +165,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -284,7 +282,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 7a518a5d31..a8702bd970 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2214,9 +2214,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 69ea87477d..f074b2d205 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index e82ff33af3..4c640e9cc1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -46,27 +45,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (object.isVisibleFor(activeChar))
 			{
-				client.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 1f17844940..73fa406dbd 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index ac99402638..105d97138c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,54 +17,16 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
-	private int _enchantLevl;
-	private int _isAugmented;
-	private int _saCount;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-			_enchantLevl = item.getEnchantLevel();
-			_isAugmented = item.getAugmentation() != null ? 1 : 0;
-			_saCount = item.getSpecialAbilities().size();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-			_enchantLevl = 0;
-			_isAugmented = 0;
-			_saCount = 0;
-		}
+		_item = item;
 	}
 	
 	@Override
@@ -72,20 +34,18 @@ public final class SpawnItem implements IClientOutgoingPacket
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
 		
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
-		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
-		
-		packet.writeC(_enchantLevl); // Grand Crusade
-		packet.writeC(_isAugmented); // Grand Crusade
-		packet.writeC(_saCount); // Grand Crusade
+		packet.writeC(_item.getEnchantLevel()); // Grand Crusade
+		packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade
+		packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade
 		return true;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/AdminCommands.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/AdminCommands.xml
index baec80a50b..1ea2f3ecb3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/AdminCommands.xml
@@ -163,10 +163,6 @@
 	<admin command="admin_para_all_menu" accessLevel="100" />
 	<admin command="admin_unpara_menu" accessLevel="100" />
 	<admin command="admin_para_menu" accessLevel="100" />
-	<admin command="admin_polyself" accessLevel="100" />
-	<admin command="admin_unpolyself" accessLevel="100" />
-	<admin command="admin_polyself_menu" accessLevel="100" />
-	<admin command="admin_unpolyself_menu" accessLevel="100" />
 	<admin command="admin_clearteams" accessLevel="100" />
 	<admin command="admin_setteam_close" accessLevel="100" />
 	<admin command="admin_setteam" accessLevel="100" />
@@ -237,8 +233,6 @@
 	<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_poly" accessLevel="100" />
-	<admin command="admin_event_control_unpoly" 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" />
@@ -432,9 +426,7 @@
 	<!-- ADMIN PLEDGE -->
 	<admin command="admin_pledge" accessLevel="100" />
 
-	<!-- ADMIN POLYMORPH -->
-	<admin command="admin_polymorph" accessLevel="100" />
-	<admin command="admin_unpolymorph" accessLevel="100" />
+	<!-- ADMIN TRANSFORM -->
 	<admin command="admin_transform" accessLevel="100" />
 	<admin command="admin_untransform" accessLevel="100" />
 	<admin command="admin_transform_menu" accessLevel="100" />
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/effects_menu.htm
index ca2623c4a4..c9f2df314e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/effects_menu.htm
@@ -16,12 +16,6 @@
 Character Based:<br1>
 <table width=270>
 <tr>
-<td><button value="PolyMorph" action="bypass -h admin_polymorph_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Un Poly" action="bypass -h admin_unpolymorph_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Poly Self" action="bypass -h admin_polyself_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="UnPolySlf" action="bypass -h admin_unpolyself_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
 <td><button value="Para" action="bypass -h admin_para_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Un Para" action="bypass -h admin_unpara_menu $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Para All" action="bypass -h admin_para_all_menu" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/MasterHandler.java
index a492afd034..2995b13721 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/MasterHandler.java
@@ -111,7 +111,6 @@ import handlers.admincommandhandlers.AdminPcCafePoints;
 import handlers.admincommandhandlers.AdminPcCondOverride;
 import handlers.admincommandhandlers.AdminPetition;
 import handlers.admincommandhandlers.AdminPledge;
-import handlers.admincommandhandlers.AdminPolymorph;
 import handlers.admincommandhandlers.AdminPremium;
 import handlers.admincommandhandlers.AdminPrimePoints;
 import handlers.admincommandhandlers.AdminPunishment;
@@ -133,6 +132,7 @@ import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
 import handlers.admincommandhandlers.AdminTest;
+import handlers.admincommandhandlers.AdminTransform;
 import handlers.admincommandhandlers.AdminUnblockIp;
 import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
@@ -446,7 +446,6 @@ public class MasterHandler
 			AdminPForge.class,
 			AdminPledge.class,
 			AdminZones.class,
-			AdminPolymorph.class,
 			AdminPremium.class,
 			AdminPrimePoints.class,
 			AdminPunishment.class,
@@ -468,6 +467,7 @@ public class MasterHandler
 			AdminTargetSay.class,
 			AdminTeleport.class,
 			AdminTest.class,
+			AdminTransform.class,
 			AdminUnblockIp.class,
 			AdminVitality.class,
 			AdminZone.class,
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f4c750c59d..74ff8b1526 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -58,7 +58,6 @@ import com.l2jmobius.gameserver.util.Util;
  * <li>gmspeed = temporary Super Haste effect.
  * <li>para/unpara = paralyze/remove paralysis from target
  * <li>para_all/unpara_all = same as para/unpara, affects the whole world.
- * <li>polyself/unpolyself = makes you look as a specified mob.
  * <li>changename = temporary change name
  * <li>clearteams/setteam_close/setteam = team related commands
  * <li>social = forces an L2Character instance to broadcast social action packets.
@@ -89,10 +88,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_para_all_menu",
 		"admin_unpara_menu",
 		"admin_para_menu",
-		"admin_polyself",
-		"admin_unpolyself",
-		"admin_polyself_menu",
-		"admin_unpolyself_menu",
 		"admin_clearteams",
 		"admin_setteam_close",
 		"admin_setteam",
@@ -369,25 +364,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_polyself"))
-		{
-			try
-			{
-				final String id = st.nextToken();
-				activeChar.getPoly().setPolyInfo("npc", id);
-				activeChar.teleToLocation(activeChar.getLocation());
-				activeChar.broadcastUserInfo();
-			}
-			catch (Exception e)
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polyself <npcId>");
-			}
-		}
-		else if (command.startsWith("admin_unpolyself"))
-		{
-			activeChar.getPoly().setPolyInfo(null, "1");
-			activeChar.broadcastUserInfo();
-		}
 		else if (command.equals("admin_clearteams"))
 		{
 			L2World.getInstance().forEachVisibleObject(activeChar, L2PcInstance.class, player ->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index e85c59974a..b0110c6100 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -65,8 +65,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 		"admin_event_name",
 		"admin_event_control_kill",
 		"admin_event_control_res",
-		"admin_event_control_poly",
-		"admin_event_control_unpoly",
 		"admin_event_control_transform",
 		"admin_event_control_untransform",
 		"admin_event_control_prize",
@@ -305,38 +303,6 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				showEventControl(activeChar);
 			}
-			else if (actualCommand.startsWith("admin_event_control_poly"))
-			{
-				final int teamId = Integer.parseInt(st.nextToken());
-				final String[] polyIds = new String[st.countTokens()];
-				int i = 0;
-				while (st.hasMoreElements()) // Every next ST should be a polymorph ID
-				{
-					polyIds[i++] = st.nextToken();
-				}
-				
-				for (L2PcInstance player : L2Event._teams.get(teamId))
-				{
-					player.getPoly().setPolyInfo("npc", polyIds[Rnd.get(polyIds.length)]);
-					player.teleToLocation(player.getLocation(), true);
-					player.broadcastUserInfo();
-				}
-				showEventControl(activeChar);
-			}
-			else if (actualCommand.startsWith("admin_event_control_unpoly"))
-			{
-				while (st.hasMoreElements()) // Every next ST should be a team number
-				{
-					for (L2PcInstance player : L2Event._teams.get(Integer.parseInt(st.nextToken())))
-					{
-						player.getPoly().setPolyInfo(null, "1");
-						player.decayMe();
-						player.spawnMe(player.getX(), player.getY(), player.getZ());
-						player.broadcastUserInfo();
-					}
-				}
-				showEventControl(activeChar);
-			}
 			else if (actualCommand.startsWith("admin_event_control_transform"))
 			{
 				final int teamId = Integer.parseInt(st.nextToken());
@@ -557,7 +523,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 		
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder sb = new StringBuilder();
-		sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
+		sb.append("<html><title>[ EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
 		sb.append(L2Event._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>");
@@ -566,7 +532,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 			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=\"Polymorph*\" action=\"bypass -h admin_event_control_poly $team_number $poly_id\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td><edit var=\"poly_id\" width=98 height=15></td></tr></table></td><td><font color=\"LEVEL\">Polymorphs the team into the NPC 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=\"UnPolymorph\" action=\"bypass -h admin_event_control_unpoly $team_number\" width=100 height=20 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><font color=\"LEVEL\">Unpolymorph the team</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>");
+		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);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
deleted file mode 100644
index 7a423a5bdc..0000000000
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ /dev/null
@@ -1,198 +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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-import com.l2jmobius.gameserver.util.BuilderUtil;
-import com.l2jmobius.gameserver.util.Util;
-
-/**
- * Polymorph admin command implementation.
- * @author Zoey76
- */
-public class AdminPolymorph implements IAdminCommandHandler
-{
-	private static final String[] ADMIN_COMMANDS =
-	{
-		"admin_polymorph",
-		"admin_unpolymorph",
-		"admin_transform",
-		"admin_untransform",
-		"admin_transform_menu",
-	};
-	
-	@Override
-	public boolean useAdminCommand(String command, L2PcInstance activeChar)
-	{
-		if (command.equals("admin_transform_menu"))
-		{
-			AdminHtml.showAdminHtml(activeChar, "transform.htm");
-			return true;
-		}
-		else if (command.startsWith("admin_untransform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-			}
-		}
-		else if (command.startsWith("admin_transform"))
-		{
-			final L2Object obj = activeChar.getTarget();
-			if ((obj == null) || !obj.isPlayer())
-			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-				return false;
-			}
-			
-			final L2PcInstance player = obj.getActingPlayer();
-			if (activeChar.isSitting())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
-				return false;
-			}
-			
-			if (player.isTransformed())
-			{
-				if (!command.contains(" "))
-				{
-					player.untransform();
-					return true;
-				}
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
-				return false;
-			}
-			
-			if (player.isInWater())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
-				return false;
-			}
-			
-			if (player.isFlyingMounted() || player.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
-				return false;
-			}
-			
-			final String[] parts = command.split(" ");
-			if ((parts.length != 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
-				return false;
-			}
-			
-			final int id = Integer.parseInt(parts[1]);
-			if (!player.transform(id, true))
-			{
-				player.sendMessage("Unknown transformation ID: " + id);
-				return false;
-			}
-		}
-		if (command.startsWith("admin_polymorph"))
-		{
-			final String[] parts = command.split(" ");
-			if ((parts.length < 2) || !Util.isDigit(parts[1]))
-			{
-				BuilderUtil.sendSysMessage(activeChar, "Usage: //polymorph [type] <id>");
-				return false;
-			}
-			
-			if (parts.length > 2)
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[2], parts[1]);
-			}
-			else
-			{
-				doPolymorph(activeChar, activeChar.getTarget(), parts[1], "npc");
-			}
-		}
-		else if (command.equals("admin_unpolymorph"))
-		{
-			doUnPolymorph(activeChar, activeChar.getTarget());
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
-	/**
-	 * Polymorph a creature.
-	 * @param activeChar the active Game Master
-	 * @param obj the target
-	 * @param id the polymorph ID
-	 * @param type the polymorph type
-	 */
-	private static void doPolymorph(L2PcInstance activeChar, L2Object obj, String id, String type)
-	{
-		if (obj != null)
-		{
-			obj.getPoly().setPolyInfo(type, id);
-			// animation
-			if (obj.isCharacter())
-			{
-				final L2Character Char = (L2Character) obj;
-				final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
-				Char.broadcastPacket(msk);
-				final SetupGauge sg = new SetupGauge(activeChar.getObjectId(), 0, 4000);
-				Char.sendPacket(sg);
-			}
-			// end of animation
-			obj.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Polymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-	
-	/**
-	 * Unpolymorh a creature.
-	 * @param activeChar the active Game Master
-	 * @param target the target
-	 */
-	private static void doUnPolymorph(L2PcInstance activeChar, L2Object target)
-	{
-		if (target != null)
-		{
-			target.getPoly().setPolyInfo(null, "1");
-			target.broadcastInfo();
-			BuilderUtil.sendSysMessage(activeChar, "Unpolymorph succeed");
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
-		}
-	}
-}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 7d5f27c846..19857bc7da 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -482,9 +482,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(target.getX());
-			spawn.setY(target.getY());
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target);
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
@@ -530,9 +528,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(template1);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.setAmount(1);
 			spawn.setHeading(h);
 			spawn.setRespawnDelay(60);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index d6809021ab..35508761a2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -546,9 +546,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				spawn = new L2Spawn(template1);
-				spawn.setX(activeChar.getX());
-				spawn.setY(activeChar.getY());
-				spawn.setZ(activeChar.getZ());
+				spawn.setXYZ(activeChar);
 				spawn.setAmount(1);
 				spawn.setHeading(activeChar.getHeading());
 				spawn.setRespawnDelay(respawnTime);
@@ -583,9 +581,7 @@ public class AdminTeleport implements IAdminCommandHandler
 			try
 			{
 				final L2Spawn spawnDat = new L2Spawn(target.getId());
-				spawnDat.setX(activeChar.getX());
-				spawnDat.setY(activeChar.getY());
-				spawnDat.setZ(activeChar.getZ());
+				spawnDat.setXYZ(activeChar);
 				spawnDat.setAmount(1);
 				spawnDat.setHeading(activeChar.getHeading());
 				spawnDat.setRespawnMinDelay(43200);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
new file mode 100644
index 0000000000..edda44bde2
--- /dev/null
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -0,0 +1,121 @@
+/*
+ * 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 com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * @author Mobius
+ */
+public class AdminTransform implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_transform",
+		"admin_untransform",
+		"admin_transform_menu",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance activeChar)
+	{
+		if (command.equals("admin_transform_menu"))
+		{
+			AdminHtml.showAdminHtml(activeChar, "transform.htm");
+			return true;
+		}
+		else if (command.startsWith("admin_untransform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if (obj.isCharacter())
+			{
+				((L2Character) obj).stopTransformation(true);
+			}
+			else
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+			}
+		}
+		else if (command.startsWith("admin_transform"))
+		{
+			final L2Object obj = activeChar.getTarget();
+			if ((obj == null) || !obj.isPlayer())
+			{
+				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
+			}
+			
+			final L2PcInstance player = obj.getActingPlayer();
+			if (activeChar.isSitting())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_SITTING);
+				return false;
+			}
+			
+			if (player.isTransformed())
+			{
+				if (!command.contains(" "))
+				{
+					player.untransform();
+					return true;
+				}
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+				return false;
+			}
+			
+			if (player.isInWater())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+				return false;
+			}
+			
+			if (player.isFlyingMounted() || player.isMounted())
+			{
+				activeChar.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
+				return false;
+			}
+			
+			final String[] parts = command.split(" ");
+			if ((parts.length != 2) || !Util.isDigit(parts[1]))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "Usage: //transform <id>");
+				return false;
+			}
+			
+			final int id = Integer.parseInt(parts[1]);
+			if (!player.transform(id, true))
+			{
+				player.sendMessage("Unknown transformation ID: " + id);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 77a1c41d05..d3bd33d2bd 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -166,9 +166,7 @@ public final class SummonNpc extends AbstractEffect
 					return;
 				}
 				
-				spawn.setX(x);
-				spawn.setY(y);
-				spawn.setZ(z);
+				spawn.setXYZ(x, y, z);
 				spawn.setHeading(player.getHeading());
 				spawn.stopRespawn();
 				
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5e58bae9c1..9b49df1495 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -236,7 +236,7 @@ public class L2AttackableAI extends L2CharacterAI
 				}
 				else if (npc.getSpawn() != null)
 				{
-					final Location loc = npc.getSpawn().getLocation();
+					final Location loc = npc.getSpawn();
 					final int range = Config.MAX_DRIFT_RANGE;
 					
 					if (!npc.isInsideRadius3D(loc, range + range))
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 6f14d18350..ced8c5abd2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -95,9 +95,7 @@ public class DBSpawnManager
 				if (template != null)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(rset.getInt("x"));
-					spawn.setY(rset.getInt("y"));
-					spawn.setZ(rset.getInt("z"));
+					spawn.setXYZ(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
 					spawn.setAmount(1);
 					spawn.setHeading(rset.getInt("heading"));
 					
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
index dd51e17d3a..b99c5e77d5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
@@ -261,9 +261,7 @@ public final class SiegeGuardManager
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java
index 99c7644d62..7818e92ace 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.ActionHandler;
@@ -29,7 +28,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jmobius.gameserver.model.events.ListenersContainer;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.interfaces.IDecayable;
@@ -58,18 +56,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	/** World Region */
 	private L2WorldRegion _worldRegion;
 	/** Instance type */
-	private InstanceType _instanceType = null;
+	private InstanceType _instanceType;
 	private volatile Map<String, Object> _scripts;
 	/** X coordinate */
-	private final AtomicInteger _x = new AtomicInteger(0);
+	private volatile int _x = 0;
 	/** Y coordinate */
-	private final AtomicInteger _y = new AtomicInteger(0);
+	private volatile int _y = 0;
 	/** Z coordinate */
-	private final AtomicInteger _z = new AtomicInteger(0);
+	private volatile int _z = 0;
 	/** Orientation */
-	private final AtomicInteger _heading = new AtomicInteger(0);
+	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
-	private Instance _instance = null;
+	private Instance _instance;
 	private boolean _isSpawned;
 	private boolean _isInvisible;
 	private boolean _isTargetable = true;
@@ -253,12 +251,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 		return _objectId;
 	}
 	
-	public final ObjectPoly getPoly()
-	{
-		final ObjectPoly poly = getScript(ObjectPoly.class);
-		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
-	}
-	
 	public abstract void sendInfo(L2PcInstance activeChar);
 	
 	public void sendPacket(IClientOutgoingPacket... packets)
@@ -546,7 +538,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getX()
 	{
-		return _x.get();
+		return _x;
 	}
 	
 	/**
@@ -556,7 +548,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getY()
 	{
-		return _y.get();
+		return _y;
 	}
 	
 	/**
@@ -566,7 +558,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getZ()
 	{
-		return _z.get();
+		return _z;
 	}
 	
 	/**
@@ -576,7 +568,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public int getHeading()
 	{
-		return _heading.get();
+		return _heading;
 	}
 	
 	/**
@@ -614,37 +606,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public Location getLocation()
 	{
-		return new Location(_x.get(), _y.get(), _z.get(), _heading.get());
-	}
-	
-	/**
-	 * Sets the X coordinate
-	 * @param newX the X coordinate
-	 */
-	@Override
-	public void setX(int newX)
-	{
-		_x.set(newX);
-	}
-	
-	/**
-	 * Sets the Y coordinate
-	 * @param newY the Y coordinate
-	 */
-	@Override
-	public void setY(int newY)
-	{
-		_y.set(newY);
-	}
-	
-	/**
-	 * Sets the Z coordinate
-	 * @param newZ the Z coordinate
-	 */
-	@Override
-	public void setZ(int newZ)
-	{
-		_z.set(newZ);
+		return new Location(_x, _y, _z, _heading);
 	}
 	
 	/**
@@ -656,9 +618,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setXYZ(int newX, int newY, int newZ)
 	{
-		setX(newX);
-		setY(newY);
-		setZ(newZ);
+		_x = newX;
+		_y = newY;
+		_z = newZ;
 		
 		if (_isSpawned)
 		{
@@ -693,7 +655,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setHeading(int newHeading)
 	{
-		_heading.set(newHeading);
+		_heading = newHeading;
 	}
 	
 	/**
@@ -745,10 +707,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	@Override
 	public void setLocation(Location loc)
 	{
-		_x.set(loc.getX());
-		_y.set(loc.getY());
-		_z.set(loc.getZ());
-		_heading.set(loc.getHeading());
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
 	}
 	
 	/**
@@ -760,7 +722,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance2D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2));
 	}
 	
 	/**
@@ -782,7 +744,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistance3D(int x, int y, int z)
 	{
-		return Math.sqrt(Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2));
+		return Math.sqrt(Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2));
 	}
 	
 	/**
@@ -804,7 +766,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq2D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2);
 	}
 	
 	/**
@@ -826,7 +788,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDistanceSq3D(int x, int y, int z)
 	{
-		return Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + Math.pow(z - _z.get(), 2);
+		return Math.pow(x - _x, 2) + Math.pow(y - _y, 2) + Math.pow(z - _z, 2);
 	}
 	
 	/**
@@ -848,7 +810,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	 */
 	public double calculateDirectionTo(ILocational target)
 	{
-		int heading = Util.calculateHeadingFrom(this, target) - _heading.get();
+		int heading = Util.calculateHeadingFrom(this, target) - _heading;
 		if (heading < 0)
 		{
 			heading = 65535 + heading;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 15a8278ba2..8a79e5a62e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -32,9 +32,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.interfaces.INamable;
-import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 
@@ -45,7 +43,7 @@ import com.l2jmobius.gameserver.model.zone.ZoneId;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable, IIdentifiable, INamable
+public class L2Spawn extends Location implements IIdentifiable, INamable
 {
 	protected static final Logger LOGGER = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -59,10 +57,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	private int _currentCount;
 	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
 	protected int _scheduledCount;
-	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	/** The identifier of the location area where L2NpcInstance can be spawned */
 	private int _locationId;
-	/** The Location of this NPC spawn. */
-	private Location _location = new Location(0, 0, 0, 0);
+	/** The spawn instance id */
 	private int _instanceId = 0;
 	/** Minimum respawn delay */
 	private int _respawnMinDelay;
@@ -121,6 +118,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		// Set the _template of the L2Spawn
 		_template = template;
 		
@@ -145,6 +143,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	 */
 	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException
 	{
+		super(0, 0, 0);
 		_template = Objects.requireNonNull(NpcData.getInstance().getTemplate(npcId), "NpcTemplate not found for NPC ID: " + npcId);
 		
 		final String className = "com.l2jmobius.gameserver.model.actor.instance." + _template.getType() + "Instance";
@@ -187,122 +186,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _locationId;
 	}
 	
-	@Override
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
-	/**
-	 * @return the X position of the spawn point.
-	 */
-	@Override
-	public int getX()
-	{
-		return _location.getX();
-	}
-	
-	/**
-	 * Set the X position of the spawn point.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_location.setX(x);
-	}
-	
-	/**
-	 * @return the Y position of the spawn point.
-	 */
-	@Override
-	public int getY()
-	{
-		return _location.getY();
-	}
-	
-	/**
-	 * Set the Y position of the spawn point.
-	 * @param y the y coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_location.setY(y);
-	}
-	
-	/**
-	 * @return the Z position of the spawn point.
-	 */
-	@Override
-	public int getZ()
-	{
-		return _location.getZ();
-	}
-	
-	/**
-	 * Set the Z position of the spawn point.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_location.setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param x The x coordinate.
-	 * @param y The y coordinate.
-	 * @param z The z coordinate.
-	 */
-	@Override
-	public void setXYZ(int x, int y, int z)
-	{
-		setX(x);
-		setY(y);
-		setZ(z);
-	}
-	
-	/**
-	 * Set the x, y, z position of the spawn point.
-	 * @param loc The location.
-	 */
-	@Override
-	public void setXYZ(ILocational loc)
-	{
-		setXYZ(loc.getX(), loc.getY(), loc.getZ());
-	}
-	
-	/**
-	 * @return the heading of L2NpcInstance when they are spawned.
-	 */
-	@Override
-	public int getHeading()
-	{
-		return _location.getHeading();
-	}
-	
-	/**
-	 * Set the heading of L2NpcInstance when they are spawned.
-	 * @param heading
-	 */
-	@Override
-	public void setHeading(int heading)
-	{
-		_location.setHeading(heading);
-	}
-	
-	/**
-	 * Set the XYZ position of the spawn point.
-	 * @param loc
-	 */
-	@Override
-	public void setLocation(Location loc)
-	{
-		_location = loc;
-	}
-	
 	/**
 	 * Gets the NPC ID.
 	 * @return the NPC ID
@@ -511,7 +394,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 			newlocz = loc.getZ();
 			setLocation(loc);
 		}
-		else if ((_location.getX() == 0) && (_location.getY() == 0))
+		else if ((getX() == 0) && (getY() == 0))
 		{
 			LOGGER.warning("NPC " + npc + " doesn't have spawn location!");
 			return null;
@@ -519,9 +402,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		else
 		{
 			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
-			newlocx = _location.getX();
-			newlocy = _location.getY();
-			newlocz = _location.getZ();
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
 		}
 		
 		// If random spawn system is enabled
@@ -541,13 +424,13 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		npc.setRandomWalking(_randomWalk);
 		
 		// Set the heading of the L2NpcInstance (random heading if not defined)
-		if (_location.getHeading() == -1)
+		if (getHeading() == -1)
 		{
 			npc.setHeading(Rnd.nextInt(61794));
 		}
 		else
 		{
-			npc.setHeading(_location.getHeading());
+			npc.setHeading(getHeading());
 		}
 		
 		// Set custom Npc server side name and title
@@ -666,12 +549,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		_instanceId = instanceId;
 	}
 	
-	@Override
-	public String toString()
-	{
-		return "L2Spawn ID: " + _template.getId() + " " + _location;
-	}
-	
 	public final boolean getRandomWalking()
 	{
 		return _randomWalk;
@@ -691,4 +568,10 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	{
 		return _spawnTemplate;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "L2Spawn ID: " + _template.getId() + " X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + getHeading();
+	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java
index 3794527a37..58d1d53b7a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java
@@ -67,16 +67,6 @@ public class Location implements IPositionable
 		return _x;
 	}
 	
-	/**
-	 * Set the x coordinate.
-	 * @param x the x coordinate
-	 */
-	@Override
-	public void setX(int x)
-	{
-		_x = x;
-	}
-	
 	/**
 	 * Get the y coordinate.
 	 * @return the y coordinate
@@ -87,16 +77,6 @@ public class Location implements IPositionable
 		return _y;
 	}
 	
-	/**
-	 * Set the y coordinate.
-	 * @param y the x coordinate
-	 */
-	@Override
-	public void setY(int y)
-	{
-		_y = y;
-	}
-	
 	/**
 	 * Get the z coordinate.
 	 * @return the z coordinate
@@ -107,16 +87,6 @@ public class Location implements IPositionable
 		return _z;
 	}
 	
-	/**
-	 * Set the z coordinate.
-	 * @param z the z coordinate
-	 */
-	@Override
-	public void setZ(int z)
-	{
-		_z = z;
-	}
-	
 	/**
 	 * Set the x, y, z coordinates.
 	 * @param x the x coordinate
@@ -126,9 +96,9 @@ public class Location implements IPositionable
 	@Override
 	public void setXYZ(int x, int y, int z)
 	{
-		setX(x);
-		setY(y);
-		setZ(z);
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java
index ef36048457..2fd7bbd949 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java
@@ -152,9 +152,7 @@ public final class MobGroup
 				final int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				final int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
 				
-				spawn.setX(x + (signX * randX));
-				spawn.setY(y + (signY * randY));
-				spawn.setZ(z);
+				spawn.setXYZ(x + (signX * randX), y + (signY * randY), z);
 				spawn.stopRespawn();
 				
 				SpawnTable.getInstance().addNewSpawn(spawn, false);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java
deleted file mode 100644
index 32f94719bb..0000000000
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.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 com.l2jmobius.gameserver.model.actor.poly;
-
-import com.l2jmobius.gameserver.model.L2Object;
-
-public class ObjectPoly
-{
-	private final L2Object _activeObject;
-	private int _polyId;
-	private String _polyType;
-	
-	public ObjectPoly(L2Object activeObject)
-	{
-		_activeObject = activeObject;
-	}
-	
-	public void setPolyInfo(String polyType, String polyId)
-	{
-		setPolyId(Integer.parseInt(polyId));
-		setPolyType(polyType);
-	}
-	
-	public final L2Object getActiveObject()
-	{
-		return _activeObject;
-	}
-	
-	public final boolean isMorphed()
-	{
-		return _polyType != null;
-	}
-	
-	public final int getPolyId()
-	{
-		return _polyId;
-	}
-	
-	public final void setPolyId(int value)
-	{
-		_polyId = value;
-	}
-	
-	public final String getPolyType()
-	{
-		return _polyType;
-	}
-	
-	public final void setPolyType(String value)
-	{
-		_polyType = value;
-	}
-}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
index 1e0c221723..5105984804 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -258,7 +258,7 @@ public final class Transform implements IIdentifiable
 			}
 			
 			// Get player a bit higher so he doesn't drops underground after transformation happens
-			creature.setZ(creature.getZ() + (int) getCollisionHeight(creature, 0));
+			creature.setXYZ(creature.getX(), creature.getY(), (int) (creature.getZ() + getCollisionHeight(creature, 0)));
 			
 			if (creature.isPlayer())
 			{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
index 4e95946a36..ddf453be2f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
@@ -482,9 +482,7 @@ public final class BlockCheckerEngine
 				for (int i = 0; i < _numOfBoxes; i++)
 				{
 					final L2Spawn spawn = new L2Spawn(template);
-					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					spawn.setZ(_zCoord);
+					spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					spawn.setAmount(1);
 					spawn.setHeading(1);
 					spawn.setRespawnDelay(1);
@@ -517,9 +515,7 @@ public final class BlockCheckerEngine
 				try
 				{
 					final L2Spawn girlSpawn = new L2Spawn(18676);
-					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
-					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
-					girlSpawn.setZ(_zCoord);
+					girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), _zCoord);
 					girlSpawn.setAmount(1);
 					girlSpawn.setHeading(1);
 					girlSpawn.setRespawnDelay(1);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java
index 9b249a9069..ca9513714d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java
@@ -1187,9 +1187,7 @@ public final class Castle extends AbstractResidence
 					LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
 					return;
 				}
-				spawn.setX(holder.getX());
-				spawn.setY(holder.getY());
-				spawn.setZ(holder.getZ());
+				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
 				npc.broadcastInfo();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java
index 2433d41209..e6262fdc29 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java
@@ -1141,9 +1141,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -1172,9 +1170,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_siegeNpcs.add(spawnDat);
@@ -1201,9 +1197,7 @@ public final class Fort extends AbstractResidence
 				{
 					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_npcCommanders.add(spawnDat);
@@ -1235,9 +1229,7 @@ public final class Fort extends AbstractResidence
 					final int npcId = rs.getInt("npcId");
 					final L2Spawn spawnDat = new L2Spawn(npcId);
 					spawnDat.setAmount(1);
-					spawnDat.setX(rs.getInt("x"));
-					spawnDat.setY(rs.getInt("y"));
-					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					_specialEnvoys.add(spawnDat);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
index c7a8bd6dfa..ffba04e6c3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
@@ -1107,9 +1107,7 @@ public class FortSiege implements Siegable
 			{
 				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
 				spawnDat.setAmount(1);
-				spawnDat.setX(_sp.getLocation().getX());
-				spawnDat.setY(_sp.getLocation().getY());
-				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
 				spawnDat.doSpawn();
@@ -1159,9 +1157,7 @@ public class FortSiege implements Siegable
 				{
 					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
 					spawn.setAmount(1);
-					spawn.setX(rs.getInt("x"));
-					spawn.setY(rs.getInt("y"));
-					spawn.setZ(rs.getInt("z"));
+					spawn.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
 					spawn.setHeading(rs.getInt("heading"));
 					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
 					spawn.setLocationId(0);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/L2Event.java
index 30f14f06d1..e6e46b43b3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/L2Event.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/L2Event.java
@@ -165,9 +165,7 @@ public class L2Event
 		try
 		{
 			final L2Spawn spawn = new L2Spawn(_npcId);
-			spawn.setX(target.getX() + 50);
-			spawn.setY(target.getY() + 50);
-			spawn.setZ(target.getZ());
+			spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ());
 			spawn.setAmount(1);
 			spawn.setHeading(target.getHeading());
 			spawn.stopRespawn();
@@ -284,7 +282,6 @@ public class L2Event
 					player.setCurrentCp(player.getMaxCp());
 				}
 				
-				player.getPoly().setPolyInfo(null, "1");
 				player.decayMe();
 				player.spawnMe(player.getX(), player.getY(), player.getZ());
 				player.broadcastUserInfo();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
index 7a518a5d31..a8702bd970 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2214,9 +2214,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setX(x);
-			spawn.setY(y);
-			spawn.setZ(z);
+			spawn.setXYZ(x, y, z);
 			spawn.stopRespawn();
 			
 			final L2Npc npc = spawn.doSpawn(isSummonSpawn);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
index 69ea87477d..f074b2d205 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java
@@ -24,24 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
  */
 public interface IPositionable extends ILocational
 {
-	/**
-	 * Sets the X coordinate of this object.
-	 * @param x the new X coordinate
-	 */
-	void setX(int x);
-	
-	/**
-	 * Sets the Y coordinate of this object.
-	 * @param y the new Y coordinate
-	 */
-	void setY(int y);
-	
-	/**
-	 * Sets the Z coordinate of this object.
-	 * @param z the new Z coordinate
-	 */
-	void setZ(int z);
-	
 	/**
 	 * Sets all three coordinates of this object.
 	 * @param x the new X coordinate
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index e82ff33af3..4c640e9cc1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 public class RequestRecordInfo implements IClientIncomingPacket
@@ -46,27 +45,20 @@ public class RequestRecordInfo implements IClientIncomingPacket
 		
 		L2World.getInstance().forEachVisibleObject(activeChar, L2Object.class, object ->
 		{
-			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item"))
+			if (object.isVisibleFor(activeChar))
 			{
-				client.sendPacket(new SpawnItem(object));
-			}
-			else
-			{
-				if (object.isVisibleFor(activeChar))
+				object.sendInfo(activeChar);
+				
+				if (object.isCharacter())
 				{
-					object.sendInfo(activeChar);
-					
-					if (object.isCharacter())
+					// Update the state of the L2Character object client
+					// side by sending Server->Client packet
+					// MoveToPawn/CharMoveToLocation and AutoAttackStart to
+					// the L2PcInstance
+					final L2Character obj = (L2Character) object;
+					if (obj.getAI() != null)
 					{
-						// Update the state of the L2Character object client
-						// side by sending Server->Client packet
-						// MoveToPawn/CharMoveToLocation and AutoAttackStart to
-						// the L2PcInstance
-						final L2Character obj = (L2Character) object;
-						if (obj.getAI() != null)
-						{
-							obj.getAI().describeStateToPlayer(activeChar);
-						}
+						obj.getAI().describeStateToPlayer(activeChar);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index 1f17844940..73fa406dbd 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -34,13 +34,6 @@ public class DropItem implements IClientOutgoingPacket
 	{
 		_item = item;
 		_charObjId = playerObjId;
-		
-		// Future test.
-		if ((_item.getX() == 0) && (_item.getY() == 0))
-		{
-			LOGGER.warning("DropItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check SpawnItem, just in case.
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index ac99402638..105d97138c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -17,54 +17,16 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
-	private final int _objectId;
-	private int _itemId;
-	private final int _x, _y, _z;
-	private int _stackable;
-	private long _count;
-	private int _enchantLevl;
-	private int _isAugmented;
-	private int _saCount;
+	private final L2ItemInstance _item;
 	
-	public SpawnItem(L2Object obj)
+	public SpawnItem(L2ItemInstance item)
 	{
-		_objectId = obj.getObjectId();
-		_x = obj.getX();
-		_y = obj.getY();
-		_z = obj.getZ();
-		
-		// Future test.
-		if ((_x == 0) && (_y == 0))
-		{
-			LOGGER.warning("SpawnItem with x=0 and y=0.");
-			Thread.dumpStack(); // Why? Also check DropItem, just in case.
-		}
-		
-		if (obj.isItem())
-		{
-			final L2ItemInstance item = (L2ItemInstance) obj;
-			_itemId = item.getDisplayId();
-			_stackable = item.isStackable() ? 0x01 : 0x00;
-			_count = item.getCount();
-			_enchantLevl = item.getEnchantLevel();
-			_isAugmented = item.getAugmentation() != null ? 1 : 0;
-			_saCount = item.getSpecialAbilities().size();
-		}
-		else
-		{
-			_itemId = obj.getPoly().getPolyId();
-			_stackable = 0;
-			_count = 1;
-			_enchantLevl = 0;
-			_isAugmented = 0;
-			_saCount = 0;
-		}
+		_item = item;
 	}
 	
 	@Override
@@ -72,20 +34,18 @@ public final class SpawnItem implements IClientOutgoingPacket
 	{
 		OutgoingPackets.SPAWN_ITEM.writeId(packet);
 		
-		packet.writeD(_objectId);
-		packet.writeD(_itemId);
-		
-		packet.writeD(_x);
-		packet.writeD(_y);
-		packet.writeD(_z);
+		packet.writeD(_item.getObjectId());
+		packet.writeD(_item.getDisplayId());
+		packet.writeD(_item.getX());
+		packet.writeD(_item.getY());
+		packet.writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		packet.writeD(_stackable);
-		packet.writeQ(_count);
+		packet.writeD(_item.isStackable() ? 0x01 : 0x00);
+		packet.writeQ(_item.getCount());
 		packet.writeD(0x00); // c2
-		
-		packet.writeC(_enchantLevl); // Grand Crusade
-		packet.writeC(_isAugmented); // Grand Crusade
-		packet.writeC(_saCount); // Grand Crusade
+		packet.writeC(_item.getEnchantLevel()); // Grand Crusade
+		packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade
+		packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade
 		return true;
 	}
 }