Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@307778f Collision API (#6736)
PaperMC/Paper@fcb7b73 [ci skip] remove stale
PaperMC/Paper@1f0d707 Fix issues with CreeperIgniteEvent (#7507)
PaperMC/Paper@fd557b7 Undeprecate Bed's tile entity interface (#7330)

Pufferfish Changes:
pufferfish-gg/Pufferfish@002f541 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9c5fcfd Add option to disable out-of-order chat
pufferfish-gg/Pufferfish@b21931d Fix memory leak in async pathfinder (#42)
This commit is contained in:
BillyGalbreath
2022-07-31 16:00:16 -05:00
parent f22f64e292
commit 9db159d266
14 changed files with 220 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -3,21 +3,6 @@ From: Kevin Raneri <kevin.raneri@gmail.com>
Date: Tue, 9 Nov 2021 14:01:56 -0500
Subject: [PATCH] Pufferfish API Changes
Pufferfish
Copyright (C) 2022 Pufferfish Studios LLC
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index e950bce5047552bdd3f5664eb24ce290b0a06225..10716b2c866631badb99b1fb79b66c62b117b038 100644
@@ -426,7 +411,7 @@ index 8e6ad6ffb6918742d47b58d6cb1ad646d5e3df5f..331adbaf782c00d801a36c0c9551451a
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1c9d0a81d581d0e6a8b2551a2cb9ed5e18bb2991..e42a2d631fd7eaa455132e0cf64c9be7707dadb9 100644
index 9db611841b73fed8dc8a71f4d7fdef95af3cf89d..49a4611ed4891cce10fd6e01b4062740ad18ee6f 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -623,7 +623,9 @@ public final class SimplePluginManager implements PluginManager {