Port flat bedrock (generator settings) to 1.18 (#6960)

2021-12-01 02:31:13 +01:00 · 2021-12-01 02:31:13 +01:00 · cd9fe9ca64
commit cd9fe9ca64
parent effa3bad36
475 changed files with 270 additions and 234 deletions
--- a/patches/server/0600-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0600-Add-getMainThreadExecutor-to-BukkitScheduler.patch
@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aleksander Jagiello <themolkapl@gmail.com>
+Date: Sun, 24 Jan 2021 22:17:54 +0100
+Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+index a423970cf7c927ea8a1bf842aaa236d3cf2d54c2..cdefb2025eedea7e204d70d568adaf1c1ec4c03c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+@@ -655,4 +655,15 @@ public class CraftScheduler implements BukkitScheduler {
+     public BukkitTask runTaskTimerAsynchronously(Plugin plugin, BukkitRunnable task, long delay, long period) throws IllegalArgumentException {
+         throw new UnsupportedOperationException("Use BukkitRunnable#runTaskTimerAsynchronously(Plugin, long, long)");
+     }
+
+    // Paper start - add getMainThreadExecutor
+    @Override
+    public Executor getMainThreadExecutor(Plugin plugin) {
+        Validate.notNull(plugin, "Plugin cannot be null");
+        return command -> {
+            Validate.notNull(command, "Command cannot be null");
+            this.runTask(plugin, command);
+        };
+    }
+    // Paper end
+ }