diff --git a/nms-patches/RemoteControlSession.patch b/nms-patches/RemoteControlSession.patch
index 7bdd3e838..4c1fcfd03 100644
--- a/nms-patches/RemoteControlSession.patch
+++ b/nms-patches/RemoteControlSession.patch
@@ -1,5 +1,16 @@
 --- a/net/minecraft/server/RemoteControlSession.java
 +++ b/net/minecraft/server/RemoteControlSession.java
+@@ -32,8 +32,8 @@
+     }
+ 
+     public void run() {
+-        while (true) {
+-            try {
++        try { // CraftBukkit // PAIL: FF issue
++            while (true) { // CraftBukkit // PAIL: FF issue
+                 if (!this.a) {
+                     break;
+                 }
 @@ -62,7 +62,10 @@
                              String s = StatusChallengeUtils.a(this.k, k, i);
  
@@ -12,3 +23,29 @@
                              } catch (Exception exception) {
                                  this.a(l, "Error executing: " + s + " (" + exception.getMessage() + ")");
                              }
+@@ -90,20 +93,20 @@
+                         this.a(l, String.format("Unknown request %s", new Object[] { Integer.toHexString(i1)}));
+                         continue;
+                     }
+-                }
++                } }
+             } catch (SocketTimeoutException sockettimeoutexception) {
+-                break;
++                // break; // CraftBukkit // PAIL: FF issue
+             } catch (IOException ioexception) {
+-                break;
++                // break; // CraftBukkit // PAIL: FF issue
+             } catch (Exception exception1) {
+                 RemoteControlSession.h.error("Exception whilst parsing RCON input", exception1);
+-                break;
++                // break; // CraftBukkit // PAIL: FF issue
+             } finally {
+                 this.g();
+             }
+ 
+             return;
+-        }
++        // } // CraftBukkit // PAIL: FF issue
+ 
+     }
+