9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-06 15:41:56 +00:00

Updated Upstream (Paper)

This commit is contained in:
Martijn Muijsers
2023-08-21 22:36:08 +02:00
parent a50e9c9e4e
commit 0995eaa49d
41 changed files with 134 additions and 197 deletions

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 3bc5e4fda1551dc1c9e7220d8a5c488398b16d4f..cf5cae753357bbe82d280a5c83800be2bb83f299 100644
index 4bd9065b2a0c8dd67d4d7ba90a9be772aeec260c..c0d0604e8d5d1ebf3a3d665a55a02ea12416465f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2763,6 +2763,20 @@ public final class Bukkit {
@@ -2805,6 +2805,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index 3bc5e4fda1551dc1c9e7220d8a5c488398b16d4f..cf5cae753357bbe82d280a5c83800be2
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 32d7cad1e2cbf277e6430bf985ecfaf16935d615..093ba28cc5ab0bf5ef4a9198c1231d160713dbe7 100644
index ddf9462245c159372f6425cd0c4f6264ca689c95..9ff34994f2a4dcf0b10262aacc912d7d283c121e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2417,4 +2417,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2457,4 +2457,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API