Skip to content

Fix show mounted players to other clients and some cleanup #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yungcomputerchair merged 2 commits into from
Jul 10, 2026
+65 −91
Merged

Fix show mounted players to other clients and some cleanup #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d6de3
Fix show mounted players to other clients and some cleanup
StimpyDev Jul 9, 2026
f0c1788
Address Feedback
StimpyDev Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/Sanctuary.Game/Entities/Mount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,22 @@ public override PlayerUpdatePacketAddNpc GetAddNpcPacket()
{
var packet = base.GetAddNpcPacket();

packet.RiderGuid = Rider.Guid;
packet.RiderGuid = 0;

return packet;
}

public override void Dispose()
public PacketMountResponse GetMountResponsePacket()
{
base.Dispose();
return new PacketMountResponse
{
RiderGuid = Rider.Guid,
MountGuid = Guid,
Seat = Seat,
QueuePosition = QueuePosition,
Unknown = 1,
CompositeEffectId = 46, // PFX_Teleport_Flash
NameVerticalOffset = Definition.NameVerticalOffset
};
}
}
65 changes: 28 additions & 37 deletions src/Sanctuary.Game/Entities/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ public void UpdatePosition(Vector4 position, Quaternion rotation, bool updateZon
Position = position;
Rotation = rotation;

Mount?.UpdatePosition(position, rotation, updateZoneArea);

if (Visible)
{
UpdateZoneTile();
Expand Down Expand Up @@ -263,12 +265,10 @@ public void OnAddVisibleNpcs(params IEnumerable<Npc> npcs)
{
foreach (var npc in npcs)
{
var playerUpdatePacketAddNpc = npc.GetAddNpcPacket();

if (npc is Mount mount && mount.Rider.Guid == Guid)
playerUpdatePacketAddNpc.RiderGuid = 0;
if (npc is Mount)
continue;

SendTunneled(playerUpdatePacketAddNpc);
SendTunneled(npc.GetAddNpcPacket());
}

var playerUpdatePacketNpcRelevance = new PlayerUpdatePacketNpcRelevance();
Expand Down Expand Up @@ -310,9 +310,20 @@ public void OnAddVisiblePlayers(params IEnumerable<Player> players)
{
foreach (var player in players)
{
var playerUpdatePacketAddPc = player.GetAddPcPacket();

SendTunneled(playerUpdatePacketAddPc);
if (player.Mount is not null)
{
var addPc = player.GetAddPcPacket();
addPc.MountGuid = 0;
addPc.MountSeat = -1;
addPc.MountQueuePosition = -1;
addPc.NameVerticalOffset = 0;

SendTunneled(addPc);
SendTunneled(player.Mount.GetAddNpcPacket());
SendTunneled(player.Mount.GetMountResponsePacket());
}
else
SendTunneled(player.GetAddPcPacket());
}

foreach (var player in players)
Expand All @@ -323,28 +334,10 @@ public void OnRemoveVisibleNpcs(params IEnumerable<Npc> npcs)
{
foreach (var npc in npcs)
{
if (npc is Mount mount)
{
var playerUpdatePacketRemovePlayerGracefully = new PlayerUpdatePacketRemovePlayerGracefully();

playerUpdatePacketRemovePlayerGracefully.Guid = npc.Guid;

playerUpdatePacketRemovePlayerGracefully.Animate = false;
playerUpdatePacketRemovePlayerGracefully.Delay = 0;
playerUpdatePacketRemovePlayerGracefully.EffectDelay = 0;
playerUpdatePacketRemovePlayerGracefully.CompositeEffectId = 46;
playerUpdatePacketRemovePlayerGracefully.Duration = 1000;

SendTunneled(playerUpdatePacketRemovePlayerGracefully);
}
else
{
var playerUpdatePacketRemovePlayer = new PlayerUpdatePacketRemovePlayer();

playerUpdatePacketRemovePlayer.Guid = npc.Guid;
if (npc is Mount)
continue;

SendTunneled(playerUpdatePacketRemovePlayer);
}
SendTunneled(new PlayerUpdatePacketRemovePlayer { Guid = npc.Guid });
}

foreach (var npc in npcs)
Expand All @@ -355,11 +348,10 @@ public void OnRemoveVisiblePlayers(params IEnumerable<Player> players)
{
foreach (var player in players)
{
var playerUpdatePacketRemovePlayer = new PlayerUpdatePacketRemovePlayer();

playerUpdatePacketRemovePlayer.Guid = player.Guid;
SendTunneled(new PlayerUpdatePacketRemovePlayer { Guid = player.Guid });

SendTunneled(playerUpdatePacketRemovePlayer);
if (player.Mount is not null)
SendTunneled(new PlayerUpdatePacketRemovePlayer { Guid = player.Mount.Guid });
}

foreach (var player in players)
Expand Down Expand Up @@ -561,14 +553,13 @@ public override int GetHashCode()

public void Dispose()
{
Mount?.Dispose();
Mount = null;

foreach (var visiblePlayer in VisiblePlayers)
visiblePlayer.Value.OnRemoveVisiblePlayers([this]);

ZoneTile.Entities.Remove(Guid, out _);
Mount?.Dispose();
Mount = null;

ZoneTile.Entities.Remove(Guid, out _);
Zone.TryRemovePlayer(Guid);
}
}
24 changes: 17 additions & 7 deletions src/Sanctuary.Gateway/Handlers/MountBasePacket/PacketDismountRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,31 @@ public static bool HandlePacket(GatewayConnection connection)
if (connection.Player.Mount is null)
return true;

var packetDismountResponse = new PacketDismountResponse();

packetDismountResponse.RiderGuid = connection.Player.Guid;
packetDismountResponse.CompositeEffectId = 0; // PFX_Teleport_Flash
var packetDismountResponse = new PacketDismountResponse
{
RiderGuid = connection.Player.Guid,
CompositeEffectId = 0,
};

connection.Player.SendTunneledToVisible(packetDismountResponse, true);

connection.Player.Mount.Dispose();
connection.Player.Mount = null;

connection.Player.UpdateCharacterStats(
CharacterStats.MaxMovementSpeed.Set(8f),
CharacterStats.GlideEnabled.Set(0),
CharacterStats.JumpHeight.Set(0f));

connection.Player.SendTunneledToVisible(new PlayerUpdatePacketRemovePlayerGracefully
{
Guid = connection.Player.Mount.Guid,
Animate = false,
Delay = 0,
EffectDelay = 0,
CompositeEffectId = 0,
}, true);

connection.Player.Mount.Dispose();
connection.Player.Mount = null;

return true;
}
}
21 changes: 5 additions & 16 deletions src/Sanctuary.Gateway/Handlers/MountBasePacket/PacketMountSpawnHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,13 @@ public static void SpawnMount(GatewayConnection connection, PacketMountInfo moun

connection.Player.Mount = mount;

mount.UpdatePosition(connection.Player.Position, connection.Player.Rotation);
connection.Player.UpdatePosition(connection.Player.Position, connection.Player.Rotation);

var packetMountResponse = new PacketMountResponse();
foreach (var visiblePlayer in connection.Player.VisiblePlayers)
visiblePlayer.Value.OnAddVisiblePlayers([connection.Player]);

packetMountResponse.RiderGuid = mount.Rider.Guid;
packetMountResponse.MountGuid = mount.Guid;

packetMountResponse.Seat = mount.Seat;

packetMountResponse.QueuePosition = mount.QueuePosition;

packetMountResponse.Unknown = 1;

packetMountResponse.CompositeEffectId = 46; // PFX_Teleport_Flash

packetMountResponse.NameVerticalOffset = mountDefinition.NameVerticalOffset;

connection.Player.SendTunneledToVisible(packetMountResponse, true);
connection.Player.SendTunneled(mount.GetAddNpcPacket());
connection.Player.SendTunneled(mount.GetMountResponsePacket());

var mountStats = mountDefinition.Stats;

Expand Down
26 changes: 3 additions & 23 deletions src/Sanctuary.Gateway/Handlers/PacketClientFinishedLoadingHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,13 @@ public static bool HandlePacket(GatewayConnection connection)
_logger.LogTrace("Received {name} packet.", nameof(PacketClientFinishedLoading));

connection.Player.Visible = true;

connection.Player.UpdatePosition(connection.Player.Position, connection.Player.Rotation);

var mount = connection.Player.Mount;

if (mount is not null)
if (connection.Player.Mount is not null)
{
mount.Visible = true;

mount.UpdatePosition(connection.Player.Position, connection.Player.Rotation);

var packetMountResponse = new PacketMountResponse();

packetMountResponse.RiderGuid = mount.Rider.Guid;
packetMountResponse.MountGuid = mount.Guid;

packetMountResponse.Seat = mount.Seat;

packetMountResponse.QueuePosition = mount.QueuePosition;

packetMountResponse.Unknown = 1;

packetMountResponse.CompositeEffectId = 46; // PFX_Teleport_Flash

// packetMountResponse.NameVerticalOffset = mountDefinition.NameVerticalOffset;
connection.Player.Mount.Visible = true;

connection.Player.SendTunneled(packetMountResponse);
connection.Player.SendTunneled(connection.Player.Mount.GetMountResponsePacket());
}

connection.Player.Zone.OnClientFinishedLoading(connection.Player);
Expand Down
1 change: 0 additions & 1 deletion src/Sanctuary.Gateway/Handlers/PacketWorldTeleportRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public static bool HandlePacket(GatewayConnection connection, Span<byte> data)
var position = player.Position;
var rotation = player.Rotation;

connection.Player.Mount?.UpdatePosition(position, rotation);
connection.Player.UpdatePosition(position, rotation, updateZoneArea: false);

var clientUpdatePacketUpdateLocation = new ClientUpdatePacketUpdateLocation
Expand Down
1 change: 0 additions & 1 deletion src/Sanctuary.Gateway/Handlers/PacketZoneSafeTeleportRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public static bool HandlePacket(GatewayConnection connection, Span<byte> data)
var position = pointOfInterest.SpawnPosition;
var rotation = new Quaternion(rotationZ, 0f, rotationX, 0f);

connection.Player.Mount?.UpdatePosition(position, rotation);
connection.Player.UpdatePosition(position, rotation, updateZoneArea: false);

var clientUpdatePacketUpdateLocation = new ClientUpdatePacketUpdateLocation
Expand Down
1 change: 0 additions & 1 deletion src/Sanctuary.Gateway/Handlers/PacketZoneTeleportRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public static bool HandlePacket(GatewayConnection connection, Span<byte> data)
var position = pointOfInterest.SpawnPosition;
var rotation = new Quaternion(rotationZ, 0f, rotationX, 0f);

connection.Player.Mount?.UpdatePosition(position, rotation);
connection.Player.UpdatePosition(position, rotation, updateZoneArea: false);

var clientUpdatePacketUpdateLocation = new ClientUpdatePacketUpdateLocation
Expand Down
1 change: 0 additions & 1 deletion src/Sanctuary.Gateway/Handlers/PlayerUpdatePacketJumpHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public static bool HandlePacket(GatewayConnection connection, Span<byte> data)

// _logger.LogTrace("Received {name} packet. ( {packet} )", nameof(PlayerUpdatePacketJump), packet);

connection.Player.Mount?.UpdatePosition(packet.Position, packet.Rotation);
connection.Player.UpdatePosition(packet.Position, packet.Rotation);

connection.Player.SendTunneledToVisible(packet);
Expand Down
1 change: 0 additions & 1 deletion src/Sanctuary.Gateway/Handlers/PlayerUpdatePacketUpdatePositionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public static bool HandlePacket(GatewayConnection connection, Span<byte> data)

// _logger.LogTrace("Received {name} packet. ( {packet} )", nameof(PlayerUpdatePacketUpdatePosition), packet);

connection.Player.Mount?.UpdatePosition(packet.Position, packet.Rotation);
connection.Player.UpdatePosition(packet.Position, packet.Rotation);

connection.Player.SendTunneledToVisible(packet);
Expand Down