|
1 | 1 | --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2 | 2 | +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
3 |
| -@@ -316,7 +_,7 @@ |
| 3 | +@@ -317,7 +_,7 @@ |
4 | 4 | public final io.papermc.paper.SparksFly spark; // Paper - spark
|
5 | 5 |
|
6 | 6 | // Paper start - Folia region threading API
|
|
9 | 9 | private final io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler asyncScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler();
|
10 | 10 | private final io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler globalRegionScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler();
|
11 | 11 |
|
12 |
| -@@ -393,7 +_,7 @@ |
| 12 | +@@ -394,7 +_,7 @@ |
13 | 13 |
|
14 | 14 | @Override
|
15 | 15 | public final boolean isGlobalTickThread() {
|
|
18 | 18 | }
|
19 | 19 | // Paper end - Folia reagion threading API
|
20 | 20 |
|
21 |
| -@@ -988,6 +_,9 @@ |
| 21 | +@@ -989,6 +_,9 @@ |
22 | 22 |
|
23 | 23 | // NOTE: Should only be called from DedicatedServer.ah()
|
24 | 24 | public boolean dispatchServerCommand(CommandSender sender, ConsoleInput serverCommand) {
|
|
28 | 28 | if (sender instanceof Conversable) {
|
29 | 29 | Conversable conversable = (Conversable) sender;
|
30 | 30 |
|
31 |
| -@@ -1007,12 +_,46 @@ |
| 31 | +@@ -1008,12 +_,46 @@ |
32 | 32 | }
|
33 | 33 | }
|
34 | 34 |
|
|
75 | 75 | if (this.commandMap.dispatch(sender, commandLine)) {
|
76 | 76 | return true;
|
77 | 77 | }
|
78 |
| -@@ -1284,6 +_,7 @@ |
| 78 | +@@ -1285,6 +_,7 @@ |
79 | 79 |
|
80 | 80 | @Override
|
81 | 81 | public World createWorld(WorldCreator creator) {
|
82 | 82 | + if (true) throw new UnsupportedOperationException(); // Folia - not implemented properly yet
|
83 | 83 | Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
|
84 | 84 | //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
|
85 | 85 | Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
|
86 |
| -@@ -1481,6 +_,7 @@ |
| 86 | +@@ -1482,6 +_,7 @@ |
87 | 87 |
|
88 | 88 | @Override
|
89 | 89 | public boolean unloadWorld(World world, boolean save) {
|
90 | 90 | + if (true) throw new UnsupportedOperationException(); // Folia - not implemented properly yet
|
91 | 91 | //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot unload a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
|
92 | 92 | if (world == null) {
|
93 | 93 | return false;
|
94 |
| -@@ -3073,11 +_,27 @@ |
| 94 | +@@ -3079,11 +_,27 @@ |
95 | 95 |
|
96 | 96 | @Override
|
97 | 97 | public double[] getTPS() {
|
|
122 | 122 | }
|
123 | 123 |
|
124 | 124 | // Paper start - adventure sounds
|
125 |
| -@@ -3248,7 +_,7 @@ |
| 125 | +@@ -3254,7 +_,7 @@ |
126 | 126 |
|
127 | 127 | @Override
|
128 | 128 | public int getCurrentTick() {
|
|
0 commit comments