mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2026-01-06 15:41:56 +00:00
Update 1.20.5
This commit is contained in:
@@ -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 4ff1b38eb65f97344257204cf018f176f247ed36..bd6d14ffbbc93a94656255c395628df776334310 100644
|
||||
index 27084402cf0e46dcd171074629b7c4156e48aa44..718955f1a6cca9d93bed49f53f8295a6be0c26d0 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2233,6 +2233,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2252,6 +2252,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
{
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..92d20e70d26318fbaed8adffd21c6b77
|
||||
* This class was not meant to be constructed explicitly
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||
index 653135352c104a6ddeb74a1b6d4916c6952d6271..78a6e7a31a81bc82d3e3687661e16c6d8ebc4617 100644
|
||||
index f4d655a158410039305ac68cebe0d79000f73df8..7ad6d1007154357a33bca49fec43cb4a4a15b832 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||
@@ -66,6 +66,7 @@ public class LibraryLoader
|
||||
@@ -66,7 +66,7 @@ index 653135352c104a6ddeb74a1b6d4916c6952d6271..78a6e7a31a81bc82d3e3687661e16c6d
|
||||
logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
|
||||
}
|
||||
} );
|
||||
@@ -81,6 +82,7 @@ public class LibraryLoader
|
||||
@@ -86,6 +87,7 @@ public class LibraryLoader
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -74,7 +74,7 @@ index 653135352c104a6ddeb74a1b6d4916c6952d6271..78a6e7a31a81bc82d3e3687661e16c6d
|
||||
logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
||||
{
|
||||
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
||||
@@ -119,6 +121,7 @@ public class LibraryLoader
|
||||
@@ -124,6 +126,7 @@ public class LibraryLoader
|
||||
}
|
||||
|
||||
jarFiles.add( url );
|
||||
|
||||
@@ -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 c6cb4f17469a8f2e60dd3e28d41402851ce5fb21..019237c2e536a118f7cd3d81fc59b74f21c34609 100644
|
||||
index 8a1e39474af88188f2e1765731b57d349f0ee645..0b3a1f3285fc0d8954f4204a93d3905df01cd828 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -2054,6 +2054,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -2098,6 +2098,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
boolean listPlayer(@NotNull Player other);
|
||||
// Paper end
|
||||
|
||||
|
||||
@@ -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 9a428153f34291bdc026a71f7e60e285b7794b0c..ee513652ab11b9173e6dd83d9ff048ee50a5acd3 100644
|
||||
index 687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76..3719626f051b1577e7874d17c26f2ce7e7e25689 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -2357,6 +2357,37 @@ public final class Bukkit {
|
||||
@@ -2380,6 +2380,37 @@ public final class Bukkit {
|
||||
return server.getTPS();
|
||||
}
|
||||
|
||||
@@ -49,10 +49,10 @@ index 9a428153f34291bdc026a71f7e60e285b7794b0c..ee513652ab11b9173e6dd83d9ff048ee
|
||||
* 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 bd6d14ffbbc93a94656255c395628df776334310..bdf18c891ff90ca6173ff8af14f6ad6dbc370ae7 100644
|
||||
index 718955f1a6cca9d93bed49f53f8295a6be0c26d0..a6baad622de8252aa7138a9b571a5329d64a608c 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2015,6 +2015,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2034,6 +2034,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@NotNull
|
||||
public double[] getTPS();
|
||||
|
||||
|
||||
@@ -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 ee513652ab11b9173e6dd83d9ff048ee50a5acd3..7b28cc23aa63431fe51fc8e51d5774f4a314945f 100644
|
||||
index 3719626f051b1577e7874d17c26f2ce7e7e25689..1d288ac91a00d427b92711ecaf581d1746d90cc1 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -2357,8 +2357,30 @@ public final class Bukkit {
|
||||
@@ -2380,8 +2380,30 @@ public final class Bukkit {
|
||||
return server.getTPS();
|
||||
}
|
||||
|
||||
@@ -72,10 +72,10 @@ index ee513652ab11b9173e6dd83d9ff048ee50a5acd3..7b28cc23aa63431fe51fc8e51d5774f4
|
||||
* 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 bdf18c891ff90ca6173ff8af14f6ad6dbc370ae7..e634f4ce24423fd955bac3cd717f78142e7e4e30 100644
|
||||
index a6baad622de8252aa7138a9b571a5329d64a608c..0fabc244497cadc6d966ff6cce3fe2a9b065ef2d 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2015,8 +2015,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2034,8 +2034,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@NotNull
|
||||
public double[] getTPS();
|
||||
|
||||
|
||||
@@ -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 7b28cc23aa63431fe51fc8e51d5774f4a314945f..d8201747ede92a0123eec012844a7a674e6947f5 100644
|
||||
index 1d288ac91a00d427b92711ecaf581d1746d90cc1..1a4eae45a9352fcc55b8c8a63a126d734604e8c6 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -2933,6 +2933,20 @@ public final class Bukkit {
|
||||
@@ -2956,6 +2956,20 @@ public final class Bukkit {
|
||||
}
|
||||
// Paper end - Folia region threading API
|
||||
|
||||
@@ -48,10 +48,10 @@ index 7b28cc23aa63431fe51fc8e51d5774f4a314945f..d8201747ede92a0123eec012844a7a67
|
||||
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 e634f4ce24423fd955bac3cd717f78142e7e4e30..e0615e17765406bab75b5d16f9056d6821c577ee 100644
|
||||
index 0fabc244497cadc6d966ff6cce3fe2a9b065ef2d..db539f0324f2d7c9a9bcb2738bd8eb4158f8d4b5 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2571,4 +2571,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2590,4 +2590,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
*/
|
||||
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
|
||||
// Paper end - Folia region threading API
|
||||
|
||||
Reference in New Issue
Block a user