9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00

Updated Upstream (Paper)

This commit is contained in:
Dreeam
2024-11-09 11:29:30 -05:00
parent dbea770176
commit 0d4d9bd8d8
10 changed files with 52 additions and 52 deletions

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 5aa64ea39ebd92e5067c53cea49a8685c0b9eee4..39bf006b2fc62f74ce893f86dcc5a8e80fb4967a 100644
index 0b78564256ebc647ebac402e549d86ab6e307c8d..dac3a43ccbfffe19f6429cc8df5479fc3c233793 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2263,6 +2263,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2281,6 +2281,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

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 419c056faf0d49d9b0435feb01252e87e227b9a9..1288934d6f2ee77dc20b6c284b6cd65382df3cfb 100644
index 391a1e3e07657a404520c1462507a2c731f32b27..f56c771c92194587b586f3ada344fe540cd231eb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2385,6 +2385,37 @@ public final class Bukkit {
@@ -2409,6 +2409,37 @@ public final class Bukkit {
return server.getTPS();
}
@@ -49,10 +49,10 @@ index 419c056faf0d49d9b0435feb01252e87e227b9a9..1288934d6f2ee77dc20b6c284b6cd653
* 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 39bf006b2fc62f74ce893f86dcc5a8e80fb4967a..dd6b76aa7c741e9b6967dba293d65ba06db0f22b 100644
index dac3a43ccbfffe19f6429cc8df5479fc3c233793..38fbc6e4ff6f0b08813a6a37dfcca24ec58c543f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2042,6 +2042,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2060,6 +2060,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

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 1288934d6f2ee77dc20b6c284b6cd65382df3cfb..82567c13b3b65afa7ac9c64ad9b21c1a50125813 100644
index f56c771c92194587b586f3ada344fe540cd231eb..0dd0d3e2faf82432b621bad95d5d31f7d581ef2b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2385,8 +2385,30 @@ public final class Bukkit {
@@ -2409,8 +2409,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index 1288934d6f2ee77dc20b6c284b6cd65382df3cfb..82567c13b3b65afa7ac9c64ad9b21c1a
* 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 dd6b76aa7c741e9b6967dba293d65ba06db0f22b..f47159c4b382f21bd2ff91acffb219ad6abca01d 100644
index 38fbc6e4ff6f0b08813a6a37dfcca24ec58c543f..e8346ff64783c505456cc7cd2ed91bc2b063e365 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2042,8 +2042,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2060,8 +2060,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

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 82567c13b3b65afa7ac9c64ad9b21c1a50125813..625f4f07b493826b13304960ba81e9ff0fd93ddb 100644
index 0dd0d3e2faf82432b621bad95d5d31f7d581ef2b..bc760c528e95a234190f51b2a02101f34f50fb97 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2970,6 +2970,20 @@ public final class Bukkit {
@@ -2994,6 +2994,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index 82567c13b3b65afa7ac9c64ad9b21c1a50125813..625f4f07b493826b13304960ba81e9ff
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 f47159c4b382f21bd2ff91acffb219ad6abca01d..b2c31cfa7013b2e98225444fa7c0a9c2efd97bb6 100644
index e8346ff64783c505456cc7cd2ed91bc2b063e365..27552fd7422602c0f8cfff158064e61a039270be 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2607,4 +2607,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2625,4 +2625,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API