mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator
c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE
9c1fa040 #467: Add method to remove a recipe by its key
3961d1aa Add nb-configuration.xml to .gitignore

CraftBukkit Changes:
d70084e5 Remove unused seed in CustomChunkGenerator
8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator
c2dc19d3 Craftbukkit -> CraftBukkit
ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose
00980376 #618: Add method to remove a recipe by its key

Spigot Changes:
c574e08b Rebuild patches
13c24cc4 Rebuild patches
This commit is contained in:
Shane Freeder 2020-02-02 11:53:48 +00:00
parent 55b3a09dde
commit 77b05b9c8e
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
44 changed files with 268 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0004-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 6fbd2dbbb48a9fd96971d79992af9b9f1e5487dd Mon Sep 17 00:00:00 2001
From a8ffb9f5823bbfe973233e2f4c4e5f45cb4ea5cc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -3139,7 +3139,7 @@ index 000000000..5989ee212
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index bbc68de0a..a85b8b860 100644
index 82bc43aa9..279236a45 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -574,7 +574,6 @@ public final class Bukkit {
@ -3151,10 +3151,10 @@ index bbc68de0a..a85b8b860 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 042db4f53..f4f0f3da2 100644
index 83ce6a86e..d00a289de 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1248,6 +1248,26 @@ public interface Server extends PluginMessageRecipient {
@@ -1260,6 +1260,26 @@ public interface Server extends PluginMessageRecipient {
throw new UnsupportedOperationException("Not supported yet.");
}

12
Spigot-API-Patches/0006-Add-getTPS-method.patch
View file

@ -1,14 +1,14 @@
From 510b3804346327935a0f02423c54a46b68649235 Mon Sep 17 00:00:00 2001
From 9a5fb9b80a46a450067b0620831174013dd92ad1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 940c643d..9f87f333 100644
index 279236a45..3faccfea7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1311,6 +1311,17 @@ public final class Bukkit {
@@ -1325,6 +1325,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@ -27,10 +27,10 @@ index 940c643d..9f87f333 100644
* Get the advancement specified by this key.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c197e381..e1dfa92a 100644
index d00a289de..51efc5f71 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1096,6 +1096,16 @@ public interface Server extends PluginMessageRecipient {
@@ -1108,6 +1108,16 @@ public interface Server extends PluginMessageRecipient {
@Nullable
Entity getEntity(@NotNull UUID uuid);
@ -48,5 +48,5 @@ index c197e381..e1dfa92a 100644
* Get the advancement specified by this key.
*
--
2.25.0.windows.1
2.25.0

10
Spigot-API-Patches/0014-Expose-server-CommandMap.patch
View file

@ -1,14 +1,14 @@
From 7664bee9fabc104e5e97b7122e1e60bd112e747b Mon Sep 17 00:00:00 2001
From e4691bd2dccf7c9841bb40ec8aa4ee86fc6f81b7 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f712d27b..487ecdad 100644
index 3faccfea7..c9f473641 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1485,6 +1485,19 @@ public final class Bukkit {
@@ -1499,6 +1499,19 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -29,10 +29,10 @@ index f712d27b..487ecdad 100644
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index be17dcc6..425d8781 100644
index 51efc5f71..121367cd0 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1106,6 +1106,15 @@ public interface Server extends PluginMessageRecipient {
@@ -1118,6 +1118,15 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end

10
Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
View file

@ -1,4 +1,4 @@
From a11adba8d108fa72b7cebd2e84f0cceff1098f7c Mon Sep 17 00:00:00 2001
From 8eab30f6cf58217f754d15de6e771436218a5c35 Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f152a60f6..58a183b9d 100644
index 348e5411f..8f5aa9068 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1516,6 +1516,13 @@ public final class Bukkit {
@@ -1530,6 +1530,13 @@ public final class Bukkit {
public static org.bukkit.command.CommandMap getCommandMap() {
return server.getCommandMap();
}
@ -24,10 +24,10 @@ index f152a60f6..58a183b9d 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 74f9d2bbc..ca0b63fa0 100644
index 743dbfe89..88306726c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1336,4 +1336,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1348,4 +1348,6 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Spigot spigot();
// Spigot end

16
Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
View file

@ -1,4 +1,4 @@
From 716d04a625ad53d7c23629e6b0d9e169fcc3878e Mon Sep 17 00:00:00 2001
From 8204b1c42ea2dd1e6159e94f54bd6993c0d8281b Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 58a183b9..a8fe9925 100644
index 8f5aa9068..52599c907 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1523,6 +1523,15 @@ public final class Bukkit {
@@ -1537,6 +1537,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -26,10 +26,10 @@ index 58a183b9..a8fe9925 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ca0b63fa..9e59c9bf 100644
index 88306726c..b68098b6d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1338,4 +1338,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1350,4 +1350,6 @@ public interface Server extends PluginMessageRecipient {
// Spigot end
void reloadPermissions(); // Paper
@ -37,7 +37,7 @@ index ca0b63fa..9e59c9bf 100644
+ boolean reloadCommandAliases(); // Paper
}
diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
index bd2c7a69..864c263b 100644
index bd2c7a696..864c263bb 100644
--- a/src/main/java/org/bukkit/command/CommandMap.java
+++ b/src/main/java/org/bukkit/command/CommandMap.java
@@ -128,4 +128,14 @@ public interface CommandMap {
@ -56,7 +56,7 @@ index bd2c7a69..864c263b 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index adfc7aae..460fda05 100644
index adfc7aae2..460fda05a 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap {
@ -72,7 +72,7 @@ index adfc7aae..460fda05 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index c62da413..af8ab73f 100644
index c62da4131..af8ab73fe 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {

12
Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
View file

@ -1,4 +1,4 @@
From a8e01b9271318336993e03ebd734cf22ec5472a6 Mon Sep 17 00:00:00 2001
From 1255c19720c7ce036ff87708f203d015b8230830 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:24 -0700
Subject: [PATCH] Add configuration option to prevent player names from being
@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a8fe9925..b4fef76b 100644
index 52599c907..d0119b3b7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1532,6 +1532,16 @@ public final class Bukkit {
@@ -1546,6 +1546,16 @@ public final class Bukkit {
public static boolean reloadCommandAliases() {
return server.reloadCommandAliases();
}
@ -27,10 +27,10 @@ index a8fe9925..b4fef76b 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9e59c9bf..c108478a 100644
index b68098b6d..403a1e17d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1340,4 +1340,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1352,4 +1352,14 @@ public interface Server extends PluginMessageRecipient {
void reloadPermissions(); // Paper
boolean reloadCommandAliases(); // Paper
@ -46,7 +46,7 @@ index 9e59c9bf..c108478a 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
index 7f153000..1e126487 100644
index 7f153000e..1e126487d 100644
--- a/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo

14
Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
View file

@ -1,4 +1,4 @@
From 9cf9ffe4e56840183e198f65002c4d260a422437 Mon Sep 17 00:00:00 2001
From 59ebf71478418359fd0f3967e2394f6148f5a5de Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 21:46:46 -0500
Subject: [PATCH] Basic PlayerProfile API
@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events
diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
new file mode 100644
index 00000000..476151d2
index 000000000..476151d2a
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
@@ -0,0 +1,145 @@
@ -158,7 +158,7 @@ index 00000000..476151d2
+}
diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
new file mode 100644
index 00000000..7b3b6ef5
index 000000000..7b3b6ef53
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
@@ -0,0 +1,72 @@
@ -235,10 +235,10 @@ index 00000000..7b3b6ef5
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b4fef76b..c3bcc653 100644
index d0119b3b7..c1f96b46f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1542,6 +1542,40 @@ public final class Bukkit {
@@ -1556,6 +1556,40 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -280,10 +280,10 @@ index b4fef76b..c3bcc653 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c108478a..48d8c967 100644
index 403a1e17d..a5e87a4ab 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1349,5 +1349,33 @@ public interface Server extends PluginMessageRecipient {
@@ -1361,5 +1361,33 @@ public interface Server extends PluginMessageRecipient {
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();

12
Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
View file

@ -1,14 +1,14 @@
From eb23a61d24f7150eb24130ce0ac936cb7fd8d93f Mon Sep 17 00:00:00 2001
From d679f9f4ab62f832886c60b2d24f66d3674b98ba Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 18 Nov 2018 19:44:54 +0000
Subject: [PATCH] Make the default permission message configurable
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d1ac7856..ee03abae 100644
index 95b8f4cf3..389180290 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1557,6 +1557,15 @@ public final class Bukkit {
@@ -1571,6 +1571,15 @@ public final class Bukkit {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -25,10 +25,10 @@ index d1ac7856..ee03abae 100644
* Creates a PlayerProfile for the specified uuid, with name as null
* @param uuid UUID to create profile for
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 409c1624..e9e64060 100644
index 6ad677bda..fbb21b4a3 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1362,6 +1362,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1374,6 +1374,13 @@ public interface Server extends PluginMessageRecipient {
*/
boolean suggestPlayerNamesWhenNullTabCompletions();
@ -43,7 +43,7 @@ index 409c1624..e9e64060 100644
* Creates a PlayerProfile for the specified uuid, with name as null
* @param uuid UUID to create profile for
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 03bdc162..0b0d1bd7 100644
index 03bdc1622..0b0d1bd7c 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -185,7 +185,7 @@ public abstract class Command {

20
Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
View file

@ -1,4 +1,4 @@
From 0d5124c6ebb38a898767c1b991bafecacc3bc1dd Mon Sep 17 00:00:00 2001
From 150224b84389e4e41390bb346b9789e8f8a6152f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Mar 2019 18:39:01 -0400
Subject: [PATCH] Flip some Spigot API null annotations
@ -9,10 +9,10 @@ a ton of noise to plugin developers.
These do not help plugin developers if they bring moise noise than value.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 2148a3c2..6db69159 100644
index 389180290..93de987d5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1153,7 +1153,7 @@ public final class Bukkit {
@@ -1167,7 +1167,7 @@ public final class Bukkit {
*
* @return the scoreboard manager or null if no worlds are loaded.
*/
@ -21,7 +21,7 @@ index 2148a3c2..6db69159 100644
public static ScoreboardManager getScoreboardManager() {
return server.getScoreboardManager();
}
@@ -1450,7 +1450,7 @@ public final class Bukkit {
@@ -1464,7 +1464,7 @@ public final class Bukkit {
* @param clazz the class of the tag entries
* @return the tag or null
*/
@ -31,7 +31,7 @@ index 2148a3c2..6db69159 100644
return server.getTag(registry, tag, clazz);
}
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 6e1a1124..77d9cd0a 100644
index 6e1a1124a..77d9cd0a1 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@ -62,10 +62,10 @@ index 6e1a1124..77d9cd0a 100644
if (this.world == null) {
return null;
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1cbb9bc6..27d3b5ad 100644
index fbb21b4a3..2733793a5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -962,7 +962,7 @@ public interface Server extends PluginMessageRecipient {
@@ -974,7 +974,7 @@ public interface Server extends PluginMessageRecipient {
*
* @return the scoreboard manager or null if no worlds are loaded.
*/
@ -74,7 +74,7 @@ index 1cbb9bc6..27d3b5ad 100644
ScoreboardManager getScoreboardManager();
/**
@@ -1232,7 +1232,7 @@ public interface Server extends PluginMessageRecipient {
@@ -1244,7 +1244,7 @@ public interface Server extends PluginMessageRecipient {
* @param clazz the class of the tag entries
* @return the tag or null
*/
@ -84,7 +84,7 @@ index 1cbb9bc6..27d3b5ad 100644
/**
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index 3cada348..03ba2265 100644
index 3cada3487..03ba22659 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -3,6 +3,7 @@ package org.bukkit.inventory;
@ -105,7 +105,7 @@ index 3cada348..03ba2265 100644
/**
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index f2c3d2ac..5426e7c2 100644
index 4940ba6a9..d7d6a3e83 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -8,6 +8,7 @@ import java.util.Set; // Paper

8
Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch
View file

@ -1,4 +1,4 @@
From 93548ddd969d1473484e7793511d8019c7d430ec Mon Sep 17 00:00:00 2001
From ed28e81070e65d81b3033caf1f2ad6399194f63f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io>
Date: Wed, 2 Oct 2019 21:24:28 -0500
Subject: [PATCH] Name the specific custom world gen plugin class that throws a
@ -6,10 +6,10 @@ Subject: [PATCH] Name the specific custom world gen plugin class that throws a
diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
index 5b847bb3..6c9d313f 100644
index 70f20fb64..59138238b 100644
--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
+++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
@@ -109,7 +109,10 @@ public abstract class ChunkGenerator {
@@ -114,7 +114,10 @@ public abstract class ChunkGenerator {
*/
@NotNull
public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) {
@ -22,5 +22,5 @@ index 5b847bb3..6c9d313f 100644
/**
--
2.25.0.windows.1
2.25.0

10
Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch
View file

@ -1,14 +1,14 @@
From 4684a91a8eb0975c778bf782b33c512fc9b8aeb9 Mon Sep 17 00:00:00 2001
From a4dde4633566bd37253986617541e91a46ac204f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 20 Apr 2019 19:47:29 -0500
Subject: [PATCH] Expose the internal current tick
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 570c5bc8..388c2bbf 100644
index 93de987d5..355bd2e22 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1599,6 +1599,10 @@ public final class Bukkit {
@@ -1613,6 +1613,10 @@ public final class Bukkit {
public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
return server.createProfile(uuid, name);
}
@ -20,10 +20,10 @@ index 570c5bc8..388c2bbf 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5e94b2b0..a1371730 100644
index 2733793a5..98e7ba900 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1396,5 +1396,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1408,5 +1408,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);