Fix a critical bug regarding sign updates with 1.8 clients

Exceptionflug · Feb 15, 2020 · e4b5b4d · e4b5b4d
1 parent 30615e7
commit e4b5b4d
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -22,25 +22,25 @@ This is the full portfolio of protocolize dependencies:
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-api</artifactId>
-  <version>1.5.3-SNAPSHOT</version>
+  <version>1.5.4-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-items</artifactId>
-  <version>1.5.3-SNAPSHOT</version>
+  <version>1.5.4-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-inventory</artifactId>
-  <version>1.5.3-SNAPSHOT</version>
+  <version>1.5.4-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-world</artifactId>
-  <version>1.5.3-SNAPSHOT</version>
+  <version>1.5.4-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 ```

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/protocolize-api/pom.xml b/protocolize-api/pom.xml
@@ -48,7 +48,7 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>

diff --git a/protocolize-api/src/main/java/de/exceptionflug/protocolize/api/protocol/ProtocolAPI.java b/protocolize-api/src/main/java/de/exceptionflug/protocolize/api/protocol/ProtocolAPI.java
@@ -2,6 +2,7 @@
 
 import de.exceptionflug.protocolize.api.event.EventManager;
 import de.exceptionflug.protocolize.api.traffic.TrafficManager;
+import net.md_5.bungee.api.plugin.Plugin;
 
 /**
  * This class contains all relevant methods to use Protocolize.
@@ -40,4 +41,5 @@ public static EventManager getEventManager() {
     public static TrafficManager getTrafficManager() {
         return TRAFFIC_MANAGER;
     }
+
 }
diff --git a/protocolize-examples/pom.xml b/protocolize-examples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
@@ -18,19 +18,19 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-items</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-inventory</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/protocolize-inventory/pom.xml b/protocolize-inventory/pom.xml
@@ -20,18 +20,18 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-inventory</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/...olize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/InventoryModule.java b/...olize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/InventoryModule.java
@@ -13,7 +13,9 @@
 import de.exceptionflug.protocolize.items.*;
 import de.exceptionflug.protocolize.items.packet.WindowItems;
 import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.ProtocolConstants;
 
@@ -22,14 +24,15 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-
-import static de.exceptionflug.protocolize.api.util.ProtocolVersions.MINECRAFT_1_8;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
 
 public final class InventoryModule {
 
     private static final Map<UUID, Map<Integer, Inventory>> WINDOW_MAP = new ConcurrentHashMap<>();
     private static final Map<UUID, Map<Integer, Map<Integer, InventoryAction>>> ACTION_MAP = new ConcurrentHashMap<>();
     private static final Map<UUID, Integer> WINDOW_ID_COUNTER_MAP = new ConcurrentHashMap<>();
+    private static final Plugin dummyPlugin = new Plugin();
 
     private static boolean spigotInventoryTracking = false;
 

diff --git a/protocolize-items/pom.xml b/protocolize-items/pom.xml
@@ -8,7 +8,7 @@
             <plugin>
                 <groupId>de.exceptionflug</groupId>
                 <artifactId>protocolize-protogen-plugin</artifactId>
-                <version>1.5.3-SNAPSHOT</version>
+                <version>1.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -33,12 +33,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-items</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/protocolize-plugin/pom.xml b/protocolize-plugin/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-plugin</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
 
     <properties>
         <plugin.main>de.exceptionflug.protocolize.ProtocolizePlugin</plugin.main>
@@ -23,22 +23,22 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-items</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-world</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-inventory</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/protocolize-protogen/pom.xml b/protocolize-protogen/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-protogen</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/protocolize-protogen/protocolize-protogen-compiler/pom.xml b/protocolize-protogen/protocolize-protogen-compiler/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize-protogen</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-protogen-compiler</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
 
     <build>
         <plugins>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/protocolize-protogen/protocolize-protogen-plugin/pom.xml b/protocolize-protogen/protocolize-protogen-plugin/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize-protogen</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-protogen-plugin</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <build>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-protogen-compiler</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/protocolize-util/pom.xml b/protocolize-util/pom.xml
@@ -33,12 +33,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-util</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -49,17 +49,17 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-world</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-items</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/protocolize-world/pom.xml b/protocolize-world/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-world</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/protocolize-world/src/main/java/de/exceptionflug/protocolize/world/packet/SignUpdate.java b/protocolize-world/src/main/java/de/exceptionflug/protocolize/world/packet/SignUpdate.java
@@ -3,6 +3,7 @@
 import de.exceptionflug.protocolize.api.BlockPosition;
 import de.exceptionflug.protocolize.api.protocol.AbstractPacket;
 import io.netty.buffer.ByteBuf;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.chat.ComponentSerializer;
 import net.md_5.bungee.protocol.ProtocolConstants;
@@ -73,10 +74,30 @@ public void read(final ByteBuf buf, final ProtocolConstants.Direction direction,
 
     private void readLineStrings(ByteBuf buf) {
         lines = new String[4];
-        lines[0] = ComponentSerializer.parse(readString(buf))[0].toLegacyText();
-        lines[1] = ComponentSerializer.parse(readString(buf))[0].toLegacyText();
-        lines[2] = ComponentSerializer.parse(readString(buf))[0].toLegacyText();
-        lines[3] = ComponentSerializer.parse(readString(buf))[0].toLegacyText();
+        String line1 = readString(buf);
+        if(line1.equals("null")) {
+            lines[0] = "";
+        } else {
+            lines[0] = ComponentSerializer.parse(line1)[0].toLegacyText();
+        }
+        String line2 = readString(buf);
+        if(line2.equals("null")) {
+            lines[1] = "";
+        } else {
+            lines[1] = ComponentSerializer.parse(line2)[0].toLegacyText();
+        }
+        String line3 = readString(buf);
+        if(line3.equals("null")) {
+            lines[2] = "";
+        } else {
+            lines[2] = ComponentSerializer.parse(line3)[0].toLegacyText();
+        }
+        String line4 = readString(buf);
+        if(line4.equals("null")) {
+            lines[3] = "";
+        } else {
+            lines[3] = ComponentSerializer.parse(line4)[0].toLegacyText();
+        }
     }
 
     @Override