Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-07-04 08:51:20 +02:00
parent 8ffa6fa149
commit 1f04ebee0f
68 changed files with 221 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0002-Gale-configuration.patch
View File

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5b225bbb128893d67251a96ab318035802a0cf76..bb0a0f853e80e26f919b60fcae51029514558395 100644
index 6b72eccdcb6f75534a4267a1dd0a4cc2f39e917b..f0bd65cb60510a8b3014d902602c306657c75bfd 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2005,6 +2005,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2028,6 +2028,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

10
patches/api/0007-Player-canSee-by-entity-UUID.patch → patches/api/0006-Player-canSee-by-entity-UUID.patch
View File

@@ -37,19 +37,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 06f00d016f1e46edb8f4fe0c14eb8b364900c3ef..42f87a63984345006c513e42b843ea7292d7ee63 100644
index d0297f47f18cabf857cf4ce04c529b46525c0f75..d9482f6eed0b68772d33f861e43181b9453e9581 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,8 @@ package org.bukkit.entity;
import java.net.InetSocketAddress;
@@ -5,6 +5,8 @@ import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
+import java.util.UUID;
+
import org.bukkit.BanEntry;
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -1715,6 +1717,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1753,6 +1755,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ApiStatus.Experimental
public boolean canSee(@NotNull Entity entity);

38
patches/api/0006-Skip-events-without-listeners.patch
View File

@@ -1,38 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Thu, 1 Dec 2022 13:45:13 +0100
Subject: [PATCH] Skip events without listeners
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
This patch is based on the following patch:
"skip event if no listeners"
By: Simon Gardling <titaniumtown@gmail.com>
As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 2b8308989fce7f8a16907f8711b362e671fdbfb6..623c683563a5fb5dcf3b8478873ef2a27307b289 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -633,6 +633,19 @@ public final class SimplePluginManager implements PluginManager {
HandlerList handlers = event.getHandlers();
RegisteredListener[] listeners = handlers.getRegisteredListeners();
+ // Gale start - JettPack - skip events without listeners
+ if (listeners.length == 0) {
+ return;
+ }
+ // Gale end - JettPack - skip events without listeners
+
+ // Paper - replace callEvent by merging to below method
+ if (event.isAsynchronous() && server.isPrimaryThread()) {
+ throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
+ } else if (!event.isAsynchronous() && !server.isPrimaryThread() && !server.isStopping() ) {
+ throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
+ }
+
for (RegisteredListener registration : listeners) {
if (!registration.getPlugin().isEnabled()) {
continue;

8
patches/api/0008-Specific-interval-TPS-API.patch → patches/api/0007-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ef36d793ab77c7b7208f8f5994815599cff470d1..f3f3470f2e07e5e06f599ddc0e5538dfc7a4c283 100644
index b243db56756c67cd2c41d7768898d01539f9260a..a177509cff1f66bc7f48488b9440e573a443c3b5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2108,6 +2108,37 @@ public final class Bukkit {
@@ -2135,6 +2135,37 @@ public final class Bukkit {
return server.getTPS();
}
@@ -49,10 +49,10 @@ index ef36d793ab77c7b7208f8f5994815599cff470d1..f3f3470f2e07e5e06f599ddc0e5538df
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index bb0a0f853e80e26f919b60fcae51029514558395..bac4fccdd56d04e1c130986eb35a2d0c0dd03983 100644
index f0bd65cb60510a8b3014d902602c306657c75bfd..d9bf9c7ad36f7b8d99342e43e7af81075c039431 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1787,6 +1787,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1810,6 +1810,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0009-5-second-TPS-average.patch → patches/api/0008-5-second-TPS-average.patch
View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f3f3470f2e07e5e06f599ddc0e5538dfc7a4c283..343123836a843e633adc0c9bcdcd3d89572e70e2 100644
index a177509cff1f66bc7f48488b9440e573a443c3b5..07194bd35c9a72586a5d4096354ec1f96f882116 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2108,8 +2108,30 @@ public final class Bukkit {
@@ -2135,8 +2135,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index f3f3470f2e07e5e06f599ddc0e5538dfc7a4c283..343123836a843e633adc0c9bcdcd3d89
* Gets the average server TPS over the last 1 minute
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index bac4fccdd56d04e1c130986eb35a2d0c0dd03983..4fabb37be76d85f111d8cbd6ca967bb0ca8f58de 100644
index d9bf9c7ad36f7b8d99342e43e7af81075c039431..d8aed689e6f42798cc8a50919779f5be6f61d685 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1787,8 +1787,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1810,8 +1810,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

14
patches/api/0010-Last-tick-time-API.patch → patches/api/0009-Last-tick-time-API.patch
View File

@@ -23,12 +23,12 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 343123836a843e633adc0c9bcdcd3d89572e70e2..bc84a2b89218fc1e21bddf25ca342c6e2bf9984c 100644
index 07194bd35c9a72586a5d4096354ec1f96f882116..6523d1525c41892fd007d9bba00bc84bea299ca6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2549,6 +2549,20 @@ public final class Bukkit {
@@ -2711,6 +2711,20 @@ public final class Bukkit {
}
// Paper end
// Paper end - Folia region threading API
+ // Gale start - YAPFA - last tick time - API
+ public static long getLastTickTotalTime() {
@@ -48,13 +48,13 @@ index 343123836a843e633adc0c9bcdcd3d89572e70e2..bc84a2b89218fc1e21bddf25ca342c6e
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4fabb37be76d85f111d8cbd6ca967bb0ca8f58de..714ea77b4509ba842c764e78e0bfc1862abcd537 100644
index d8aed689e6f42798cc8a50919779f5be6f61d685..c4d45446b18268c822ee06ae4781f7909d02e04a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2228,4 +2228,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2366,4 +2366,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API
+
+ // Gale start - YAPFA - last tick time - API
+ /**