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

Update Paper

Browse Source
This commit is contained in:
Telesphoreo 2022-08-22 20:44:24 -05:00
parent cbe46d2861
commit f6f17d3367
No known key found for this signature in database
GPG Key ID: B5CDDEBA526C0130
4 changed files with 8 additions and 8 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.19.2-R0.1-SNAPSHOT version=1.19.2-R0.1-SNAPSHOT
mcVersion=1.19.2 mcVersion=1.19.2
paperRef=2da891fcfacf585956781cb0f5694605d75dba60 paperRef=a76998d2354e0fb3ff91cd817c3162a2bc878ce0
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 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..72fce1854cc3cddb6deb9912ac41436e
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 dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e69333f1b0d2f69d8a13a32e96ae17cd84d0aa0e 100644 index d2161a3c3b9a2b2d463ac778656c95167c10a49d..b0d1c8784f94f996f1ea3361ffaa42bd41df6da8 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
@@ -1672,7 +1672,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1673,7 +1673,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate @DontObfuscate
public String getServerModName() { public String getServerModName() {

4
patches/server/0015-Change-version-fetcher-to-AMG.patch
View File

@ -76,10 +76,10 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..31d0624fcaf1998383eebde7fbd3a103
switch (distance) { switch (distance) {
case -1: case -1:
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c55ae77807e0ec3698f0d0443caaf18928b41017..3d624f3c980fa0f8ebcec36474768764265fa7cd 100644 index 56a784e943cb5d8b15b41e3e66545ebf166c221c..1503b897794b3cfaf22ab90423d7d4c7c789d1c6 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -270,7 +270,7 @@ public class Main { @@ -276,7 +276,7 @@ public class Main {
if (buildDate.before(deadline.getTime())) { if (buildDate.before(deadline.getTime())) {
// Paper start - This is some stupid bullshit // Paper start - This is some stupid bullshit
System.err.println("*** Warning, you've not updated in a while! ***"); System.err.println("*** Warning, you've not updated in a while! ***");

6
patches/server/0035-Add-Scissors-configuration-file-command.patch
View File

@ -421,7 +421,7 @@ index bdd6560fe85950b0a857a949cb38c044da44ca6b..c4894b7022ee5e63135c9463c8faf61e
this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd); this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a8739a0f5bab478ce293af55df3192e10d5ac435..c5cd3e3b1a280f63e1be8a9e612ead29f0dcf15a 100644 index bf349ab7249c617172522aeaa5d437a496e9acfe..30b3755955a6ee1b6e8f150918ebd8348e1000dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -960,6 +960,8 @@ public final class CraftServer implements Server { @@ -960,6 +960,8 @@ public final class CraftServer implements Server {
@ -455,10 +455,10 @@ index a8739a0f5bab478ce293af55df3192e10d5ac435..c5cd3e3b1a280f63e1be8a9e612ead29
public void restart() { public void restart() {
org.spigotmc.RestartCommand.restart(); org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 20dc2c62356c84037da13e80068362fae792660b..5a6d7c537586b8e87f6ec23526490f3edc4424fb 100644 index 1503b897794b3cfaf22ab90423d7d4c7c789d1c6..1da8e9570b7f52609cd25b6b6dab8748afc3e457 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -165,6 +165,22 @@ public class Main { @@ -171,6 +171,22 @@ public class Main {
.defaultsTo("Unknown Server") .defaultsTo("Unknown Server")
.describedAs("Name"); .describedAs("Name");
// Paper end // Paper end