Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-29 03:29:09 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-02-13 11:55:07 -05:00
parent 29ff5f8515
commit 66f510bc1f
34 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0003-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 9af4bc16da09e59009c47911219e99450cdf2aa5..ec3d7ea7aa2b399b89217e537aa325f73207c558 100644
index b4f8281d3797ec825a7671f38077cd65d5a1d76e..f77cc88aebcd51ad84d6e2bed2c09f6a2055ef64 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2196,6 +2196,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2212,6 +2212,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

4
patches/api/0008-Player-canSee-by-entity-UUID.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/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 31aa6ef5fc2b3b88c72f5a15b8cc7a0e50c29f46..7b751fac9dcfab016f1ad7e799708110dd3c2724 100644
index 254a02ddb5dc867c9dd6c2086791f7ab94247fd3..ad21ca6e9a2e77da185950a34f114480dddddec0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2008,6 +2008,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2030,6 +2030,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
boolean listPlayer(@NotNull Player other);
// Paper end

8
patches/api/0009-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 48fab492609e0bae459d20cc2eae78b87e37ab75..f08549ce1908766df60dfd9eeb906660ae537c1a 100644
index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..b1172900c85b4cf82dbf30e38e983f52e253b7cc 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2315,6 +2315,37 @@ public final class Bukkit {
@@ -2335,6 +2335,37 @@ public final class Bukkit {
return server.getTPS();
}
@@ -49,10 +49,10 @@ index 48fab492609e0bae459d20cc2eae78b87e37ab75..f08549ce1908766df60dfd9eeb906660
* 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 ec3d7ea7aa2b399b89217e537aa325f73207c558..8fa2dbc7a1a16a3b1818b6a674400a37ab42a3c6 100644
index f77cc88aebcd51ad84d6e2bed2c09f6a2055ef64..364bbd8f0974e79ad876b2bf2218ef5a16836603 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1978,6 +1978,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1994,6 +1994,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0010-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 f08549ce1908766df60dfd9eeb906660ae537c1a..964b7903df91201e14431852c6c1c03cd5c2346b 100644
index b1172900c85b4cf82dbf30e38e983f52e253b7cc..e2faf638db7625164cdd84c1e4348d0c2b4dcfc3 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2315,8 +2315,30 @@ public final class Bukkit {
@@ -2335,8 +2335,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index f08549ce1908766df60dfd9eeb906660ae537c1a..964b7903df91201e14431852c6c1c03c
* 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 8fa2dbc7a1a16a3b1818b6a674400a37ab42a3c6..50b03bed7a89232d6d83fa35e4b28ed8fc9515d6 100644
index 364bbd8f0974e79ad876b2bf2218ef5a16836603..694c7068742d3bf7184893927da0bd56d83e991c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1978,8 +1978,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1994,8 +1994,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0011-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ 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 964b7903df91201e14431852c6c1c03cd5c2346b..097cecdf1a535539b660f2edf4776ba85458ce0a 100644
index e2faf638db7625164cdd84c1e4348d0c2b4dcfc3..77696b5505e9c05753ec95050ec55878794fcf7c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2891,6 +2891,20 @@ public final class Bukkit {
@@ -2911,6 +2911,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index 964b7903df91201e14431852c6c1c03cd5c2346b..097cecdf1a535539b660f2edf4776ba8
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 50b03bed7a89232d6d83fa35e4b28ed8fc9515d6..1e1028b4ac54e82b9bb30e958f651a0ca2b0dc86 100644
index 694c7068742d3bf7184893927da0bd56d83e991c..6b7584082a12903184add379c3b1dddfcff015fc 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2534,4 +2534,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2550,4 +2550,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API