diff options
| author | Jake Potrebic <[email protected]> | 2023-03-20 01:47:10 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-03-20 01:47:10 -0700 |
| commit | 7af4cd3647c9c89f25d13ce9e041814e2baca50d (patch) | |
| tree | a0c9739f914af05f9fbd3a4c5463f489f29d3563 /patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | |
| parent | c7520ec49d302b71196fcd44a561720731e44d78 (diff) | |
| download | Paper-7af4cd3647c9c89f25d13ce9e041814e2baca50d.tar.gz Paper-7af4cd3647c9c89f25d13ce9e041814e2baca50d.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#9013)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear 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:
150a2861 PR-827: Add BlockData#getPlacementMaterial
58c9c8ce SPIGOT-7301: Prevent creating non-openable inventories
3741079b PR-824: Expand upon PotionEffect API to better accommodate infinite durations
CraftBukkit Changes:
e5a7921f0 PR-1149: Add BlockData#getPlacementMaterial
58504fa61 SPIGOT-7302: Fix more issues with EntityDamageByEntity - Fix Projectile damage by dispenser - Fix cases where only exists a direct entity damager
48394703d Increase outdated build delay
* Improve docs for BlockData#getPlacementMaterial
Diffstat (limited to 'patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch')
| -rw-r--r-- | patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index debaf0323e..3d62f6ca54 100644 --- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -32,11 +32,11 @@ index b9eae8760a642ab5a38980787dde045a3c08046d..fbc62e2b07a430dea8a827790bda5fbf private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 0cbabd6ffc7bbc9494c1a0d631567fae828fb045..2d1df61cc7ec645add8f729cc6cfdea0c56755aa 100644 +index 7252677bd6dabe094bfc9d47882059b9cb86e791..422a7764ec8713ef6dc2f7cfbe152679ad91a891 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -233,12 +233,25 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -3); + deadline.add(Calendar.DAY_OF_YEAR, -7); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); |