Fix critical bug where /locraw isn't cancelled. Made improvements to the chat buffer to avoid command spam warnings.

Author: robere2

build.gradle

@@ -28,7 +28,7 @@ jar {
 
 targetCompatibility = sourceCompatibility = 1.8
 
-version = "2.0.6"
+version = "2.0.7"
 group= "co.bugg.quickplay" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Quickplay-1.8.9"
 

src/main/java/co/bugg/quickplay/Quickplay.java

@@ -306,9 +306,15 @@ public void enable() {
             registerEventHandler(new GlyphRenderer());
             registerEventHandler(new QuickplayEventHandler());
 
-            chatBuffer = (ChatBuffer) new ChatBuffer(100).start();
-            instanceWatcher = new InstanceWatcher(30).start();
-            instanceDisplay = new InstanceDisplay();
+            if (this.chatBuffer != null) {
+                this.chatBuffer.stop();
+            }
+            this.chatBuffer = (ChatBuffer) new ChatBuffer(750).start();
+            if (this.instanceWatcher != null) {
+                this.instanceWatcher.stop();
+            }
+            this.instanceWatcher = new InstanceWatcher(30).start();
+            this.instanceDisplay = new InstanceDisplay();
 
             commands.add(new CommandQuickplay());
 

src/main/java/co/bugg/quickplay/util/InstanceWatcher.java

@@ -78,7 +78,8 @@ public InstanceWatcher stop() {
      * @return this
      */
     public InstanceWatcher runLocraw() {
-        if(Quickplay.INSTANCE.onHypixel && Quickplay.INSTANCE.enabled) {
+        // Only need to run /locraw again if there isn't already a /locraw in the command queue.
+        if(Quickplay.INSTANCE.onHypixel && Quickplay.INSTANCE.enabled && !Quickplay.INSTANCE.chatBuffer.contains("/locraw")) {
             new LocrawWrapper((server) -> {
 
                 // Automatic lobby 1 swapper

src/main/java/co/bugg/quickplay/util/LocrawWrapper.java

@@ -5,6 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.util.Date;
@@ -40,9 +41,7 @@ public LocrawWrapper(LocrawListenerCallback callback) {
         this.listening = true;
         this.cancel = true;
 
-        // Send the /locraw command
         Quickplay.INSTANCE.chatBuffer.push("/locraw");
-        System.out.println("QUICKPLAY DEBUG > Locraw sent! " + new Date().getTime() + " " + this.hashCode());
         // If a /locraw isn't received within 120 ticks (30 seconds), don't cancel the message
         new TickDelay(this::stopCancelling, 600);
         // If a /locraw isn't received within 1200 ticks (60 seconds), stop listening
@@ -54,7 +53,6 @@ public LocrawWrapper(LocrawListenerCallback callback) {
      * in, but still listen & call the callback
      */
     public void stopCancelling() {
-        System.out.println("QUICKPLAY DEBUG > Cancelling stopped! " + new Date().getTime() + " " + this.hashCode());
         this.cancel = false;
     }
 
@@ -72,7 +70,8 @@ public void stopListening(String instance) {
         }
     }
 
-    @SubscribeEvent(receiveCanceled = true)
+    // Hytilities forces high priority - receiveCancelled seems to cause the message to be uncancelable...
+    @SubscribeEvent(priority = EventPriority.HIGH)
     public void onChat(ClientChatReceivedEvent event) {
         final String message = event.message.getUnformattedText();
         // Regex for the /locraw response
@@ -85,7 +84,6 @@ public void onChat(ClientChatReceivedEvent event) {
                 matcher.find() &&
                 listening
         ) {
-            System.out.println("QUICKPLAY DEBUG > Locraw received! " + new Date().getTime() + " " + this.hashCode());
 
             if(this.cancel) {
                 event.setCanceled(true);

src/main/java/co/bugg/quickplay/util/buffer/ABuffer.java

@@ -109,6 +109,10 @@ public ABuffer start() {
         return this;
     }
 
+    public boolean contains(Object obj) {
+        return this.buffer.contains(obj);
+    }
+
     /**
      * Stop looping {@link #run()}
      * @return this