diff --git a/1.18.2/.jenkins/Jenkinsfile.snapshot b/1.18.2/.jenkins/Jenkinsfile.snapshot index deb951d..cf6a311 100644 --- a/1.18.2/.jenkins/Jenkinsfile.snapshot +++ b/1.18.2/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/1.19.2/.jenkins/Jenkinsfile.snapshot b/1.19.2/.jenkins/Jenkinsfile.snapshot index 7548a93..ec300ae 100644 --- a/1.19.2/.jenkins/Jenkinsfile.snapshot +++ b/1.19.2/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/1.19.3/.jenkins/Jenkinsfile.snapshot b/1.19.3/.jenkins/Jenkinsfile.snapshot index 8fcbb59..e0bf337 100644 --- a/1.19.3/.jenkins/Jenkinsfile.snapshot +++ b/1.19.3/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/1.20.2/.jenkins/Jenkinsfile.snapshot b/1.20.2/.jenkins/Jenkinsfile.snapshot index 4b1e387..ac828d5 100644 --- a/1.20.2/.jenkins/Jenkinsfile.snapshot +++ b/1.20.2/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/1.20.4/.jenkins/Jenkinsfile.snapshot b/1.20.4/.jenkins/Jenkinsfile.snapshot index 2959391..cc4e6f8 100644 --- a/1.20.4/.jenkins/Jenkinsfile.snapshot +++ b/1.20.4/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java index 93a4da6..6ef9954 100644 --- a/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java +++ b/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java @@ -32,10 +32,6 @@ public class ForgeCompatHelper implements CompatUtils { @Override public boolean playerRevived(BridgedPlayer player) { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive")) - return false; - - IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer()); - return bleeding != null && bleeding.revived(); + return false; } } diff --git a/1.20/.jenkins/Jenkinsfile.snapshot b/1.20/.jenkins/Jenkinsfile.snapshot index 0ffab2f..c3f8460 100644 --- a/1.20/.jenkins/Jenkinsfile.snapshot +++ b/1.20/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/1.21.2/.jenkins/Jenkinsfile.snapshot b/1.21.2/.jenkins/Jenkinsfile.snapshot index c84b05a..89df845 100644 --- a/1.21.2/.jenkins/Jenkinsfile.snapshot +++ b/1.21.2/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/1.21/.jenkins/Jenkinsfile.snapshot b/1.21/.jenkins/Jenkinsfile.snapshot index b90b534..35d7520 100644 --- a/1.21/.jenkins/Jenkinsfile.snapshot +++ b/1.21/.jenkins/Jenkinsfile.snapshot @@ -20,6 +20,12 @@ pipeline { } stages { + stage('Checkout') { + steps { + scmSkip(deleteBuild: false, skipPattern:'.*\\[ci skip\\].*') + } + } + stage("Notify Discord") { steps { discordSend webhookURL: env.SSS_WEBHOOK, diff --git a/commit.sha b/commit.sha index 8052469..a78cc61 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -7f9ff38768686f25acef284357ebeee1f011e156 \ No newline at end of file +3986f085401b233e650720350a165b476d839041 \ No newline at end of file diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch index 67331a5..73a8945 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch @@ -16,7 +16,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -40,7 +40,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always { diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch index f8aa05b..f3ef26e 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch @@ -16,7 +16,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -40,7 +40,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always { diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch index 37c5533..9d71957 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch @@ -16,7 +16,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -40,7 +40,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always { diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch index b7be37b..5e8cb81 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch @@ -16,7 +16,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -40,7 +40,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always { diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch index 7c940e8..db6901b 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch @@ -16,7 +16,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -40,7 +40,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always { diff --git a/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch index 20f0e0e..d756777 100644 --- a/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch +++ b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch @@ -22,7 +22,7 @@ } @Override -@@ -19,19 +22,12 @@ +@@ -19,27 +22,16 @@ @Override public boolean isPlayerBleeding(BridgedPlayer player) { @@ -44,3 +44,12 @@ } @Override + public boolean playerRevived(BridgedPlayer player) { +- if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive")) +- return false; +- +- IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer()); +- return bleeding != null && bleeding.revived(); ++ return false; + } + } diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch index 7de7b56..bb85fcb 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch @@ -16,7 +16,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -40,7 +40,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always { diff --git a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch index 74dc1da..1e37335 100644 --- a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch @@ -9,7 +9,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -33,7 +33,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always { diff --git a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch index 2a282ba..c1f58bb 100644 --- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch @@ -14,7 +14,7 @@ pipeline { agent { -@@ -32,15 +32,19 @@ +@@ -38,15 +38,19 @@ stage("Prepare") { steps { @@ -38,7 +38,7 @@ } } } -@@ -48,21 +52,23 @@ +@@ -54,21 +58,23 @@ post { always {