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

Update Paper

Browse Source
This commit is contained in:
Telesphoreo 2023-03-19 16:09:47 -05:00
parent 70b8aecf57
commit c4a62cdd67
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -48,7 +48,7 @@ pipeline {
} }
post { post {
always { always {
// archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true
junit 'Scissors-Server/build/test-results/test/*.xml' junit 'Scissors-Server/build/test-results/test/*.xml'
junit 'Scissors-API/build/test-results/test/*.xml' junit 'Scissors-API/build/test-results/test/*.xml'
cleanWs() cleanWs()

2
gradle.properties
View File

@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
version=1.19.4-R0.1-SNAPSHOT version=1.19.4-R0.1-SNAPSHOT
mcVersion=1.19.4 mcVersion=1.19.4
paperRef=4f933b24058ec502da86da7b06087cd9477b1258 paperRef=83948f6f5901edf27e83d8aa5bdca10f1eff63d8
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

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

@ -51,10 +51,10 @@ index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..e92a7dd91f4b4771d8087a5fbeed2259
standardInput = System.`in` standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory workingDir = rootProject.layout.projectDirectory
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 081871412e92ce909ad9c51a8d18ede53596c049..f26e4dbdc4cbe7b732d890335759fe3cd5d5aab1 100644 index 4450d825a5474da211f0e83f845d8c7129fa08aa..c5cf50f8eb039e7e5f3b5a991d715e5f145d739d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1680,7 +1680,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate @DontObfuscate
public String getServerModName() { public String getServerModName() {

4
patches/server/0023-Reset-large-tags.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Reset large tags
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 75ee1abaadabbe8add0972c48780f5e7b85df069..437f0e2fe381cf0b82c2f7e6fdd13eb91ebab1db 100644 index a6253272205337b3b855679b3057c2519a807a4c..86c809041ce31d5d2bc789be848ec0f1ef12b564 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java --- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -20,6 +20,7 @@ import java.util.function.Predicate; @@ -20,6 +20,7 @@ import java.util.function.Predicate;
@ -42,7 +42,7 @@ index 75ee1abaadabbe8add0972c48780f5e7b85df069..437f0e2fe381cf0b82c2f7e6fdd13eb9
} }
return nbt; return nbt;
@@ -860,6 +871,9 @@ public final class ItemStack { @@ -866,6 +877,9 @@ public final class ItemStack {
// Paper end // Paper end
public void setTag(@Nullable CompoundTag nbt) { public void setTag(@Nullable CompoundTag nbt) {