chipmunkmc/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-14 19:34:54 -05:00
Code Issues 10 Projects Releases Packages Wiki Activity

Update Paper

Browse source
This commit is contained in:
Telesphoreo 2022-06-04 23:13:08 -05:00
parent 59d76f7bea
commit 3c39f1892b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
version=1.18.2-R0.1-SNAPSHOT
mcVersion=1.18.2
paperRef=bed5cb2b81033f30be5a3edace00534a13ad2631
paperRef=071a4a2444477433765cf31783eb222f8c9ec939
org.gradle.caching=true
org.gradle.parallel=true

6
patches/server/0001-Build-changes.patch
View file

@ -49,10 +49,10 @@ index 0282e3b75470e1a68ea1fc228082483514ba432e..9e78384fdd5727143d3be5f189478ed7
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 c8d56947305c981a3268ce4ae3e975db350ceff2..f0ed55e2d9e1c1e3ba27bf675490c57d961ff7f5 100644
index da15a224b8b974e78b9d8d5f514229b3b2a5a63e..8ca2e2e3d2564ec0cc081ff52334484dd5561e5c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1696,7 +1696,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@ -62,7 +62,7 @@ index c8d56947305c981a3268ce4ae3e975db350ceff2..f0ed55e2d9e1c1e3ba27bf675490c57d
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 ab843069ac0653d03cf3f925f49555016cad84fa..8e2902c9fc7d2f81a23fe0791da967f68a6194a5 100644
index 8a248e34fce1e04de4460f98b7627df495c66af1..ebd5aeceb4ac1a6300bbfa70218421f0d91b7614 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper