Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 16:59:23 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3a47518 Deprecate more Timings things for removal (#11126)
PaperMC/Paper@aa36ae6 Fix EntityUnleashEvent cancellation on distance cause (#11131)
This commit is contained in:
Dreeam
2024-07-22 00:22:25 +00:00
parent 393246435d
commit c296ceed7a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.21-R0.1-SNAPSHOT version=1.21-R0.1-SNAPSHOT
mcVersion=1.21 mcVersion=1.21
paperRef=7e91a2c3abb438a3ac55b5abfc894486ed5f397f paperRef=aa36ae65764f652a16517a994e8d9cf4a89136c8
org.gradle.caching=false org.gradle.caching=false
org.gradle.parallel=true org.gradle.parallel=true

6
patches/api/0004-Make-timings-calls-final.patch
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/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..16040016d7de911eddec278ec2adc2b856df9bcd 100644 index 3e747abde6fefae90f1c15cb00158bc5303cbe50..fd9c06853a503aa787c4d93801714024465a7ee2 100644
--- a/src/main/java/co/aikar/timings/FullServerTickHandler.java --- a/src/main/java/co/aikar/timings/FullServerTickHandler.java
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -19,8 +19,7 @@ public class FullServerTickHandler extends TimingHandler { @@ -22,8 +22,7 @@ public class FullServerTickHandler extends TimingHandler {
} }
@NotNull @NotNull
@@ -20,7 +20,7 @@ index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..16040016d7de911eddec278ec2adc2b8
if (TimingsManager.needsFullReset) { if (TimingsManager.needsFullReset) {
TimingsManager.resetTimings(); TimingsManager.resetTimings();
} else if (TimingsManager.needsRecheckEnabled) { } else if (TimingsManager.needsRecheckEnabled) {
@@ -29,8 +28,7 @@ public class FullServerTickHandler extends TimingHandler { @@ -32,8 +31,7 @@ public class FullServerTickHandler extends TimingHandler {
return super.startTiming(); return super.startTiming();
} }