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

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