AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-26 22:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build changes for 1.19.4

Browse Source
This commit is contained in:
Telesphoreo 2023-03-15 22:08:04 -05:00
parent dcd2e77668
commit 9c6fa332cc
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -27,7 +27,7 @@ pipeline {
}
stage('publish') {
when {
branch "1.19.3"
branch "skip"
}
steps {
script {

2
README.md
View File

@ -1,4 +1,4 @@
# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.19.3/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.19.3/)
# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.19.4/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.19.4/)
Scissors is a fork of Paper that aims to fix exploits possible in Creative Mode. Many of these exploits are ones that
Paper's own team has either refused to fix or would have.

6
gradle.properties
View File

@ -1,8 +1,8 @@
group=me.totalfreedom.scissors
version=1.19.3-R0.1-SNAPSHOT
version=1.19.4-R0.1-SNAPSHOT
mcVersion=1.19.3
paperRef=155aa36d89b260ef5841615899299756b5983c0a
mcVersion=1.19.4
paperRef=4f933b24058ec502da86da7b06087cd9477b1258
org.gradle.caching=true
org.gradle.parallel=true

8
patches/server/0001-Build-changes.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a1853f3d988820f357c11371e32d50682e60401..fb72feb5878ae07c76754ab0e213f9797fcd88c2 100644
index 1919a8e9cb7c995b2a9c876ff4980bdc98977133..244ea8f19b79e7ad55a88c964bb0e9f066f9a7e7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,10 @@ plugins {
@ -15,7 +15,7 @@ index 6a1853f3d988820f357c11371e32d50682e60401..fb72feb5878ae07c76754ab0e213f979
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ implementation(project(":Scissors-API"))
+ implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
+ implementation("io.papermc.paper:paper-mojangapi:1.19.4-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api")
+ }
// Paper start
@ -51,7 +51,7 @@ index 6a1853f3d988820f357c11371e32d50682e60401..fb72feb5878ae07c76754ab0e213f979
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 710ca7d3a5659953f64bc6dccdd93b43300961cc..ad9cd0987098c8969fdf002969188458b0398924 100644
index 753a917d34a1e1c1521a8916bc8e44a6acd90a46..b289da2fc7c2053415365505f830aaa045f70ff2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -64,7 +64,7 @@ index 710ca7d3a5659953f64bc6dccdd93b43300961cc..ad9cd0987098c8969fdf002969188458
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f938095d999412d88fa3fcf76b87253034124cb9..83fa0d27e72261fe7bcec2ae58a61f431963b36e 100644
index bbb8335dae0a3e2761e6bbb8dc723bcf28cd82ba..3fa8a282e4511e79def2470f1abc34f3bf6527a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper