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

Updated Upstream (Paper) & Fix build

Browse Source
This commit is contained in:
Dreeam
2024-05-20 19:52:09 +08:00
parent c3d6cff782
commit f32892423b
7 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/api/0002-Gale-branding-changes.patch
View File

@@ -62,3 +62,21 @@ index 327766a53d6c730d06765ee937b9a89b6629008c..8a81cc5a8c4ce0109e8a4965f3c625a0
}
tasks.withType<Javadoc> {
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..bdc8d830f54e4567ec0b03041221fdcd016ce76c 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -18,6 +18,13 @@ public interface ServerBuildInfo {
*/
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
+ // Gale start - branding changes
+ /**
+ * The brand id for Gale.
+ */
+ Key BRAND_GALE_ID = Key.key("galemc", "gale");
+ // Gale end - branding changes
+
/**
* Gets the {@code ServerBuildInfo}.
*

4
patches/api/0008-Player-canSee-by-entity-UUID.patch
View File

@@ -37,7 +37,7 @@ 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 6c327a07bf8a6aa11a2d7dad12b2830acc539484..ba3edf4cb1a2fc0529465d6973ec086291bae41c 100644
index 6c327a07bf8a6aa11a2d7dad12b2830acc539484..2d63d61fcfe87c4f07b1d752facbb1bae6f2b0ca 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2108,6 +2108,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -51,7 +51,7 @@ index 6c327a07bf8a6aa11a2d7dad12b2830acc539484..ba3edf4cb1a2fc0529465d6973ec0862
+ * @param entityUUID The {@link Entity#getUniqueId()} of the entity to check
+ * @return True if the entity with the provided UUID is not being hidden from this player
+ */
+ boolean canSee(@NotNull UUID entityUUID);
+ boolean canSeePlayer(@NotNull UUID entityUUID);
+ // Gale end - Purpur - Player#canSee by entity UUID
+
/**

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 d627e3f8ffd37eb79affdce0c06f3d8624e90833..445b422c14af83cb5c88d36590ab2eca895515ac 100644
index 2cb2b7bb87f91d0500872215bfdb2fefba549d6f..dec4ad04ac3dc2e869ea78f354cdf37d7a305a55 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2956,6 +2956,20 @@ public final class Bukkit {
@@ -2962,6 +2962,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index d627e3f8ffd37eb79affdce0c06f3d8624e90833..445b422c14af83cb5c88d36590ab2eca
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 7b31498b03f1ea44d7533cfc8c8afdac9d2898b6..2f02355788d94891d95dd8aecf99009196b262fb 100644
index fb754abc50e79030497a178c443421da1cb88e7f..6d77d7989e757f18ba5d72b07e3b82016a5e28a2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2595,4 +2595,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2599,4 +2599,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API