From 044f5e7c4ebda196c1cd57322424b9ff932e6f9f Mon Sep 17 00:00:00 2001
From: LordCarve <27449516+LordCarve@users.noreply.github.com>
Date: Sun, 24 Dec 2023 09:58:00 +0100
Subject: [PATCH] Fixed PaperSystem bugs (#22896)

---
 .../Paper/UI/PaperBoundUserInterface.cs       | 14 ++++------
 Content.Server/Paper/PaperSystem.cs           | 28 +++++++++----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
index e047fdf84b..30f1502779 100644
--- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs
+++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
@@ -1,5 +1,4 @@
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Robust.Shared.Utility;
@@ -49,15 +48,12 @@ public sealed class PaperBoundUserInterface : BoundUserInterface
 
     private void Input_OnTextEntered(string text)
     {
-        if (!string.IsNullOrEmpty(text))
-        {
-            SendMessage(new PaperInputTextMessage(text));
+        SendMessage(new PaperInputTextMessage(text));
 
-            if (_window != null)
-            {
-                _window.Input.TextRope = Rope.Leaf.Empty;
-                _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top);
-            }
+        if (_window != null)
+        {
+            _window.Input.TextRope = Rope.Leaf.Empty;
+            _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top);
         }
     }
 
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
index 304507bdeb..22f39cd35b 100644
--- a/Content.Server/Paper/PaperSystem.cs
+++ b/Content.Server/Paper/PaperSystem.cs
@@ -9,8 +9,6 @@ using Content.Shared.Paper;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
-using Robust.Shared.Utility;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 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,
                 StampedColor = stamp.StampedColor
             };
@@ -144,21 +143,20 @@ namespace Content.Server.Paper
 
         private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperInputTextMessage args)
         {
-            if (string.IsNullOrEmpty(args.Text))
-                return;
-
-            if (args.Text.Length + paperComp.Content.Length <= paperComp.ContentSize)
+            if (args.Text.Length <= paperComp.ContentSize)
+            {
                 paperComp.Content = args.Text;
 
-            if (TryComp<AppearanceComponent>(uid, out var appearance))
-                _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
+                if (TryComp<AppearanceComponent>(uid, out var appearance))
+                    _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
 
-            if (TryComp<MetaDataComponent>(uid, out var meta))
-                _metaSystem.SetEntityDescription(uid, "", meta);
+                if (TryComp<MetaDataComponent>(uid, out var meta))
+                    _metaSystem.SetEntityDescription(uid, "", meta);
 
-            if (args.Session.AttachedEntity != null)
-                _adminLogger.Add(LogType.Chat, LogImpact.Low,
-                    $"{ToPrettyString(args.Session.AttachedEntity.Value):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}");
+                if (args.Session.AttachedEntity != null)
+                    _adminLogger.Add(LogType.Chat, LogImpact.Low,
+                        $"{ToPrettyString(args.Session.AttachedEntity.Value):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}");
+            }
 
             paperComp.Mode = PaperAction.Read;
             UpdateUserInterface(uid, paperComp);