Core/Entities: Phasing rewrite

Source/Game/Handlers/MiscHandler.cs

@@ -713,17 +713,6 @@ namespace Game
             _player.ApplyModFlag(PlayerFields.Flags, PlayerFlags.TaxiBenchmark, packet.Enable);
         }
 
-        public void SendSetPhaseShift(List<uint> phaseIds, List<uint> terrainswaps, List<uint> worldMapAreaSwaps)
-        {
-            PhaseShift phaseShift = new PhaseShift();
-            phaseShift.ClientGUID = GetPlayer().GetGUID();
-            phaseShift.PersonalGUID = GetPlayer().GetGUID();
-            phaseShift.PhaseShifts = phaseIds;
-            phaseShift.VisibleMapIDs = terrainswaps;
-            phaseShift.UiWorldMapAreaIDSwaps = worldMapAreaSwaps;
-            SendPacket(phaseShift);
-        }
-
         [WorldPacketHandler(ClientOpcodes.GuildSetFocusedAchievement)]
         void HandleGuildSetFocusedAchievement(GuildSetFocusedAchievement setFocusedAchievement)
         {

Source/Game/Handlers/MovementHandler.cs

@@ -132,7 +132,7 @@ namespace Game
             if (plrMover && movementInfo.HasMovementFlag(MovementFlag.Swimming) != plrMover.IsInWater())
             {
                 // now client not include swimming flag in case jumping under water
-                plrMover.SetInWater(!plrMover.IsInWater() || plrMover.GetMap().IsUnderWater(movementInfo.Pos.posX, movementInfo.Pos.posY, movementInfo.Pos.posZ));
+                plrMover.SetInWater(!plrMover.IsInWater() || plrMover.GetMap().IsUnderWater(plrMover.GetPhaseShift(), movementInfo.Pos.posX, movementInfo.Pos.posY, movementInfo.Pos.posZ));
             }
 
             uint mstime = Time.GetMSTime();

Source/Game/Handlers/QueryHandler.cs

@@ -283,7 +283,7 @@ namespace Game
                             mapID = (uint)corpseMapEntry.CorpseMapID;
                             x = corpseMapEntry.Corpse.X;
                             y = corpseMapEntry.Corpse.Y;
-                            z = entranceMap.GetHeight(player.GetPhases(), x, y, MapConst.MaxHeight);
+                            z = entranceMap.GetHeight(player.GetPhaseShift(), x, y, MapConst.MaxHeight);
                         }
                     }
                 }