From 1376571cbdadfc76f73e452b1a81af8723539506 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 28 Jun 2023 14:12:00 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 4 ++-- .../server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index dbf3776..0289eb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=b1696788d61ddc338bd2e61fac3b43ff60c432e1 +paperRef=2c9c5e466293280fddb49d295ed212b051987dc3 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 6943f2b..9bfa83e 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -91,10 +91,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..2fbb5fc19e6d7f3767c7c6eedcbc6af2 .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 912affb0ab1c4c40f7a655194e95ec6f0ebf1fcd..bd128d228b9ae01e021d54befc6155102d5ffb84 100644 +index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..dd4dc6b29e37a4db459779fa8d4adc231e44d144 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1691,7 +1691,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { +@@ -372,7 +372,7 @@ public final class EntityLookup implements LevelEntityGetter { return false; } if (this.entityByUUID.containsKey(entity.getUUID())) {