Skip to content

Fix and improve world ping bugs #794

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

Open
SokyranTheDragon wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix and improve world ping bugs #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Source/Client/UI/DrawPingPlanet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ static void Postfix()
{
if (ping.mapId != -1) continue;
if (ping.PlayerInfo is not { } player) continue;
// Only display pings on the current layer
if (ping.planetTile.Layer != Find.WorldSelector.SelectedLayer) continue;

var tileCenter = GenWorldUI.WorldToUIPosition(Find.WorldGrid.GetTileCenter(ping.planetTile));
const float size = 30f;
Expand Down
22 changes: 19 additions & 3 deletions Source/Client/UI/LocationPings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Multiplayer.Client.Util;
using Multiplayer.Common.Networking.Packet;
using RimWorld;
Expand All @@ -23,9 +24,19 @@ public void UpdatePing()
if (MultiplayerStatic.PingKeyDef.JustPressed || KeyDown(Multiplayer.settings.sendPingButton))
{
if (WorldRendererUtility.WorldSelected)
PingLocation(-1, GenWorld.MouseTile(), Vector3.zero);
{
// Grab the tile under mouse
var tile = GenWorld.MouseTile();
// If the tile is not valid, snap to expandable world objects (handles orbital locations)
if (!tile.Valid)
tile = GenWorld.MouseTile(true);

// Make sure the tile is valid and that we didn't ping with the mouse outside of map bounds or in space
if (tile.Valid)
PingLocation(-1, tile, Vector3.zero);
}
else if (Find.CurrentMap != null)
PingLocation(Find.CurrentMap.uniqueID, 0, UI.MouseMapPosition());
PingLocation(Find.CurrentMap.uniqueID, PlanetTile.Invalid, UI.MouseMapPosition());
}

for (int i = pings.Count - 1; i >= 0; i--)
Expand Down Expand Up @@ -69,11 +80,16 @@ public void ReceivePing(ServerPingLocPacket packet)
if (!Multiplayer.settings.enablePings) return;

var data = packet.data;
var planetTile = new PlanetTile(data.planetTileId, data.planetTileLayer);
// Return early if both the map and planet tile are invalid
if (data.mapId == -1 && !planetTile.Valid)
return;

pings.RemoveAll(p => p.player == packet.playerId);
pings.Add(new PingInfo {
player = packet.playerId,
mapId = data.mapId,
planetTile = new PlanetTile(data.planetTileId, data.planetTileLayer),
planetTile = planetTile,
mapLoc = new Vector3(data.x, data.y, data.z)
});
alertHidden = false;
Expand Down
Loading