9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-19 14:59:29 +00:00

Rebuild patches

This commit is contained in:
Dreeam
2025-03-25 02:40:17 -04:00
parent 5c2147b44e
commit 804ecea02f
4 changed files with 11 additions and 10 deletions

View File

@@ -52,7 +52,7 @@ jobs:
- uses: actions/setup-java@main - uses: actions/setup-java@main
with: with:
distribution: 'zulu' distribution: 'zulu'
java-version: '21' java-version: '21'
- name: Running tests before push - name: Running tests before push
run: | run: |
@@ -61,6 +61,7 @@ jobs:
echo "Running tests...." echo "Running tests...."
./gradlew applyAllPatches ./gradlew applyAllPatches
./gradlew build -x test ./gradlew build -x test
./gradlew rebuildPaperPatches
./gradlew rebuildAllServerPatches ./gradlew rebuildAllServerPatches
fi fi

View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9764489c0801eecb8bbfb06103607f0902bf23ab..540020bd2138fab06f89ed233b6b7f97b3036137 100644 index 4eb723afaca049a816d16370b383fa37441eafd4..8fcda1e2510481d25569bcd36abbb7a9ee2d0377 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2426,6 +2426,35 @@ public final class Bukkit { @@ -2427,6 +2427,35 @@ public final class Bukkit {
return server.getTPS(); return server.getTPS();
} }
@@ -47,7 +47,7 @@ index 9764489c0801eecb8bbfb06103607f0902bf23ab..540020bd2138fab06f89ed233b6b7f97
* Get a sample of the servers last tick times (in nanos) * 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 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 58d90c31ccb7af33aaa4b8b4a38ac17150bb5d02..7b8c8a4993dc3cf454204121cefb42fd8ec435de 100644 index c407ff5a5c5f7636ebcdefe253cae823b710698a..af29e9456ae497123fbc0e9dcf037e51c21f2afb 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2112,6 +2112,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2112,6 +2112,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 540020bd2138fab06f89ed233b6b7f97b3036137..d23700abf825d29832ee99d091faf693d4c381e9 100644 index 8fcda1e2510481d25569bcd36abbb7a9ee2d0377..1cea2ffd44b02927f6d1b3a3b0e44346870c973f 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2426,7 +2426,30 @@ public final class Bukkit { @@ -2427,7 +2427,30 @@ public final class Bukkit {
return server.getTPS(); return server.getTPS();
} }
@@ -72,7 +72,7 @@ index 540020bd2138fab06f89ed233b6b7f97b3036137..d23700abf825d29832ee99d091faf693
* Gets the average server TPS over the last 1 minute * 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 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7b8c8a4993dc3cf454204121cefb42fd8ec435de..cbb77e090b6268407d43692a0f4ea521545c7585 100644 index af29e9456ae497123fbc0e9dcf037e51c21f2afb..ae382fc53b0c8544f55dc0f811f05d7a39a8980c 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2112,7 +2112,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2112,7 +2112,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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. 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 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index be4c4b204638a3783db54accab2f0d2fb185fa21..e4db2817be2411116ff29cc85ce97e515eb6e51f 100644 index 1cea2ffd44b02927f6d1b3a3b0e44346870c973f..4328764f428824078136dc761bd234d01d4bec1e 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3032,6 +3032,20 @@ public final class Bukkit { @@ -3033,6 +3033,20 @@ public final class Bukkit {
} }
// Paper end - Folia region threading API // Paper end - Folia region threading API
@@ -48,7 +48,7 @@ index be4c4b204638a3783db54accab2f0d2fb185fa21..e4db2817be2411116ff29cc85ce97e51
* @deprecated All methods on this class have been deprecated, see the individual methods for replacements. * @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
*/ */
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a31eec6def3ccb1bd11fa2f0f1cb693b75756849..3446d5bb24fac345b65ac78927155f60fe437b2c 100644 index ae382fc53b0c8544f55dc0f811f05d7a39a8980c..45dc5c9775c0a70452f91c401acbbe91168875c7 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2750,4 +2750,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2750,4 +2750,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi