tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed PaperSystem bugs (#22896)

Browse Source
This commit is contained in:
LordCarve
2023-12-24 09:58:00 +01:00
committed by GitHub
parent 681f9a2c85
commit 044f5e7c4e
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/Paper/UI/PaperBoundUserInterface.cs
View File

@@ -1,5 +1,4 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input; using Robust.Shared.Input;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -49,15 +48,12 @@ public sealed class PaperBoundUserInterface : BoundUserInterface
private void Input_OnTextEntered(string text) private void Input_OnTextEntered(string text)
{ {
if (!string.IsNullOrEmpty(text)) SendMessage(new PaperInputTextMessage(text));
{
SendMessage(new PaperInputTextMessage(text));
if (_window != null) if (_window != null)
{ {
_window.Input.TextRope = Rope.Leaf.Empty; _window.Input.TextRope = Rope.Leaf.Empty;
_window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top); _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top);
}
} }
} }

28
Content.Server/Paper/PaperSystem.cs
View File

@@ -9,8 +9,6 @@ using Content.Shared.Paper;
using Content.Shared.Tag; using Content.Shared.Tag;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Utility;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using static Content.Shared.Paper.SharedPaperComponent; using static Content.Shared.Paper.SharedPaperComponent;
@@ -134,9 +132,10 @@ namespace Content.Server.Paper
} }
} }
private StampDisplayInfo GetStampInfo(StampComponent stamp) private static StampDisplayInfo GetStampInfo(StampComponent stamp)
{ {
return new StampDisplayInfo { return new StampDisplayInfo
{
StampedName = stamp.StampedName, StampedName = stamp.StampedName,
StampedColor = stamp.StampedColor StampedColor = stamp.StampedColor
}; };
@@ -144,21 +143,20 @@ namespace Content.Server.Paper
private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperInputTextMessage args) private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperInputTextMessage args)
{ {
if (string.IsNullOrEmpty(args.Text)) if (args.Text.Length <= paperComp.ContentSize)
return; {
if (args.Text.Length + paperComp.Content.Length <= paperComp.ContentSize)
paperComp.Content = args.Text; paperComp.Content = args.Text;
if (TryComp<AppearanceComponent>(uid, out var appearance)) if (TryComp<AppearanceComponent>(uid, out var appearance))
_appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance); _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
if (TryComp<MetaDataComponent>(uid, out var meta)) if (TryComp<MetaDataComponent>(uid, out var meta))
_metaSystem.SetEntityDescription(uid, "", meta); _metaSystem.SetEntityDescription(uid, "", meta);
if (args.Session.AttachedEntity != null) if (args.Session.AttachedEntity != null)
_adminLogger.Add(LogType.Chat, LogImpact.Low, _adminLogger.Add(LogType.Chat, LogImpact.Low,
$"{ToPrettyString(args.Session.AttachedEntity.Value):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}"); $"{ToPrettyString(args.Session.AttachedEntity.Value):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}");
}
paperComp.Mode = PaperAction.Read; paperComp.Mode = PaperAction.Read;
UpdateUserInterface(uid, paperComp); UpdateUserInterface(uid, paperComp);