Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)

1 files changed, 3 insertions, 3 deletions

diff --git a/patches/server/0389-Improved-Watchdog-Support.patch b/patches/server/0389-Improved-Watchdog-Support.patch
index d1614d7501..4c4b9a4420 100644
--- a/patches/server/0389-Improved-Watchdog-Support.patch
+++ b/patches/server/0389-Improved-Watchdog-Support.patch
@@ -343,7 +343,7 @@ index a35501ea43bf3589b346b1e684c318b44ca57977..4016b31bd020e00c0e79328646f9b541
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3472114c373d7b884d8ae24906e30daa039d0742..987bc4577190d827718b5144656aaddf22599cab 100644
+index 08e74f41516a545a2371a7418d995ab288831834..cce6886bb3973eed8f0c7ca7b1189547324fd4e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -12,6 +12,8 @@ import java.util.logging.Level;
@@ -355,7 +355,7 @@ index 3472114c373d7b884d8ae24906e30daa039d0742..987bc4577190d827718b5144656aaddf
  import net.minecrell.terminalconsole.TerminalConsoleAppender; // Paper
  
  public class Main {
-@@ -167,6 +169,36 @@ public class Main {
+@@ -169,6 +171,36 @@ public class Main {
  
          OptionSet options = null;
  
@@ -392,7 +392,7 @@ index 3472114c373d7b884d8ae24906e30daa039d0742..987bc4577190d827718b5144656aaddf
          try {
              options = parser.parse(args);
          } catch (joptsimple.OptionException ex) {
-@@ -262,8 +294,64 @@ public class Main {
+@@ -264,8 +296,64 @@ public class Main {
              } catch (Throwable t) {
                  t.printStackTrace();
              }