From be6e086aacd3769a600ba9b5850e212fe29eea41 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Mon, 17 Aug 2020 21:37:00 +0200
Subject: [PATCH] Add note to 1.9 update sign packet creation

---
 .../Protocol1_9_1_2To1_9_3_4.java             |  6 +-
 .../ClientboundPackets1_9.java                | 66 +++++++++----------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
index 1b3ebcbb3..1401659b4 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
@@ -42,10 +42,12 @@ public class Protocol1_9_1_2To1_9_3_4 extends Protocol<ClientboundPackets1_9_3,
 
                             wrapper.clearPacket(); //Clear the packet
 
-                            wrapper.setId(0x46); //Update sign packet
+                            wrapper.setId(ClientboundPackets1_9.UPDATE_SIGN.ordinal()); //Update sign packet
                             wrapper.write(Type.POSITION, position); // Position
-                            for (int i = 1; i < 5; i++)
+                            for (int i = 1; i < 5; i++) {
+                                // Should technically be written as COMPONENT, but left as String for simplification/to remove redundant wrapping for VR
                                 wrapper.write(Type.STRING, (String) tag.get("Text" + i).getValue()); // Sign line
+                            }
                         }
                     }
                 });
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java
index d89372dea..65b566467 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java
@@ -41,10 +41,10 @@ public enum ClientboundPackets1_9 implements ClientboundPacketType {
     SPAWN_PARTICLE, // 0x22
     JOIN_GAME, // 0x23
     MAP_DATA, // 0x24
-    ENTITY_POSITION, // 0x26
-    ENTITY_POSITION_AND_ROTATION, // 0x27
-    ENTITY_ROTATION, // 0x28
-    ENTITY_MOVEMENT, // 0x25
+    ENTITY_POSITION, // 0x25
+    ENTITY_POSITION_AND_ROTATION, // 0x26
+    ENTITY_ROTATION, // 0x27
+    ENTITY_MOVEMENT, // 0x28
     VEHICLE_MOVE, // 0x29
     OPEN_SIGN_EDITOR, // 0x2A
     PLAYER_ABILITIES, // 0x2B
@@ -52,33 +52,33 @@ public enum ClientboundPackets1_9 implements ClientboundPacketType {
     PLAYER_INFO, // 0x2D
     PLAYER_POSITION, // 0x2E
     USE_BED, // 0x2F
-    DESTROY_ENTITIES, // 0x31
-    REMOVE_ENTITY_EFFECT, // 0x32
-    RESOURCE_PACK, // 0x33
-    RESPAWN, // 0x34
-    ENTITY_HEAD_LOOK, // 0x35
-    WORLD_BORDER, // 0x37
-    CAMERA, // 0x38
-    HELD_ITEM_CHANGE, // 0x39
-    DISPLAY_SCOREBOARD, // 0x3A
-    ENTITY_METADATA, // 0x3B
-    ATTACH_ENTITY, // 0x3C
-    ENTITY_VELOCITY, // 0x3D
-    ENTITY_EQUIPMENT, // 0x3E
-    SET_EXPERIENCE, // 0x3F
-    UPDATE_HEALTH, // 0x40
-    SCOREBOARD_OBJECTIVE, // 0x41
-    SET_PASSENGERS, // 0x42
-    TEAMS, // 0x43
-    UPDATE_SCORE, // 0x44
-    SPAWN_POSITION, // 0x45
-    TIME_UPDATE, // 0x46
-    TITLE, // 0x47
-    UPDATE_SIGN, // 0x48
-    SOUND, // 0x49
-    TAB_LIST, // 0x4A
-    COLLECT_ITEM, // 0x4B
-    ENTITY_TELEPORT, // 0x4C
-    ENTITY_PROPERTIES, // 0x4D
-    ENTITY_EFFECT, // 0x4E
+    DESTROY_ENTITIES, // 0x30
+    REMOVE_ENTITY_EFFECT, // 0x31
+    RESOURCE_PACK, // 0x32
+    RESPAWN, // 0x33
+    ENTITY_HEAD_LOOK, // 0x34
+    WORLD_BORDER, // 0x35
+    CAMERA, // 0x36
+    HELD_ITEM_CHANGE, // 0x37
+    DISPLAY_SCOREBOARD, // 0x38
+    ENTITY_METADATA, // 0x39
+    ATTACH_ENTITY, // 0x3A
+    ENTITY_VELOCITY, // 0x3B
+    ENTITY_EQUIPMENT, // 0x3C
+    SET_EXPERIENCE, // 0x3D
+    UPDATE_HEALTH, // 0x3E
+    SCOREBOARD_OBJECTIVE, // 0x3F
+    SET_PASSENGERS, // 0x40
+    TEAMS, // 0x41
+    UPDATE_SCORE, // 0x42
+    SPAWN_POSITION, // 0x43
+    TIME_UPDATE, // 0x44
+    TITLE, // 0x45
+    UPDATE_SIGN, // 0x46
+    SOUND, // 0x47
+    TAB_LIST, // 0x48
+    COLLECT_ITEM, // 0x49
+    ENTITY_TELEPORT, // 0x4A
+    ENTITY_PROPERTIES, // 0x4B
+    ENTITY_EFFECT, // 0x4C
 }