Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fdd910e Log IOException in plugin update (#7960)
PaperMC/Paper@90836d0 1.19 Anti-Xray cleanup (#8104)
PaperMC/Paper@384d639 Fix missing redstone event call with Eigencraft redstone (#8148)
This commit is contained in:
BillyGalbreath
2022-07-18 06:49:45 -05:00
parent b5fd0447a9
commit 4951792417
7 changed files with 30 additions and 30 deletions

View File

@@ -20,7 +20,7 @@ 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 435db1ffe47476bcb7067802faad7aee7e4c3f54..b8fa29c4e39c4587855e6c8be3f5b373bd841ba3 100644
index 0660174a8c543b3e8ef317cfabcda88a6a53d844..fa06125f095bd099d595ddb3cb5871d90ae1ccf7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,6 +41,7 @@ dependencies {
@@ -426,10 +426,10 @@ index 8e6ad6ffb6918742d47b58d6cb1ad646d5e3df5f..331adbaf782c00d801a36c0c9551451a
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index ed07f5820281b139739f673fa4e25171de81b894..aed2209b66f11a0d03473cf19437f3da0e9e573a 100644
index 5270e43c629fe63f42691d10c6f77dc1cc987457..6aba652af2b2f054ad22c77e4e59f0ed3eddc685 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -617,7 +617,9 @@ public final class SimplePluginManager implements PluginManager {
@@ -622,7 +622,9 @@ public final class SimplePluginManager implements PluginManager {
// Paper start
private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -439,7 +439,7 @@ index ed07f5820281b139739f673fa4e25171de81b894..aed2209b66f11a0d03473cf19437f3da
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
}
// Paper end
@@ -676,9 +678,11 @@ public final class SimplePluginManager implements PluginManager {
@@ -681,9 +683,11 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {