Repo-Mirror/MiraiMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix

Browse Source
This commit is contained in:
Etil
2021-12-22 18:13:27 +01:00
parent b470b2cd08
commit bf46f96267
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0006-Add-last-tick-time-API.patch
View File

@@ -7,10 +7,10 @@ Original code by YatopiaMC, licensed under MIT
You can find the original code on https://github.com/YatopiaMC/Yatopia
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b7c45aa5d5f79fd16e59401acfa9c2bed0a5d78c..4d6b936f28e1686923696e54275eff67e347dc08 100644
index 53c4e5ca208ee17c7c244e416c537c7b63edf194..60e1989a4992ed46baa95ca7ece915e0a2bfbd6c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2115,6 +2115,16 @@ public final class Bukkit {
@@ -2158,6 +2158,16 @@ public final class Bukkit {
return server.isStopping();
}
@@ -28,10 +28,10 @@ index b7c45aa5d5f79fd16e59401acfa9c2bed0a5d78c..4d6b936f28e1686923696e54275eff67
* Returns the {@link com.destroystokyo.paper.entity.ai.MobGoals} manager
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b3b0cea3ed790599b90b98a24aa142875efa1f7b..bf996d38d03e3d9df74d4b917f86dcaea5b7ff8f 100644
index b65f95c1027ef7dbd37d2c622fedafd54de21c77..b399f27a2db96d1ce6529f0125823ebe6387456b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1851,6 +1851,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1886,6 +1886,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isStopping();

11
patches/api/0010-Skip-event-if-no-listeners.patch
View File

@@ -1,27 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Sun, 19 Dec 2021 22:34:04 +0100
Date: Wed, 22 Dec 2021 18:12:39 +0100
Subject: [PATCH] Skip event if no listeners
Original code by Titaniumtown, licensed under GNU General Public License v3.0
You can find the original code on https://gitlab.com/Titaniumtown/JettPack
diff --git a/build.gradle.kts b/build.gradle.kts
index 1d5e05ab5c3c2ba206f52e8743163663490861ab..7e3eb41269da9ba5998877eef56831f0b1823b6b 100644
index 2c33800e7a49804a29f64fd5e6fde7d2c860ef4c..03bad379b8d8c15567a1fdae06b8da6ba567d189 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,9 +26,9 @@ dependencies {
@@ -26,7 +26,7 @@ dependencies {
// api dependencies are listed transitively to API consumers
api("commons-lang:commons-lang:2.6")
api("com.google.guava:guava:31.0.1-jre")
- api("com.google.code.gson:gson:2.8.8")
+ api("com.google.code.gson:gson:2.8.9")
api("net.md-5:bungeecord-chat:1.16-R0.4")
- api("org.yaml:snakeyaml:1.28")
+ api("org.yaml:snakeyaml:1.29")
api("org.yaml:snakeyaml:1.30")
// Paper start
api("com.googlecode.json-simple:json-simple:1.1.1") {
isTransitive = false // includes junit
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index bb60356395ef81bd3bbc51ea1e4ca2faaca2bd1b..9813932164ecadbb5889d5d26bdd3a9947436f48 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java