Remove .RemoveLastPlus() from spawn entity packets

This is unnecessary for players since we don't show + at end of player names anyways
ClassiCube · Dec 20, 2020 · 43024d0 · 43024d0
1 parent 6e53033
commit 43024d0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/MCGalaxy/Network/Packets/Packet.cs b/MCGalaxy/Network/Packets/Packet.cs
@@ -68,7 +68,7 @@ public static class Packet {
             byte[] buffer = new byte[74 + (extPos ? 6 : 0)];
             buffer[0] = Opcode.AddEntity;
             buffer[1] = entityID;
-            NetUtils.Write(name.RemoveLastPlus(), buffer, 2, hasCP437);
+            NetUtils.Write(name, buffer, 2, hasCP437);
 
             int offset = NetUtils.WritePos(pos, buffer, 66, extPos);
             buffer[66 + offset] = rot.RotY;
@@ -170,12 +170,12 @@ public static class Packet {
             return buffer;
         }
 
-        public static byte[] ExtAddEntity(byte entityID, string name, string displayname, bool hasCP437) {
+        public static byte[] ExtAddEntity(byte entityID, string skin, string name, bool hasCP437) {
             byte[] buffer = new byte[130];
             buffer[0] = Opcode.CpeExtAddEntity;
             buffer[1] = entityID;
-            NetUtils.Write(name, buffer, 2, hasCP437);
-            NetUtils.Write(displayname, buffer, 66, hasCP437);
+            NetUtils.Write(skin, buffer, 2, hasCP437);
+            NetUtils.Write(name, buffer, 66, hasCP437);
             return buffer;
         }
 
@@ -309,8 +309,8 @@ public static class Packet {
             byte[] buffer = new byte[138 + (extPos ? 6 : 0)];
             buffer[0] = Opcode.CpeExtAddEntity2;
             buffer[1] = entityID;
-            NetUtils.Write(displayName.RemoveLastPlus(), buffer, 2, hasCP437);
-            NetUtils.Write(skinName.RemoveLastPlus(), buffer, 66, hasCP437);
+            NetUtils.Write(displayName, buffer,  2, hasCP437);
+            NetUtils.Write(skinName,    buffer, 66, hasCP437);
 
             int offset = NetUtils.WritePos(pos, buffer, 130, extPos);
             buffer[130 + offset] = rot.RotY;