diff --git a/build.gradle.kts b/build.gradle.kts index 6e30284..c0cee34 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.3.9" + id("io.papermc.paperweight.patcher") version "1.3.11" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" diff --git a/gradle.properties b/gradle.properties index 48bf137..012714b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19.2-R0.1-SNAPSHOT mcVersion=1.19.2 -paperRef=e22dacf4d2d39cb9d82b127953f9ad24d3e0f695 +paperRef=f59c80269719e228ebfbae5c75e1b8e9c3bfd357 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch b/patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch index d4b663d..0a2ff43 100644 --- a/patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch +++ b/patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch @@ -5,10 +5,10 @@ Subject: [PATCH] ItemEntity - Check if items are air before calling setItem diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index fcc5444a1268931a0fd2df1e6bbbc17cfd5a61e0..f134bc67d952209fbe2c68533bf663c69b08b8e0 100644 +index c8d8fdef7b8abc0f59b7d19462825ae30c8d4f48..7126e0ccf894443f5f9c8e365dc1033daf20de57 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -@@ -388,11 +388,14 @@ public class ItemEntity extends Entity { +@@ -409,11 +409,14 @@ public class ItemEntity extends Entity { CompoundTag nbttagcompound1 = nbt.getCompound("Item"); diff --git a/patches/server/0020-Fix-negative-death-times.patch b/patches/server/0020-Fix-negative-death-times.patch index 86cc755..38bda31 100644 --- a/patches/server/0020-Fix-negative-death-times.patch +++ b/patches/server/0020-Fix-negative-death-times.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix negative death times diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..f3a2e4c356724b4d2ed0b424ae2bf63e9517cc18 100644 +index 11d7c42d65b91bf57b7bba7812aa17e60e018c67..4d179230f712fbf2a8a8af9f0b7861fe2f83cbf7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -622,7 +622,7 @@ public abstract class LivingEntity extends Entity { +@@ -623,7 +623,7 @@ public abstract class LivingEntity extends Entity { protected void tickDeath() { ++this.deathTime; diff --git a/patches/server/0026-Don-t-log-invalid-teams-to-console.patch b/patches/server/0026-Don-t-log-invalid-teams-to-console.patch index cbbd014..6fff0fc 100644 --- a/patches/server/0026-Don-t-log-invalid-teams-to-console.patch +++ b/patches/server/0026-Don-t-log-invalid-teams-to-console.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't log invalid teams to console diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f3a2e4c356724b4d2ed0b424ae2bf63e9517cc18..d82e72d14adae7f61019a895e513cb34a70730fb 100644 +index 4d179230f712fbf2a8a8af9f0b7861fe2f83cbf7..5680c69494ffadf4ba02549be7403282d7e1d174 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -836,7 +836,9 @@ public abstract class LivingEntity extends Entity { +@@ -851,7 +851,9 @@ public abstract class LivingEntity extends Entity { boolean flag = scoreboardteam != null && this.level.getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam); if (!flag) { diff --git a/patches/server/0028-Reject-oversized-components-from-updating.patch b/patches/server/0028-Reject-oversized-components-from-updating.patch index bb5cf8f..a2f883e 100644 --- a/patches/server/0028-Reject-oversized-components-from-updating.patch +++ b/patches/server/0028-Reject-oversized-components-from-updating.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 12 Jun 2022 00:33:21 -0500 +From: Telesphoreo +Date: Fri, 25 Nov 2022 22:25:24 -0600 Subject: [PATCH] Reject oversized components from updating diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java -index 9d3449dd92bbbef91b627caba752b87d8209011d..e162fb748745ec50189e426c2de5a91ce618be1b 100644 +index 10b133e95dbf2edb87764ea9d07974d8146bbed0..de1c251a0f4301beb2c6fd04dc25145c71887e27 100644 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java +++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java @@ -39,8 +39,10 @@ public class ComponentUtils { @@ -18,9 +18,9 @@ index 9d3449dd92bbbef91b627caba752b87d8209011d..e162fb748745ec50189e426c2de5a91c - return text.copy(); + result = text.copy(); } else { - MutableComponent mutableComponent = text.getContents().resolve(source, sender, depth + 1); - -@@ -48,8 +50,11 @@ public class ComponentUtils { + // Paper start + if (text instanceof io.papermc.paper.adventure.AdventureComponent adventureComponent) { +@@ -53,8 +55,11 @@ public class ComponentUtils { mutableComponent.append(updateForEntity(source, component, sender, depth + 1)); } @@ -33,14 +33,3 @@ index 9d3449dd92bbbef91b627caba752b87d8209011d..e162fb748745ec50189e426c2de5a91c } private static Style resolveStyle(@Nullable CommandSourceStack source, Style style, @Nullable Entity sender, int depth) throws CommandSyntaxException { -@@ -138,8 +143,8 @@ public class ComponentUtils { - ComponentContents string = text.getContents(); - if (string instanceof TranslatableContents) { - TranslatableContents translatableContents = (TranslatableContents)string; -- String string = translatableContents.getKey(); -- return Language.getInstance().has(string); -+ String string1 = translatableContents.getKey(); -+ return Language.getInstance().has(string1); - } - } -