diff --git a/patches/server/0037-Add-Scissors-configuration-file-command.patch b/patches/server/0037-Add-Scissors-configuration-file-command.patch index e11be29..9a1b9cd 100644 --- a/patches/server/0037-Add-Scissors-configuration-file-command.patch +++ b/patches/server/0037-Add-Scissors-configuration-file-command.patch @@ -27,7 +27,7 @@ index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..f83b2c4298bd1a5f65487f64bd6a11fb new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/me/totalfreedom/scissors/PositionUtility.java b/src/main/java/me/totalfreedom/scissors/PositionUtility.java -index 9e33ad84e50c7e2491aa883f905323f3ad2b070c..b085035794c91074205cb6994c73343283d274d5 100644 +index c54535042a7ac12fe46b3b37db8d7b116e9469d5..62bb706e6a11749f588b3f0c3ffb1fbd70f15d64 100644 --- a/src/main/java/me/totalfreedom/scissors/PositionUtility.java +++ b/src/main/java/me/totalfreedom/scissors/PositionUtility.java @@ -8,7 +8,7 @@ import net.minecraft.world.phys.Vec3; @@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..797677d892d83cf54d9a60af1e277b67 +} diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..9f2a51fddb692f5152c32dcbe1f5a6ba150634e4 +index 0000000000000000000000000000000000000000..8ac0e938ccc83c2e71da419b33556090d5083d9e --- /dev/null +++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java @@ -0,0 +1,213 @@ @@ -248,7 +248,7 @@ index 0000000000000000000000000000000000000000..9f2a51fddb692f5152c32dcbe1f5a6ba + + Discord: https://discord.com/invite/mtVQcHn58h + Website: https://scissors.gg/\s -+ Docs: https://scissors.gg/javadoc/1.19.4/\s ++ Docs: https://javadoc.scissors.gg/1.20/\s + """; + private static final Pattern SPACE = Pattern.compile(" "); + private static final Pattern NOT_NUMERIC = Pattern.compile("[^-\\d.]"); @@ -465,7 +465,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..d450cf3cf8ab5cbb5d32a28ee2e4a671 if (optionset.has("initSettings")) { // CraftBukkit diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 7f0b8cdae07e7e4745a099242a4f0c5914be8667..ac218f02b4799dd4117b0de663e9a073d76be05b 100644 +index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..bbfb536ddec7f44d2a75d35ab495be26104678a1 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -222,6 +222,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -486,7 +486,7 @@ index 7f0b8cdae07e7e4745a099242a4f0c5914be8667..ac218f02b4799dd4117b0de663e9a073 this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setMotd(dedicatedserverproperties.motd); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 01f88bf2f4872884a9c4c2d1d5f1369c61fb0ebf..a2b96f7b1e98586017dbbf28a73446196738ee99 100644 +index 4946d476a26e1441cea5904cde7c433da4e60717..182291e66717b7e42a500856e99b599daeeae926 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,5 +1,6 @@ @@ -608,7 +608,7 @@ index 31911c09fe15753ae32fa39417bdc9e9de552a88..97ce45c6e44b1400b8d60b5239761703 @Override public boolean isFoil(ItemStack stack) { diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 80695b2698d2904cec2c54ebe0ef880d95ed9583..9facb07939972ee40875b9a30dde11ba40002778 100644 +index ba6f0ba00cd2635bcd19889dca0349b363b079fe..59fe6f9aba094f8e5393de44d8977e5e48ed76d8 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -8,8 +8,11 @@ import java.util.Objects; @@ -670,7 +670,7 @@ index 80695b2698d2904cec2c54ebe0ef880d95ed9583..9facb07939972ee40875b9a30dde11ba } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 777b727a360683a72cef8c06ab7ab1439d69ac0a..852831cfbcfe969f3cb6080ff923a04b1467e1b4 100644 +index 717bd02837ac33180ceca92e2f45a8c2e6ad4694..1d904254eaa1be68ca51a2f43c5058ad48a6c05c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -978,6 +978,7 @@ public final class CraftServer implements Server {