From 95d23dbac5f5ddc9f5107fa73887ee7000a382f1 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 27 Jul 2022 22:11:41 -0500 Subject: [PATCH] So true --- gradle.properties | 6 +- patches/server/0001-Build-changes.patch | 12 +- ...-a-show_entity-hover-event-s-UUID-is.patch | 42 -- ...otTables-causing-problems-when-appli.patch | 46 -- ...aused-by-invalid-entities-in-beehive.patch | 32 -- ...5-Fixes-the-Blank-SkullOwner-exploit.patch | 31 -- ...-air-bundle-items-in-CraftMetaBundle.patch | 23 - ...Removes-useless-spammy-error-logging.patch | 20 - ...rown-when-trying-to-remove-minecart-.patch | 25 - ...-if-items-are-air-before-calling-set.patch | 26 - ...Books-causing-log-spam-when-invalid-.patch | 50 -- ...ate-BlockState-and-SoundEvent-values.patch | 32 -- ...ceLocation-validation-and-log-spam-f.patch | 86 ---- ...id-items-in-HoverEvent-and-ItemFrame.patch | 41 -- ...en-more-resource-location-validation.patch | 54 -- .../0015-Change-version-fetcher-to-AMG.patch | 90 ---- ...es-with-invalid-namespaces-from-bein.patch | 28 - ...UUIDs-during-the-CompoundTag-GamePro.patch | 25 - ...ery-player-data-in-the-nbt-component.patch | 27 - ...0019-Limit-ListTags-to-1024-elements.patch | 18 - ...illing-potion-effects-and-certain-po.patch | 53 -- .../0021-Fix-negative-death-times.patch | 19 - ...-Add-custom-classes-used-by-Scissors.patch | 210 -------- ...ates-before-attempting-to-get-block-.patch | 60 --- patches/server/0024-Reset-large-tags.patch | 54 -- ...-Account-for-items-inside-containers.patch | 260 ---------- ...vehicle-collision-checks-to-3-and-di.patch | 109 ---- ...7-Don-t-log-invalid-teams-to-console.patch | 21 - ...-handling-of-invalid-JSON-components.patch | 194 ------- ...t-oversized-components-from-updating.patch | 46 -- .../0030-Block-server-side-chunkbans.patch | 193 ------- .../0031-Add-MasterBlockFireEvent.patch | 176 ------- .../0032-Add-spectator-teleport-event.patch | 32 -- ...033-Prevent-invalid-container-events.patch | 46 -- ...not-attempt-to-cast-items-to-recipes.patch | 24 - ...-Scissors-configuration-file-command.patch | 483 ------------------ ...running-commands-in-books-by-default.patch | 82 --- ...ate-block-entity-tag-query-positions.patch | 19 - ...vents-on-Signs-bypassing-permissions.patch | 93 ---- 39 files changed, 9 insertions(+), 2879 deletions(-) delete mode 100644 patches/server/0002-Return-null-when-a-show_entity-hover-event-s-UUID-is.patch delete mode 100644 patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch delete mode 100644 patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch delete mode 100644 patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch delete mode 100644 patches/server/0006-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch delete mode 100644 patches/server/0007-Removes-useless-spammy-error-logging.patch delete mode 100644 patches/server/0008-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch delete mode 100644 patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch delete mode 100644 patches/server/0010-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch delete mode 100644 patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch delete mode 100644 patches/server/0012-Even-more-ResourceLocation-validation-and-log-spam-f.patch delete mode 100644 patches/server/0013-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch delete mode 100644 patches/server/0014-Even-more-resource-location-validation.patch delete mode 100644 patches/server/0015-Change-version-fetcher-to-AMG.patch delete mode 100644 patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch delete mode 100644 patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch delete mode 100644 patches/server/0018-Don-t-query-player-data-in-the-nbt-component.patch delete mode 100644 patches/server/0019-Limit-ListTags-to-1024-elements.patch delete mode 100644 patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch delete mode 100644 patches/server/0021-Fix-negative-death-times.patch delete mode 100644 patches/server/0022-Add-custom-classes-used-by-Scissors.patch delete mode 100644 patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch delete mode 100644 patches/server/0024-Reset-large-tags.patch delete mode 100644 patches/server/0025-Account-for-items-inside-containers.patch delete mode 100644 patches/server/0026-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch delete mode 100644 patches/server/0027-Don-t-log-invalid-teams-to-console.patch delete mode 100644 patches/server/0028-Better-handling-of-invalid-JSON-components.patch delete mode 100644 patches/server/0029-Reject-oversized-components-from-updating.patch delete mode 100644 patches/server/0030-Block-server-side-chunkbans.patch delete mode 100644 patches/server/0031-Add-MasterBlockFireEvent.patch delete mode 100644 patches/server/0032-Add-spectator-teleport-event.patch delete mode 100644 patches/server/0033-Prevent-invalid-container-events.patch delete mode 100644 patches/server/0034-Do-not-attempt-to-cast-items-to-recipes.patch delete mode 100644 patches/server/0035-Add-Scissors-configuration-file-command.patch delete mode 100644 patches/server/0036-Disable-running-commands-in-books-by-default.patch delete mode 100644 patches/server/0037-Validate-block-entity-tag-query-positions.patch delete mode 100644 patches/server/0038-Fix-ClickEvents-on-Signs-bypassing-permissions.patch diff --git a/gradle.properties b/gradle.properties index 52cedca..720b58d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=me.totalfreedom.scissors -version=1.19-R0.1-SNAPSHOT +version=1.19.1-R0.1-SNAPSHOT -mcVersion=1.19 -paperRef=86f87ba40030d719e5fb8840ab18c513588de772 +mcVersion=1.19.1 +paperRef=4a4ee79cd6a70811e9d62c58abc5f3b6a8627f5c 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 0947bdf..4fdc53c 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Telesphoreo -Date: Fri, 10 Jun 2022 22:10:10 -0500 +Date: Wed, 27 Jul 2022 22:09:00 -0500 Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..fc08b27f5c8a8e2ec96cb8b28e5e2c7981293332 100644 +index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..ba15c2caa525bb56397be65e4393c9135b9caf6f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,8 @@ plugins { @@ -15,7 +15,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..fc08b27f5c8a8e2ec96cb8b28e5e2c79 - implementation(project(":paper-api")) - implementation(project(":paper-mojangapi")) + implementation(project(":Scissors-API")) -+ implementation("io.papermc.paper:paper-mojangapi:1.19-R0.1-SNAPSHOT") ++ implementation("io.papermc.paper:paper-mojangapi:1.19.1-R0.1-SNAPSHOT") // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") @@ -49,7 +49,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..fc08b27f5c8a8e2ec96cb8b28e5e2c79 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 35a5cc8ed861401d3dd28b08ebc5d40aad82b0df..7e6be11d7ec1f3d52dcc632dc8c16ee023682278 100644 +index 46fcecbfb3f866ba89036a11113c8ad0989b04bc..0c6c6f611c3376b938baa22c196c5b44cdeb1b21 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Paper private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/patches/server/0002-Return-null-when-a-show_entity-hover-event-s-UUID-is.patch b/patches/server/0002-Return-null-when-a-show_entity-hover-event-s-UUID-is.patch deleted file mode 100644 index fa3c9fc..0000000 --- a/patches/server/0002-Return-null-when-a-show_entity-hover-event-s-UUID-is.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sat, 12 Mar 2022 19:34:59 -0700 -Subject: [PATCH] Return null when a show_entity hover event's UUID isn't valid - - -diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java -index 587db9a70f8f930412d34c4a412c19a30faa2a4e..b50cd7a39c077dcbabdfea1b9290bf5b144d4384 100644 ---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java -+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java -@@ -174,7 +174,14 @@ public class HoverEvent { - } else { - JsonObject jsonObject = json.getAsJsonObject(); - EntityType entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type"))); -- UUID uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id")); -+ // Scissors start -+ UUID uUID; -+ try { -+ uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id")); -+ } catch (Exception ex) { -+ return null; -+ } -+ // Scissors end - Component component = Component.Serializer.fromJson(jsonObject.get("name")); - return new HoverEvent.EntityTooltipInfo(entityType, uUID, component); - } -@@ -186,7 +193,14 @@ public class HoverEvent { - CompoundTag compoundTag = TagParser.parseTag(text.getString()); - Component component = Component.Serializer.fromJson(compoundTag.getString("name")); - EntityType entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type"))); -- UUID uUID = UUID.fromString(compoundTag.getString("id")); -+ // Scissors start -+ UUID uUID; -+ try { -+ uUID = UUID.fromString(compoundTag.getString("id")); -+ } catch (Exception ex) { -+ return null; -+ } -+ // Scissors end - return new HoverEvent.EntityTooltipInfo(entityType, uUID, component); - } catch (Exception var5) { - return null; diff --git a/patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch b/patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch deleted file mode 100644 index 4c782d6..0000000 --- a/patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Fri, 10 Jun 2022 22:55:01 -0500 -Subject: [PATCH] Fixes invalid LootTables causing problems when applied to - Minecart entities - - -diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java -index d4a8c1bbb8fef27ac42bdf27dde495b4c649e6cb..865c61accf211d28be3c82dcf158fec9778b50c1 100644 ---- a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java -+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java -@@ -17,7 +17,7 @@ public class PaperContainerEntityLootableInventory implements PaperLootableEntit - - @Override - public org.bukkit.loot.LootTable getLootTable() { -- return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null; -+ return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() && entity.getLootTable().toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null; // Scissors - Validate length of loot tables before even trying - } - - @Override -diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java -index 94dc68182ec5f6dc1294ad15523427836228086a..07075cea760562c901d4469a7f88271c3ffa30bb 100644 ---- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java -+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java -@@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven - - @Override - public org.bukkit.loot.LootTable getLootTable() { -- return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null; -+ return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() && tileEntityLootable.lootTable.toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null; // Scissors - Validate length of loot tables before even trying - } - - @Override -diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -index d559f93a9a09bac414dd5d58afccad42c127f09b..8ac4e76bf9acf2f99539c4f874ac5c8605573604 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -@@ -45,7 +45,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc - protected boolean tryLoadLootTable(CompoundTag nbt) { - this.lootableData.loadNbt(nbt); // Paper - if (nbt.contains("LootTable", 8)) { -- this.lootTable = new ResourceLocation(nbt.getString("LootTable")); -+ this.lootTable = ResourceLocation.tryParse(nbt.getString("LootTable")); // Scissors - Validate loot tables - try { org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(this.lootTable); } catch (IllegalArgumentException ex) { this.lootTable = null; } // Paper - validate - this.lootTableSeed = nbt.getLong("LootTableSeed"); - return false; // Paper - always load the items, table may still remain diff --git a/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch b/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch deleted file mode 100644 index f93c0da..0000000 --- a/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 13 Mar 2022 06:10:22 -0600 -Subject: [PATCH] Fixes log spam caused by invalid entities in beehives - - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -index 41c9f074203915c31c1ae7a160ce509c13383f84..79a7fff759f062b783a540079cb43f2942799715 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -@@ -11,6 +11,7 @@ import net.minecraft.nbt.CompoundTag; - import net.minecraft.nbt.ListTag; - import net.minecraft.nbt.NbtUtils; - import net.minecraft.network.protocol.game.DebugPackets; -+import net.minecraft.resources.ResourceLocation; - import net.minecraft.sounds.SoundEvents; - import net.minecraft.sounds.SoundSource; - import net.minecraft.tags.BlockTags; -@@ -370,6 +371,13 @@ public class BeehiveBlockEntity extends BlockEntity { - - for (int i = 0; i < nbttaglist.size(); ++i) { - CompoundTag nbttagcompound1 = nbttaglist.getCompound(i); -+ -+ // Scissors start - Do not allow invalid entities from being used for bees -+ if (!nbttagcompound1.contains("id") || !ResourceLocation.isValidResourceLocation(nbttagcompound1.getString("id")) || EntityType.byString(nbttagcompound1.getString("id")).isEmpty()) { -+ continue; -+ } -+ // Scissor end -+ - BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData"), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks")); - - this.stored.add(tileentitybeehive_hivebee); diff --git a/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch b/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch deleted file mode 100644 index 5e28c6d..0000000 --- a/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Fri, 22 Apr 2022 00:59:00 -0500 -Subject: [PATCH] Fixes the Blank SkullOwner exploit - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 292ae4a68093b7d939a755e1062cee57da186ab1..4ae030580131252b849fd356717d0323c29cf773 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -7,6 +7,9 @@ import java.util.UUID; - import net.minecraft.nbt.CompoundTag; - import net.minecraft.nbt.NbtUtils; - import net.minecraft.world.level.block.entity.SkullBlockEntity; -+// Scissors start -+import org.apache.commons.lang3.StringUtils; -+// Scissors end - import org.bukkit.Bukkit; - import org.bukkit.Material; - import org.bukkit.OfflinePlayer; -@@ -45,7 +48,9 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { - - if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) { - this.setProfile(NbtUtils.readGameProfile(tag.getCompound(SKULL_OWNER.NBT))); -- } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !tag.getString(SKULL_OWNER.NBT).isEmpty()) { -+ // Scissors start -+ } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !StringUtils.isBlank(tag.getString(SKULL_OWNER.NBT))) { -+ // Scissors end - this.setProfile(new GameProfile(null, tag.getString(SKULL_OWNER.NBT))); - } - } diff --git a/patches/server/0006-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch b/patches/server/0006-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch deleted file mode 100644 index 5184fc3..0000000 --- a/patches/server/0006-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Luna -Date: Sun, 13 Mar 2022 11:07:34 -0300 -Subject: [PATCH] Ignore null/air bundle items in CraftMetaBundle - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java -index 8fd1e392258eba9dbe2194c024ad7e0ca3e43cf8..28be42594857f2d8320a035c1f8b95cdc300ddd5 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java -@@ -49,7 +49,11 @@ public class CraftMetaBundle extends CraftMetaItem implements BundleMeta { - for (int i = 0; i < list.size(); i++) { - CompoundTag nbttagcompound1 = list.getCompound(i); - -- this.addItem(CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of(nbttagcompound1))); -+ // Scissors start -+ CraftItemStack item = CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of(nbttagcompound1)); -+ if(item == null || item.getType().isAir()) continue; -+ this.addItem(item); -+ // Scissors end - } - } - } diff --git a/patches/server/0007-Removes-useless-spammy-error-logging.patch b/patches/server/0007-Removes-useless-spammy-error-logging.patch deleted file mode 100644 index 6c64f0b..0000000 --- a/patches/server/0007-Removes-useless-spammy-error-logging.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Fri, 10 Jun 2022 23:26:03 -0500 -Subject: [PATCH] Removes useless spammy error logging - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 3c4dadd0012c11191c873fe25a7625193563915d..d8eb84f28761dce95330afc32e4c011a4ab89b18 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1792,8 +1792,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { - resource = CraftNamespacedKey.fromMinecraft(key); - } - } catch (IllegalArgumentException ex) { -- org.bukkit.Bukkit.getLogger().warning("Namespaced resource does not validate: " + key.toString()); -- ex.printStackTrace(); -+ // Scissors - Don't log errors thrown by invalid namespaces when an error is thrown - } - - return resource; diff --git a/patches/server/0008-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch b/patches/server/0008-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch deleted file mode 100644 index 7d66c7e..0000000 --- a/patches/server/0008-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 13 Mar 2022 08:14:44 -0600 -Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities - with content in them - - -diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java -index b8fb7b5a347298ada16bc8b818edf1863e3f6040..7ec912bfec20d6b5d91f23341c4e9e3188d1236b 100644 ---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java -+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java -@@ -139,7 +139,12 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme - @Override - public void remove(Entity.RemovalReason reason) { - if (!this.level.isClientSide && reason.shouldDestroy()) { -- Containers.dropContents(this.level, (Entity) this, (Container) this); -+ // Scissors start - Ignore errors thrown when trying to remove minecart entities with content in them -+ try { -+ Containers.dropContents(this.level, (Entity) this, (Container) this); -+ } catch (Exception ignored) { -+ } -+ // Scissors end - } - - super.remove(reason); diff --git a/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch b/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch deleted file mode 100644 index 653337f..0000000 --- a/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Luna -Date: Sun, 13 Mar 2022 14:38:38 -0300 -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 c58c296bbb0fbd1930dba38bcab7ec3103917ba5..3c9df100ce8656d93deb3a6a2bb06abc9b30916b 100644 ---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -@@ -390,11 +390,14 @@ public class ItemEntity extends Entity { - - CompoundTag nbttagcompound1 = nbt.getCompound("Item"); - -- this.setItem(ItemStack.of(nbttagcompound1)); -+ // Scissors start - if (this.getItem().isEmpty()) { - this.discard(); -+ return; - } - -+ this.setItem(ItemStack.of(nbttagcompound1)); -+ // Scissors end - } - - @Override diff --git a/patches/server/0010-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch b/patches/server/0010-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch deleted file mode 100644 index 626498f..0000000 --- a/patches/server/0010-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 13 Mar 2022 18:42:07 -0600 -Subject: [PATCH] Fixes Knowledge Books causing log spam when invalid data is - provided - - -diff --git a/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java b/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java -index b79f4ce38a42e4dba8ebdfc97dadc531b7245c7a..9c49be7c53a1f2a8c203341b8ded9cd222d0c178 100644 ---- a/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java -+++ b/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java -@@ -40,9 +40,9 @@ public class KnowledgeBookItem extends Item { - - for(int i = 0; i < listTag.size(); ++i) { - String string = listTag.getString(i); -- Optional> optional = recipeManager.byKey(new ResourceLocation(string)); -+ Optional> optional = recipeManager.byKey(ResourceLocation.tryParse(string)); // Scissors - Validate resource locations - if (!optional.isPresent()) { -- LOGGER.error("Invalid recipe: {}", (Object)string); -+ // Scissors - Don't log errors caused by invalid recipes being provided - return InteractionResultHolder.fail(itemStack); - } - -@@ -55,7 +55,7 @@ public class KnowledgeBookItem extends Item { - - return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide()); - } else { -- LOGGER.error("Tag not valid: {}", (Object)compoundTag); -+ // Scissors - Don't throw errors into the logs if an NBT compound isn't present or is missing the Recipes tag. - return InteractionResultHolder.fail(itemStack); - } - } -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java -index e816e505cd292d6c5138dff0aeae0e9592c09de0..0f6438dfe0a6620eb87233b9eefbe2340dfc347b 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java -@@ -42,7 +42,12 @@ public class CraftMetaKnowledgeBook extends CraftMetaItem implements KnowledgeBo - for (int i = 0; i < pages.size(); i++) { - String recipe = pages.getString(i); - -- this.addRecipe(CraftNamespacedKey.fromString(recipe)); -+ // Scissors start - Don't add recipes with invalid namespaces -+ try { -+ this.addRecipe(CraftNamespacedKey.fromString(recipe)); -+ } catch (Exception ignored) { -+ } -+ // Scissors end - } - } - } diff --git a/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch b/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch deleted file mode 100644 index c4f3a9b..0000000 --- a/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 13 Mar 2022 21:56:29 -0600 -Subject: [PATCH] Validate BlockState and SoundEvent values - - -diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index 5dda064813a0eb00438a7df909d51a4b2d48942e..29b8519a1dd954f004bf04145e7246e3d2592b77 100644 ---- a/src/main/java/net/minecraft/nbt/NbtUtils.java -+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java -@@ -229,7 +229,7 @@ public final class NbtUtils { - if (!nbt.contains("Name", 8)) { - return Blocks.AIR.defaultBlockState(); - } else { -- Block block = Registry.BLOCK.get(new ResourceLocation(nbt.getString("Name"))); -+ Block block = Registry.BLOCK.get(ResourceLocation.tryParse(nbt.getString("Name"))); // Scissors - Validate BlockState - BlockState blockState = block.defaultBlockState(); - if (nbt.contains("Properties", 10)) { - CompoundTag compoundTag = nbt.getCompound("Properties"); -diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index bc01e5014e1355a225bdf5c47f2965290b45e2d2..8eba392e567afb069ae11b8e94ff72f0aa148ee9 100644 ---- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -551,7 +551,7 @@ public abstract class AbstractArrow extends Projectile { - this.setCritArrow(nbt.getBoolean("crit")); - this.setPierceLevel(nbt.getByte("PierceLevel")); - if (nbt.contains("SoundEvent", 8)) { -- this.soundEvent = (SoundEvent) Registry.SOUND_EVENT.getOptional(new ResourceLocation(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent()); -+ this.soundEvent = (SoundEvent) Registry.SOUND_EVENT.getOptional(ResourceLocation.tryParse(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent()); // Scissors - Validate SoundEvents before trying to play them - } - - this.setShotFromCrossbow(nbt.getBoolean("ShotFromCrossbow")); diff --git a/patches/server/0012-Even-more-ResourceLocation-validation-and-log-spam-f.patch b/patches/server/0012-Even-more-ResourceLocation-validation-and-log-spam-f.patch deleted file mode 100644 index 002c0c9..0000000 --- a/patches/server/0012-Even-more-ResourceLocation-validation-and-log-spam-f.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Mon, 9 May 2022 23:40:59 -0500 -Subject: [PATCH] Even more ResourceLocation validation and log spam fixes - - -diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -index 7e1885d9cc568a544e934cede32bff05c20b567a..2481c50d8eb58a003e30e2d957b877bce5123a3a 100644 ---- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -+++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -@@ -420,7 +420,7 @@ public class AreaEffectCloud extends Entity { - try { - this.setParticle(ParticleArgument.readParticle(new StringReader(nbt.getString("Particle")))); - } catch (CommandSyntaxException commandsyntaxexception) { -- AreaEffectCloud.LOGGER.warn("Couldn't load custom particle {}", nbt.getString("Particle"), commandsyntaxexception); -+ // Scissors - Don't log custom particle errors - } - } - -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -index e49eece9bff3a53469673d03a7bbf8f9cf8776b8..a49f32e9649155b6af4b1f236e4e8142d730e7e8 100644 ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -@@ -30,8 +30,14 @@ public abstract class CraftLootable - return null; - } - -- ResourceLocation key = getSnapshot().lootTable; -- return Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(key)); -+ // Scissors start - Return a null loot table if the specified loot table is not valid -+ try { -+ ResourceLocation key = getSnapshot().lootTable; -+ return Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(key)); -+ } catch (Exception ex) { -+ return null; -+ } -+ // Scissors end - } - - @Override -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java -index 0dd0ce9a9b3253e87eda12354249ec2fd2a33cf2..b6920f9432ca1736afbe775186fbbcf11cf046fb 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java -@@ -33,8 +33,14 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo - return null; // return empty loot table? - } - -- NamespacedKey key = CraftNamespacedKey.fromMinecraft(nmsTable); -- return Bukkit.getLootTable(key); -+ // Scissors start - Return a null loot table if the specified loot table is not valid -+ try { -+ NamespacedKey key = CraftNamespacedKey.fromMinecraft(nmsTable); -+ return Bukkit.getLootTable(key); -+ } catch (Exception ex) { -+ return null; -+ } -+ // Scissors end - } - - @Override -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index d775e19402188e35f79affb4ed636b6533f90ab5..29f5ab80ffbc421da911046678427755c6156894 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -@@ -63,8 +63,18 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { - - @Override - public LootTable getLootTable() { -- NamespacedKey key = CraftNamespacedKey.fromMinecraft(this.getHandle().getLootTable()); -- return Bukkit.getLootTable(key); -+ if (this.getHandle().lootTable == null) { -+ this.getHandle().lootTable = this.getHandle().getDefaultLootTable(); -+ } -+ -+ // Scissors start - Return a null loot table if the specified loot table is not valid -+ try { -+ NamespacedKey key = CraftNamespacedKey.fromMinecraft(this.getHandle().getLootTable()); -+ return Bukkit.getLootTable(key); -+ } catch (Exception ex) { -+ return null; -+ } -+ // Scissors end - } - - @Override diff --git a/patches/server/0013-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch b/patches/server/0013-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch deleted file mode 100644 index a6ab198..0000000 --- a/patches/server/0013-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Luna -Date: Sun, 20 Mar 2022 09:31:16 -0300 -Subject: [PATCH] Do not log invalid items in HoverEvent and ItemFrame - - -diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java -index b50cd7a39c077dcbabdfea1b9290bf5b144d4384..d38562b518b28ba4617d39e4587c7fa72859ab11 100644 ---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java -+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java -@@ -314,7 +314,7 @@ public class HoverEvent { - CompoundTag compoundTag = TagParser.parseTag(string); - return new HoverEvent.ItemStackInfo(item, i, compoundTag); - } catch (CommandSyntaxException var6) { -- HoverEvent.LOGGER.warn("Failed to parse tag: {}", string, var6); -+ // Scissors - Ignore invalid items - } - } - -@@ -328,7 +328,7 @@ public class HoverEvent { - CompoundTag compoundTag = TagParser.parseTag(text.getString()); - return new HoverEvent.ItemStackInfo(ItemStack.of(compoundTag)); - } catch (CommandSyntaxException var2) { -- HoverEvent.LOGGER.warn("Failed to parse item tag: {}", text, var2); -+ // Scissors - Ignore invalid items - return null; - } - } -diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index d2a77b4ca343d19e1c70afe3f3906a9bd53d0eec..93de0f1376604ad3f2c519c04f12269484dabfe9 100644 ---- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -@@ -420,7 +420,7 @@ public class ItemFrame extends HangingEntity { - ItemStack itemstack = ItemStack.of(nbttagcompound1); - - if (itemstack.isEmpty()) { -- ItemFrame.LOGGER.warn("Unable to load item from: {}", nbttagcompound1); -+ // Scissors - ignore invalid items - } - - ItemStack itemstack1 = this.getItem(); diff --git a/patches/server/0014-Even-more-resource-location-validation.patch b/patches/server/0014-Even-more-resource-location-validation.patch deleted file mode 100644 index 077bc41..0000000 --- a/patches/server/0014-Even-more-resource-location-validation.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Fri, 22 Apr 2022 01:19:49 -0500 -Subject: [PATCH] Even more resource location validation - - -diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -index 2481c50d8eb58a003e30e2d957b877bce5123a3a..6b284666eae8b7e0ef8f54dfe9311a0979b420fe 100644 ---- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -+++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -@@ -143,7 +143,7 @@ public class AreaEffectCloud extends Entity { - } - - public void setPotionType(String string) { -- this.setPotion(Registry.POTION.get(new ResourceLocation(string))); -+ this.setPotion(Registry.POTION.get(ResourceLocation.tryParse(string))); // Scissors - Validate resource locations - } - // CraftBukkit end - -diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index ac0f0a4da4282c13f6e1f37710cb615d66b8ef2c..e789bcb0c426651a48fb3c78e885c6e3fafb0416 100644 ---- a/src/main/java/net/minecraft/world/entity/EntityType.java -+++ b/src/main/java/net/minecraft/world/entity/EntityType.java -@@ -518,7 +518,7 @@ public class EntityType implements EntityTypeTest { - }), (entity) -> { - entity.load(nbt); - }, () -> { -- EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id")); -+ // Scissors - Don't log invalid entities - }); - } - -@@ -537,7 +537,7 @@ public class EntityType implements EntityTypeTest { - } - - public static Optional> by(CompoundTag nbt) { -- return Registry.ENTITY_TYPE.getOptional(new ResourceLocation(nbt.getString("id"))); -+ return Registry.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(nbt.getString("id"))); // Scissors - Validate resource locations - } - - @Nullable -diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 3646b969fa51b9683ab4137e530c3a6f6fc6c465..286e9a8d3673be3a7fef2af6402e025d3058f6e7 100644 ---- a/src/main/java/net/minecraft/world/entity/Mob.java -+++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -579,7 +579,7 @@ public abstract class Mob extends LivingEntity { - - this.setLeftHanded(nbt.getBoolean("LeftHanded")); - if (nbt.contains("DeathLootTable", 8)) { -- this.lootTable = new ResourceLocation(nbt.getString("DeathLootTable")); -+ this.lootTable = ResourceLocation.tryParse(nbt.getString("DeathLootTable")); // Scissors - Validate resource locations - this.lootTableSeed = nbt.getLong("DeathLootTableSeed"); - } - diff --git a/patches/server/0015-Change-version-fetcher-to-AMG.patch b/patches/server/0015-Change-version-fetcher-to-AMG.patch deleted file mode 100644 index 97d7771..0000000 --- a/patches/server/0015-Change-version-fetcher-to-AMG.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Telesphoreo -Date: Sat, 26 Mar 2022 21:51:07 -0500 -Subject: [PATCH] Change version fetcher to AMG - - -diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index bf42969859545a8a520923ef1836ffa4a5cc24a0..31d0624fcaf1998383eebde7fbd3a1033e6c80aa 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -@@ -4,6 +4,8 @@ import com.destroystokyo.paper.util.VersionFetcher; - import com.google.common.base.Charsets; - import com.google.common.io.Resources; - import com.google.gson.*; -+import io.papermc.paper.util.JarManifests; -+import java.util.Map; - import net.kyori.adventure.text.Component; - import net.kyori.adventure.text.event.ClickEvent; - import net.kyori.adventure.text.format.NamedTextColor; -@@ -16,11 +18,12 @@ import java.io.*; - import java.net.HttpURLConnection; - import java.net.URL; - import java.util.stream.StreamSupport; -+import org.bukkit.Bukkit; - - public class PaperVersionFetcher implements VersionFetcher { - private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end -- private static final String GITHUB_BRANCH_NAME = "master"; -- private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads"; -+ private static final String GITHUB_BRANCH_NAME = getBranch(); -+ private static final String DOWNLOAD_PAGE = "https://ci.scissors.gg/job/Scissors/job/" + GITHUB_BRANCH_NAME; - private static @Nullable String mcVer; - - @Override -@@ -31,8 +34,8 @@ public class PaperVersionFetcher implements VersionFetcher { - @Nonnull - @Override - public Component getVersionMessage(@Nonnull String serverVersion) { -- String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]"); -- final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]); -+ String[] parts = serverVersion.substring("git-Scissors-".length()).split("[-\\s]"); -+ final Component updateMessage = getUpdateStatusMessage("AtlasMediaGroup/Scissors", GITHUB_BRANCH_NAME, parts[0]); - final Component history = getHistory(); - - return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; -@@ -54,15 +57,24 @@ public class PaperVersionFetcher implements VersionFetcher { - return mcVer; - } - -+ // Scissors start - Allow getting git information -+ public static String getCommit() { -+ final var manifest = JarManifests.manifest(Bukkit.getServer().getClass()); -+ return manifest == null ? null : manifest.getMainAttributes().getValue("Git-Commit"); -+ } -+ -+ public static String getBranch() { -+ final var manifest = JarManifests.manifest(Bukkit.getServer().getClass()); -+ return manifest == null ? null : manifest.getMainAttributes().getValue("Git-Branch"); -+ } -+ // Scissors end -+ - private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) { - int distance; -- try { -- int jenkinsBuild = Integer.parseInt(versionInfo); -- distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion()); -- } catch (NumberFormatException ignored) { -- versionInfo = versionInfo.replace("\"", ""); -- distance = fetchDistanceFromGitHub(repo, branch, versionInfo); -- } -+ // Scissors start - always use Git for version checking -+ versionInfo = getCommit(); -+ distance = fetchDistanceFromGitHub(repo, branch, versionInfo); -+ // Scissors end - - switch (distance) { - case -1: -diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index fbd604602024522bdd73aa1bde6fe2ccec63e442..07843d2c41122b73450dc583de905b7d45df13f7 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -270,7 +270,7 @@ public class Main { - if (buildDate.before(deadline.getTime())) { - // Paper start - This is some stupid bullshit - System.err.println("*** Warning, you've not updated in a while! ***"); -- System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper -+ System.err.println("*** Please download a new build from https://ci.scissors.gg/job/Scissors ***"); // Scissors > // Paper - //System.err.println("*** Server will start in 20 seconds ***"); - //Thread.sleep(TimeUnit.SECONDS.toMillis(20)); - // Paper End diff --git a/patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch deleted file mode 100644 index 9b50ca6..0000000 --- a/patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Wed, 30 Mar 2022 18:20:09 -0600 -Subject: [PATCH] Prevent attributes with invalid namespaces from being applied - to CraftMetaItems - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index d8eb84f28761dce95330afc32e4c011a4ab89b18..8644536d6f1be27d49a7260f35b776ba91144f07 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -46,6 +46,7 @@ import net.minecraft.nbt.NbtIo; - import net.minecraft.nbt.StringTag; - import net.minecraft.nbt.Tag; - import net.minecraft.network.chat.Component; -+import net.minecraft.resources.ResourceLocation; - import net.minecraft.world.item.BlockItem; - import org.apache.commons.lang.Validate; - import org.apache.commons.lang3.EnumUtils; -@@ -481,7 +482,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { - AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier); - - String attributeName = CraftAttributeMap.convertIfNeeded(entry.getString(ATTRIBUTES_IDENTIFIER.NBT)); // Paper -- if (attributeName == null || attributeName.isEmpty()) { -+ if (attributeName == null || attributeName.isEmpty() || attributeName.length() > 256 || !ResourceLocation.isValidResourceLocation(attributeName)) { // Scissors - continue; - } - diff --git a/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch b/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch deleted file mode 100644 index 24371e3..0000000 --- a/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Wed, 30 Mar 2022 02:01:55 -0600 -Subject: [PATCH] Validate String UUIDs during the CompoundTag -> GameProfile - conversion process - - -diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index 29b8519a1dd954f004bf04145e7246e3d2592b77..c1389a6608f19c9b293755abad97db1cc6b02f3c 100644 ---- a/src/main/java/net/minecraft/nbt/NbtUtils.java -+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java -@@ -76,7 +76,12 @@ public final class NbtUtils { - } - // Paper start - support string UUID's - if (nbt.contains("Id", 8)) { -- uUID = UUID.fromString(nbt.getString("Id")); -+ // Scissors start - Validate String UUIDs in game profiles -+ try { -+ uUID = UUID.fromString(nbt.getString("Id")); -+ } catch (Exception ignored) { -+ } -+ // Scissors end - } - // Paper end - diff --git a/patches/server/0018-Don-t-query-player-data-in-the-nbt-component.patch b/patches/server/0018-Don-t-query-player-data-in-the-nbt-component.patch deleted file mode 100644 index b96ac8b..0000000 --- a/patches/server/0018-Don-t-query-player-data-in-the-nbt-component.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sat, 9 Apr 2022 13:00:27 -0600 -Subject: [PATCH] Don't query player data in the `nbt` component - - -diff --git a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java -index 8a6799b50062c1b7b141ee1568dc523f9ee7ecfd..e5a2bb129100f0f935c8f10682204e7cb6277142 100644 ---- a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java -+++ b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java -@@ -11,6 +11,7 @@ import net.minecraft.commands.arguments.selector.EntitySelector; - import net.minecraft.commands.arguments.selector.EntitySelectorParser; - import net.minecraft.nbt.CompoundTag; - import net.minecraft.world.entity.Entity; -+import net.minecraft.world.entity.player.Player; - - public record EntityDataSource(String selectorPattern, @Nullable EntitySelector compiledSelector) implements DataSource { - public EntityDataSource(String rawPath) { -@@ -31,7 +32,7 @@ public record EntityDataSource(String selectorPattern, @Nullable EntitySelector - public Stream getData(CommandSourceStack source) throws CommandSyntaxException { - if (this.compiledSelector != null) { - List list = this.compiledSelector.findEntities(source); -- return list.stream().map(NbtPredicate::getEntityTagToCompare); -+ return list.stream().filter((entity) -> !(entity instanceof Player)).map(NbtPredicate::getEntityTagToCompare); // Scissors - Don't query NBT from players - } else { - return Stream.empty(); - } diff --git a/patches/server/0019-Limit-ListTags-to-1024-elements.patch b/patches/server/0019-Limit-ListTags-to-1024-elements.patch deleted file mode 100644 index e20309e..0000000 --- a/patches/server/0019-Limit-ListTags-to-1024-elements.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Luna -Date: Fri, 8 Apr 2022 23:38:12 -0300 -Subject: [PATCH] Limit ListTags to 1024 elements - - -diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java -index f346306d61854bdc6b395f5d8f799909537a1b50..fef39a78552188e90ebfcd608e7bf9e15c385bd1 100644 ---- a/src/main/java/net/minecraft/nbt/ListTag.java -+++ b/src/main/java/net/minecraft/nbt/ListTag.java -@@ -30,6 +30,7 @@ public class ListTag extends CollectionTag { - list.add(tagType.load(dataInput, i + 1, nbtAccounter)); - } - -+ if(j > 1024) return new ListTag(Lists.newArrayListWithCapacity(0), b); - return new ListTag(list, b); - } - } diff --git a/patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch deleted file mode 100644 index 802975c..0000000 --- a/patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Mon, 11 Apr 2022 13:33:52 -0600 -Subject: [PATCH] Fixes creative-killing potion effects and certain potion - effect overflows - - -diff --git a/src/main/java/net/minecraft/world/effect/MobEffect.java b/src/main/java/net/minecraft/world/effect/MobEffect.java -index 17ffab92f4ae2c06fa9f9249a474d4b6c9c55090..b2701b5779d9930e2cf6460b1e258cd80c4465f0 100644 ---- a/src/main/java/net/minecraft/world/effect/MobEffect.java -+++ b/src/main/java/net/minecraft/world/effect/MobEffect.java -@@ -59,6 +59,7 @@ public class MobEffect { - } - - public void applyEffectTick(LivingEntity entity, int amplifier) { -+ boolean god = entity instanceof Player player && (player.isCreative() || player.isInvulnerable()); // Scissors - if (this == MobEffects.REGENERATION) { - if (entity.getHealth() < entity.getMaxHealth()) { - entity.heal(1.0F, RegainReason.MAGIC_REGEN); // CraftBukkit -@@ -87,17 +88,31 @@ public class MobEffect { - // CraftBukkit end - } - } else if ((this != MobEffects.HEAL || entity.isInvertedHealAndHarm()) && (this != MobEffects.HARM || !entity.isInvertedHealAndHarm())) { -- if (this == MobEffects.HARM && !entity.isInvertedHealAndHarm() || this == MobEffects.HEAL && entity.isInvertedHealAndHarm()) { -+ // Scissors start -+ amplifier = Math.min(Math.abs(amplifier), 124); -+ if (!god && (this == MobEffects.HARM && !entity.isInvertedHealAndHarm() || this == MobEffects.HEAL && entity.isInvertedHealAndHarm())) { - entity.hurt(DamageSource.MAGIC, (float) (6 << amplifier)); - } -+ // Scissors end - } else { -- entity.heal((float) Math.max(4 << amplifier, 0), RegainReason.MAGIC); // CraftBukkit -+ // Scissors start -+ if (!god) { -+ amplifier = Math.min(Math.abs(amplifier), 124); -+ entity.heal((float) Math.max(4 << amplifier, 0), RegainReason.MAGIC); // CraftBukkit -+ } -+ // Scissors end - } - - } - - public void applyInstantenousEffect(@Nullable Entity source, @Nullable Entity attacker, LivingEntity target, int amplifier, double proximity) { - int j; -+ // Scissors start - Don't apply any healing/harming effects for Creative/Invulnerable players and cap the amplifier for those who aren't. -+ if (target instanceof Player player && (player.isCreative() || player.isInvulnerable())) { -+ return; -+ } -+ amplifier = Math.min(Math.abs(amplifier), 124); -+ // Scissors end - - if ((this != MobEffects.HEAL || target.isInvertedHealAndHarm()) && (this != MobEffects.HARM || !target.isInvertedHealAndHarm())) { - if ((this != MobEffects.HARM || target.isInvertedHealAndHarm()) && (this != MobEffects.HEAL || !target.isInvertedHealAndHarm())) { diff --git a/patches/server/0021-Fix-negative-death-times.patch b/patches/server/0021-Fix-negative-death-times.patch deleted file mode 100644 index c316e17..0000000 --- a/patches/server/0021-Fix-negative-death-times.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Business Goose -Date: Fri, 3 Jun 2022 19:30:14 -0500 -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 e8dc99752d06ca40f17f3ad2c829b2447b703d7c..ac85b2444322d1f2bd5ccdc285443bfc1a4855ca 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 { - - protected void tickDeath() { - ++this.deathTime; -- if (this.deathTime == 20 && !this.level.isClientSide()) { -+ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level.isClientSide()) { - this.level.broadcastEntityEvent(this, (byte) 60); - this.remove(Entity.RemovalReason.KILLED); - } diff --git a/patches/server/0022-Add-custom-classes-used-by-Scissors.patch b/patches/server/0022-Add-custom-classes-used-by-Scissors.patch deleted file mode 100644 index 7f8af6c..0000000 --- a/patches/server/0022-Add-custom-classes-used-by-Scissors.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Telesphoreo -Date: Sat, 11 Jun 2022 22:56:59 -0500 -Subject: [PATCH] Add custom classes used by Scissors - - -diff --git a/src/main/java/me/totalfreedom/scissors/MathUtility.java b/src/main/java/me/totalfreedom/scissors/MathUtility.java -new file mode 100644 -index 0000000000000000000000000000000000000000..754b578b575137a9c48cb20dee965a9388fedb3c ---- /dev/null -+++ b/src/main/java/me/totalfreedom/scissors/MathUtility.java -@@ -0,0 +1,29 @@ -+package me.totalfreedom.scissors; -+ -+public class MathUtility -+{ -+ public static int clampInt(int number, int minimum, int maximum) -+ { -+ return Math.min(Math.max(number, minimum), maximum); -+ } -+ -+ public static long clampLong(long number, long minimum, long maximum) -+ { -+ return Math.min(Math.max(number, minimum), maximum); -+ } -+ -+ public static double clampDouble(double number, double minimum, double maximum) -+ { -+ return Math.min(Math.max(number, minimum), maximum); -+ } -+ -+ public static int safeDoubleToInt(double number) -+ { -+ return (int) clampDouble(number, Integer.MIN_VALUE, Integer.MAX_VALUE); -+ } -+ -+ public static int safeLongToInt(long number) -+ { -+ return (int) clampLong(number, Integer.MIN_VALUE, Integer.MAX_VALUE); -+ } -+} -diff --git a/src/main/java/me/totalfreedom/scissors/NbtUtility.java b/src/main/java/me/totalfreedom/scissors/NbtUtility.java -new file mode 100644 -index 0000000000000000000000000000000000000000..b724baaef8d565e41db1af6393d0890e919a5aa8 ---- /dev/null -+++ b/src/main/java/me/totalfreedom/scissors/NbtUtility.java -@@ -0,0 +1,74 @@ -+package me.totalfreedom.scissors; -+ -+import java.nio.charset.StandardCharsets; -+import javax.annotation.Nullable; -+import net.minecraft.nbt.CompoundTag; -+import net.minecraft.nbt.ListTag; -+import net.minecraft.nbt.Tag; -+ -+public class NbtUtility -+{ -+ public static final long MAXIMUM_SIZE = (256 * 1024); -+ -+ public static long getTagSize(@Nullable Tag tag, int depth) -+ { -+ if (depth > 512) -+ { -+ return 0; -+ } -+ if (tag == null) -+ { -+ return 0; -+ } -+ -+ long size = 0; -+ -+ if (tag.getType() == CompoundTag.TYPE) -+ { -+ CompoundTag compoundTag = (CompoundTag) tag; -+ for (String key : compoundTag.getAllKeys()) -+ { -+ size += getTagSize(compoundTag.get(key), depth + 1); -+ } -+ } -+ else if (tag.getType() == ListTag.TYPE) -+ { -+ ListTag listTag = (ListTag) tag; -+ for (Tag tag1 : listTag) -+ { -+ size += getTagSize(tag1, depth + 1); -+ } -+ } -+ else -+ { -+ size += tag.getAsString().getBytes(StandardCharsets.UTF_8).length; -+ } -+ -+ return size; -+ } -+ -+ public static long getTagSize(@Nullable CompoundTag tag) -+ { -+ return getTagSize(tag, 0); -+ } -+ -+ public static boolean isTooLarge(@Nullable CompoundTag tag) -+ { -+ if (tag == null) -+ { -+ return false; -+ } -+ return getTagSize(tag) > MAXIMUM_SIZE; -+ } -+ -+ public static class Item -+ { -+ public static CompoundTag removeItemData(CompoundTag tag) -+ { -+ CompoundTag cleaned = new CompoundTag(); -+ cleaned.putString("id", tag.getString("id")); -+ cleaned.putByte("Count", tag.getByte("Count")); -+ return cleaned; -+ } -+ } -+} -diff --git a/src/main/java/me/totalfreedom/scissors/PositionUtility.java b/src/main/java/me/totalfreedom/scissors/PositionUtility.java -new file mode 100644 -index 0000000000000000000000000000000000000000..9e33ad84e50c7e2491aa883f905323f3ad2b070c ---- /dev/null -+++ b/src/main/java/me/totalfreedom/scissors/PositionUtility.java -@@ -0,0 +1,83 @@ -+package me.totalfreedom.scissors; -+ -+import net.minecraft.core.BlockPos; -+import net.minecraft.world.entity.Entity; -+import net.minecraft.world.level.Level; -+import net.minecraft.world.level.border.WorldBorder; -+import net.minecraft.world.phys.Vec3; -+ -+public class PositionUtility -+{ -+ public static Vec3 getValidVec3(double x, double y, double z, Entity entity) -+ { -+ final Level level = entity.level; -+ -+ try -+ { -+ if (level.isInWorldBounds(new BlockPos(Math.floor(MathUtility.safeDoubleToInt(x)), Math.floor(MathUtility.safeDoubleToInt(y)), Math.floor(MathUtility.safeDoubleToInt(z))))) -+ { -+ return new Vec3(x, y, z); -+ } -+ else -+ { -+ final WorldBorder worldBorder = level.getWorldBorder(); -+ -+ final double maxX = worldBorder.getMaxX(); -+ final double maxY = level.getMaxBuildHeight(); -+ final double maxZ = worldBorder.getMaxZ(); -+ -+ final double minX = worldBorder.getMinX(); -+ final double minY = level.getMinBuildHeight(); -+ final double minZ = worldBorder.getMinZ(); -+ -+ return new Vec3(MathUtility.clampDouble(x, minX, maxX), MathUtility.clampDouble(y, minY, maxY), MathUtility.clampDouble(z, minZ, maxZ)); -+ } -+ } -+ catch (Exception e) -+ { // If we throw some sort of exception due to the position being crazy, catch it -+ return new Vec3(0, 0, 0); -+ } -+ } -+ -+ public static Vec3 getValidVec3FromBlockPos(BlockPos blockPos, Entity entity) -+ { -+ final BlockPos validBlockPos = getValidBlockPos(blockPos, entity); -+ -+ return new Vec3(validBlockPos.getX(), validBlockPos.getY(), validBlockPos.getZ()); -+ } -+ -+ public static BlockPos getValidBlockPos(BlockPos blockPos, Entity entity) -+ { -+ final Level level = entity.level; -+ -+ try -+ { -+ if (level.isInWorldBounds(blockPos)) -+ { -+ return blockPos; -+ } -+ else -+ { -+ final int x = blockPos.getX(); -+ final int y = blockPos.getY(); -+ final int z = blockPos.getZ(); -+ -+ final WorldBorder worldBorder = level.getWorldBorder(); -+ -+ final int maxX = MathUtility.safeDoubleToInt(worldBorder.getMaxX()); -+ final int maxY = level.getMaxBuildHeight(); -+ final int maxZ = MathUtility.safeDoubleToInt(worldBorder.getMaxZ()); -+ -+ final int minX = MathUtility.safeDoubleToInt(worldBorder.getMinX()); -+ final int minY = level.getMinBuildHeight(); -+ final int minZ = MathUtility.safeDoubleToInt(worldBorder.getMinZ()); -+ -+ return new BlockPos(MathUtility.clampInt(x, minX, maxX), MathUtility.clampInt(y, minY, maxY), MathUtility.clampInt(z, minZ, maxZ)); -+ } -+ } -+ catch (Exception e) -+ { // If we throw some sort of exception due to the position being crazy, catch it -+ return new BlockPos(0, 0, 0); -+ } -+ } -+} diff --git a/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch deleted file mode 100644 index 4228ba4..0000000 --- a/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sat, 11 Jun 2022 23:05:12 -0500 -Subject: [PATCH] Validate coordinates before attempting to get block entities - when handling Creative Inventory packets - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 935c482be4bf3767e197a576d0e38eac51115dd4..ff31e7de543ee82e01b7d80382874732314504d6 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1843,6 +1843,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser - } - // Spigot end - -+ // Scissors start - Readd the following Paper code -+ // Paper start -+ private static final int SURVIVAL_PLACE_DISTANCE_SQUARED = 6 * 6; -+ private static final int CREATIVE_PLACE_DISTANCE_SQUARED = 7 * 7; -+ private boolean isOutsideOfReach(double x, double y, double z) { -+ Location eyeLoc = this.getCraftPlayer().getEyeLocation(); -+ double reachDistance = org.bukkit.util.NumberConversions.square(eyeLoc.getX() - x) + org.bukkit.util.NumberConversions.square(eyeLoc.getY() - y) + org.bukkit.util.NumberConversions.square(eyeLoc.getZ() - z); -+ return reachDistance > (this.getCraftPlayer().getGameMode() == org.bukkit.GameMode.CREATIVE ? CREATIVE_PLACE_DISTANCE_SQUARED : SURVIVAL_PLACE_DISTANCE_SQUARED); -+ } -+ // Paper end -+ // Scissors end -+ - @Override - public void handleUseItemOn(ServerboundUseItemOnPacket packet) { - PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3188,15 +3200,22 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser - if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot - BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound); - // Paper start -- BlockEntity tileentity = null; -- if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.getLevel().isLoadedAndInBounds(blockposition)) { -- tileentity = this.player.level.getBlockEntity(blockposition); -- } -- // Paper end -+ // Scissors start - Validate coordinates and whether the player can reach them -+ if (Level.isInSpawnableBounds(blockposition) && !isOutsideOfReach(blockposition.getX(), blockposition.getY(), blockposition.getZ())) -+ { -+ BlockEntity tileentity = null; -+ if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.getLevel().isLoadedAndInBounds(blockposition)) -+ { -+ tileentity = this.player.level.getBlockEntity(blockposition); -+ } -+ // Paper end - -- if (tileentity != null) { -- tileentity.saveToItem(itemstack); -+ if (tileentity != null) -+ { -+ tileentity.saveToItem(itemstack); -+ } - } -+ // Scissors end - } - - boolean flag1 = packet.getSlotNum() >= 1 && packet.getSlotNum() <= 45; diff --git a/patches/server/0024-Reset-large-tags.patch b/patches/server/0024-Reset-large-tags.patch deleted file mode 100644 index 602a44a..0000000 --- a/patches/server/0024-Reset-large-tags.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Business Goose -Date: Sat, 11 Jun 2022 23:16:06 -0500 -Subject: [PATCH] Reset large tags - - -diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 6b3cfc19c4fd1382ddf534265a1114995a4f6b55..6c0ea385df617793aafe995bcf1264ce9b764297 100644 ---- a/src/main/java/net/minecraft/world/item/ItemStack.java -+++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -20,6 +20,7 @@ import java.util.function.Predicate; - import java.util.stream.Collectors; - import java.util.stream.Stream; - import javax.annotation.Nullable; -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.ChatFormatting; - import net.minecraft.Util; - import net.minecraft.advancements.CriteriaTriggers; -@@ -251,6 +252,12 @@ public final class ItemStack { - - // CraftBukkit - break into own method - private void load(CompoundTag nbttagcompound) { -+ // Scissors start - Reset large tags -+ if (NbtUtility.isTooLarge(nbttagcompound)) { -+ // Reset tag without destroying item -+ nbttagcompound = NbtUtility.Item.removeItemData(nbttagcompound); -+ } -+ // Scissors end - this.item = (Item) Registry.ITEM.get(new ResourceLocation(nbttagcompound.getString("id"))); - this.count = nbttagcompound.getByte("Count"); - if (nbttagcompound.contains("tag", 10)) { -@@ -507,7 +514,11 @@ public final class ItemStack { - nbt.putString("id", minecraftkey == null ? "minecraft:air" : minecraftkey.toString()); - nbt.putByte("Count", (byte) this.count); - if (this.tag != null) { -- nbt.put("tag", this.tag.copy()); -+ // Scissors start - Don't save large tags -+ if (!NbtUtility.isTooLarge(this.tag)) { -+ nbt.put("tag", this.tag.copy()); -+ } -+ // Scissors end - } - - return nbt; -@@ -839,6 +850,9 @@ public final class ItemStack { - // Paper end - - public void setTag(@Nullable CompoundTag nbt) { -+ // Scissors start - Ignore large tags -+ if (NbtUtility.isTooLarge(nbt)) return; -+ // Scissors end - this.tag = nbt; - this.processEnchantOrder(this.tag); // Paper - if (this.getItem().canBeDepleted()) { diff --git a/patches/server/0025-Account-for-items-inside-containers.patch b/patches/server/0025-Account-for-items-inside-containers.patch deleted file mode 100644 index effb179..0000000 --- a/patches/server/0025-Account-for-items-inside-containers.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Business Goose -Date: Sat, 11 Jun 2022 23:33:13 -0500 -Subject: [PATCH] Account for items inside containers - - -diff --git a/src/main/java/net/minecraft/world/ContainerHelper.java b/src/main/java/net/minecraft/world/ContainerHelper.java -index 4092c7a8c2b0d9d26e6f4d97386735236300d132..9e0ab51dd7a4f9fed8f9edde962d42d4bbf604c1 100644 ---- a/src/main/java/net/minecraft/world/ContainerHelper.java -+++ b/src/main/java/net/minecraft/world/ContainerHelper.java -@@ -2,6 +2,7 @@ package net.minecraft.world; - - import java.util.List; - import java.util.function.Predicate; -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.core.NonNullList; - import net.minecraft.nbt.CompoundTag; - import net.minecraft.nbt.ListTag; -@@ -22,10 +23,13 @@ public class ContainerHelper { - - public static CompoundTag saveAllItems(CompoundTag nbt, NonNullList stacks, boolean setIfEmpty) { - ListTag listTag = new ListTag(); -+ // Scissors - Account for items inside containers -+ long total = 0; - - for(int i = 0; i < stacks.size(); ++i) { - ItemStack itemStack = stacks.get(i); - if (!itemStack.isEmpty()) { -+ total += NbtUtility.getTagSize(itemStack.getTag()); // Scissors - CompoundTag compoundTag = new CompoundTag(); - compoundTag.putByte("Slot", (byte)i); - itemStack.save(compoundTag); -@@ -33,7 +37,7 @@ public class ContainerHelper { - } - } - -- if (!listTag.isEmpty() || setIfEmpty) { -+ if ((!listTag.isEmpty() || setIfEmpty) && !(total > NbtUtility.MAXIMUM_SIZE)) { // Scissors - nbt.put("Items", listTag); - } - -@@ -42,11 +46,18 @@ public class ContainerHelper { - - public static void loadAllItems(CompoundTag nbt, NonNullList stacks) { - ListTag listTag = nbt.getList("Items", 10); -+ // Scissors - Account for items inside containers -+ long total = 0; - - for(int i = 0; i < listTag.size(); ++i) { - CompoundTag compoundTag = listTag.getCompound(i); - int j = compoundTag.getByte("Slot") & 255; - if (j >= 0 && j < stacks.size()) { -+ total += NbtUtility.getTagSize(compoundTag); -+ if (total >= NbtUtility.MAXIMUM_SIZE) { -+ stacks.clear(); -+ break; -+ } - stacks.set(j, ItemStack.of(compoundTag)); - } - } -diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index 4977f3fad3bfc12fd4c5f9fbe8beea2895247c57..2a005e837108d1879da31e8054afbbd6bf7b175e 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -@@ -9,6 +9,7 @@ import java.util.Iterator; - import java.util.List; - import java.util.Map; - import javax.annotation.Nullable; -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.SharedConstants; - import net.minecraft.Util; - import net.minecraft.core.BlockPos; -@@ -217,6 +218,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit - public List transaction = new java.util.ArrayList(); - - public List getContents() { -+ // Scissors - Account for items inside containers -+ long total = 0; -+ -+ for (ItemStack item : this.items) { -+ total += NbtUtility.getTagSize(item.getOrCreateTag()); -+ } -+ -+ if (total > NbtUtility.MAXIMUM_SIZE) { -+ this.items.clear(); -+ } - return this.items; - } - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java -index f52487e1cfcfab1bf22ab2cb52f998283a86e340..7170c2e4167a102d4abbe69be4b21feec15d600f 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java -@@ -1,5 +1,6 @@ - package net.minecraft.world.level.block.entity; - -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.core.BlockPos; - import net.minecraft.core.Direction; - import net.minecraft.core.NonNullList; -@@ -34,6 +35,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { - - @Override - public List getContents() { -+ // Scissors - Account for items inside containers -+ long total = 0; -+ -+ for (ItemStack item : this.items) { -+ total += NbtUtility.getTagSize(item.getOrCreateTag()); -+ } -+ -+ if (total > NbtUtility.MAXIMUM_SIZE) { -+ this.items.clear(); -+ } - return this.items; - } - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java -index 55006724ccec9f3de828ec18693728e9741ff65f..e6e59b2cfa1ced3756bf350905c0350ac7fd34f9 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java -@@ -3,6 +3,7 @@ package net.minecraft.world.level.block.entity; - import java.util.Arrays; - import java.util.Iterator; - import javax.annotation.Nullable; -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.core.BlockPos; - import net.minecraft.core.Direction; - import net.minecraft.core.NonNullList; -@@ -71,6 +72,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements - } - - public List getContents() { -+ // Scissors - Account for items inside containers -+ long total = 0; -+ -+ for (ItemStack item : this.items) { -+ total += NbtUtility.getTagSize(item.getOrCreateTag()); -+ } -+ -+ if (total > NbtUtility.MAXIMUM_SIZE) { -+ this.items.clear(); -+ } - return this.items; - } - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java -index a71414397bd45ee7bcacfeef0041d80dfa25f114..1b6f91055eb01627761e83e5e99e1731029b32ab 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java -@@ -1,5 +1,6 @@ - package net.minecraft.world.level.block.entity; - -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.core.BlockPos; - import net.minecraft.core.Direction; - import net.minecraft.core.NonNullList; -@@ -40,6 +41,16 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement - private int maxStack = MAX_STACK; - - public List getContents() { -+ // Scissors - Account for items inside containers -+ long total = 0; -+ -+ for (ItemStack item : this.items) { -+ total += NbtUtility.getTagSize(item.getOrCreateTag()); -+ } -+ -+ if (total > NbtUtility.MAXIMUM_SIZE) { -+ this.items.clear(); -+ } - return this.items; - } - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java -index 881379681c39230a00b3a1f11cd87498984396c7..1be5d600573f7632e6630224530dd76522e1b191 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java -@@ -1,5 +1,6 @@ - package net.minecraft.world.level.block.entity; - -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.core.BlockPos; - import net.minecraft.core.NonNullList; - import net.minecraft.nbt.CompoundTag; -@@ -28,6 +29,16 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity { - private int maxStack = MAX_STACK; - - public List getContents() { -+ // Scissors - Account for items inside containers -+ long total = 0; -+ -+ for (ItemStack item : this.items) { -+ total += NbtUtility.getTagSize(item.getOrCreateTag()); -+ } -+ -+ if (total > NbtUtility.MAXIMUM_SIZE) { -+ this.items.clear(); -+ } - return this.items; - } - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 8ab1d401ed55d4cce55704317cbffe53ebc9f119..5970a1c98cdf966b429c75a1cc178eca813dad11 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -@@ -5,6 +5,7 @@ import java.util.List; - import java.util.function.BooleanSupplier; - import java.util.stream.IntStream; - import javax.annotation.Nullable; -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.core.BlockPos; - import net.minecraft.core.Direction; - import net.minecraft.core.NonNullList; -@@ -52,6 +53,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen - private int maxStack = MAX_STACK; - - public List getContents() { -+ // Scissors - Account for items inside containers -+ long total = 0; -+ -+ for (ItemStack item : this.items) { -+ total += NbtUtility.getTagSize(item.getOrCreateTag()); -+ } -+ -+ if (total > NbtUtility.MAXIMUM_SIZE) { -+ this.items.clear(); -+ } - return this.items; - } - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java -index 137bdf1168b9e1d00164471e4e79f56c000c2696..8d3b4ec1f1d717af53240febaca1015f4ce0b39f 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java -@@ -3,6 +3,7 @@ package net.minecraft.world.level.block.entity; - import java.util.List; - import java.util.stream.IntStream; - import javax.annotation.Nullable; -+import me.totalfreedom.scissors.NbtUtility; - import net.minecraft.core.BlockPos; - import net.minecraft.core.Direction; - import net.minecraft.core.NonNullList; -@@ -60,6 +61,16 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl - public boolean opened; - - public List getContents() { -+ // Scissors - Account for items inside containers -+ long total = 0; -+ -+ for (ItemStack item : this.itemStacks) { -+ total += NbtUtility.getTagSize(item.getOrCreateTag()); -+ } -+ -+ if (total > NbtUtility.MAXIMUM_SIZE) { -+ this.itemStacks.clear(); -+ } - return this.itemStacks; - } - diff --git a/patches/server/0026-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/server/0026-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch deleted file mode 100644 index ad110be..0000000 --- a/patches/server/0026-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Business Goose -Date: Sun, 1 May 2022 14:23:35 -0500 -Subject: [PATCH] Limit amount of vehicle collision checks to 3 and discard - vehicles if they collide with more than 15 other entities - - -diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java -index 3f31a3c17ecca6e93b794478129b95ecff4e1a9c..1db184c47880a3527e6c83666c90b7d9a9bd3ad7 100644 ---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java -+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java -@@ -8,6 +8,7 @@ import com.mojang.datafixers.util.Pair; - import java.util.Iterator; - import java.util.List; - import java.util.Map; -+import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; - import net.minecraft.BlockUtil; - import net.minecraft.Util; -@@ -106,6 +107,7 @@ public abstract class AbstractMinecart extends Entity { - private double flyingX = 0.949999988079071D; // Paper - restore vanilla precision - private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision - private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision -+ private long lastLargeCollision = 0L; // Scissors - Add a collision debounce - public double maxSpeed = 0.4D; - // CraftBukkit end - -@@ -424,8 +426,10 @@ public abstract class AbstractMinecart extends Entity { - if (this.getMinecartType() == AbstractMinecart.Type.RIDEABLE && this.getDeltaMovement().horizontalDistanceSqr() > 0.01D) { - List list = this.level.getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this)); - -- if (!list.isEmpty()) { -- for (int l = 0; l < list.size(); ++l) { -+ // Scissors - Add a collision debounce -+ if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Using TimeUnit for better code readability -+ // Scissors - Limit amount of vehicle collision checks to 3 maximum -+ for (int l = 0; l < Math.min(3, list.size()); ++l) { - Entity entity = (Entity) list.get(l); - - if (!(entity instanceof Player) && !(entity instanceof IronGolem) && !(entity instanceof AbstractMinecart) && !this.isVehicle() && !entity.isPassenger()) { -@@ -452,6 +456,16 @@ public abstract class AbstractMinecart extends Entity { - entity.push(this); - } - } -+ -+ // Scissors - Add a collision debounce -+ if (list.size() > 3) { -+ lastLargeCollision = System.currentTimeMillis(); -+ } -+ -+ // Scissors - Delete entity if the collision amount is over 15 -+ if (list.size() > 15) { -+ this.discard(); -+ } - } - } else { - Iterator iterator = this.level.getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D)).iterator(); -diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -index eb753323f67badb1bed28405c07b03078e322b44..8e1855ae99ce0a1c098a67c7e0fead87c061eb4f 100644 ---- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -@@ -4,6 +4,7 @@ import com.google.common.collect.Lists; - import com.google.common.collect.UnmodifiableIterator; - import java.util.Iterator; - import java.util.List; -+import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; - import net.minecraft.BlockUtil; - import net.minecraft.core.BlockPos; -@@ -106,6 +107,7 @@ public class Boat extends Entity { - public double unoccupiedDeceleration = -1; - public boolean landBoats = false; - // CraftBukkit end -+ private long lastLargeCollision = 0L; // Scissors - Add a collision debounce - - public Boat(EntityType type, Level world) { - super(type, world); -@@ -403,10 +405,12 @@ public class Boat extends Entity { - this.checkInsideBlocks(); - List list = this.level.getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, -0.009999999776482582D, 0.20000000298023224D), EntitySelector.pushableBy(this)); - -- if (!list.isEmpty()) { -+ // Scissors - Add collision debounce -+ if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Using TimeUnit for better code readability - boolean flag = !this.level.isClientSide && !(this.getControllingPassenger() instanceof Player); - -- for (int j = 0; j < list.size(); ++j) { -+ // Scissors - Limit amount of vehicle collision checks to 3 maximum -+ for (int j = 0; j < Math.min(3, list.size()); ++j) { - Entity entity = (Entity) list.get(j); - - if (!entity.hasPassenger((Entity) this)) { -@@ -417,6 +421,16 @@ public class Boat extends Entity { - } - } - } -+ -+ // Scissors - Add collision debounce -+ if (list.size() > 3) { -+ lastLargeCollision = System.currentTimeMillis(); -+ } -+ -+ // Scissors - Delete entity if the collision amount is over 15 -+ if (list.size() > 15) { -+ this.discard(); -+ } - } - - } diff --git a/patches/server/0027-Don-t-log-invalid-teams-to-console.patch b/patches/server/0027-Don-t-log-invalid-teams-to-console.patch deleted file mode 100644 index 3ed5d63..0000000 --- a/patches/server/0027-Don-t-log-invalid-teams-to-console.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Tue, 17 May 2022 05:57:52 +0100 -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 ac85b2444322d1f2bd5ccdc285443bfc1a4855ca..63229d6c61346821ad45997bddcbbfd95fb96de8 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 { - boolean flag = scoreboardteam != null && this.level.getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam); - - if (!flag) { -- LivingEntity.LOGGER.warn("Unable to add mob to team \"{}\" (that team probably doesn't exist)", s); -+ // Scissors start - Prevent log spam possible with this error message, easily provokable by players in creative. -+ // LivingEntity.LOGGER.warn("Unable to add mob to team \"{}\" (that team probably doesn't exist)", s); -+ // Scissors end - } - } - diff --git a/patches/server/0028-Better-handling-of-invalid-JSON-components.patch b/patches/server/0028-Better-handling-of-invalid-JSON-components.patch deleted file mode 100644 index aa6e180..0000000 --- a/patches/server/0028-Better-handling-of-invalid-JSON-components.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 12 Jun 2022 00:06:07 -0500 -Subject: [PATCH] Better handling of invalid JSON components - - -diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java -index bbfb98618a0b87406cc48465bdda15a0a4974b7e..a38127366c55a2d377727d9a9aec32b0e3ad437a 100644 ---- a/src/main/java/net/minecraft/network/chat/Component.java -+++ b/src/main/java/net/minecraft/network/chat/Component.java -@@ -25,6 +25,7 @@ import java.util.List; - import java.util.Map.Entry; - import java.util.Optional; - import javax.annotation.Nullable; -+import net.minecraft.ChatFormatting; - import net.minecraft.Util; - import net.minecraft.network.chat.contents.BlockDataSource; - import net.minecraft.network.chat.contents.DataSource; -@@ -490,6 +491,26 @@ public interface Component extends Message, FormattedText, Iterable { - return GsonHelper.toStableString(Serializer.toJsonTree(text)); - } - -+ // Scissors start -+ @Nullable -+ public static MutableComponent fromJsonSafe(String json) { -+ try { -+ return fromJson(json); -+ } catch (Exception ex) { -+ return Component.empty().append("** Invalid JSON Component **").withStyle(ChatFormatting.RED); -+ } -+ } -+ -+ @Nullable -+ public static MutableComponent fromJsonSafe(JsonElement json) { -+ try { -+ return fromJson(json); -+ } catch (Exception ex) { -+ return Component.empty().append("** Invalid JSON Component **").withStyle(ChatFormatting.RED); -+ } -+ } -+ // Scissors end -+ - public static JsonElement toJsonTree(Component text) { - return Component.Serializer.GSON.toJsonTree(text); - } -diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java -index d38562b518b28ba4617d39e4587c7fa72859ab11..454e73bbcf449561e18bb8565932872c5a62a6e1 100644 ---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java -+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java -@@ -79,7 +79,7 @@ public class HoverEvent { - if (jsonElement != null) { - return action.deserialize(jsonElement); - } else { -- Component component = Component.Serializer.fromJson(json.get("value")); -+ Component component = Component.Serializer.fromJsonSafe(json.get("value")); // Scissors - Use safer method for getting Components from JSON - return component != null ? action.deserializeFromLegacy(component) : null; - } - } -@@ -94,7 +94,7 @@ public class HoverEvent { - } - - public static class Action { -- public static final HoverEvent.Action SHOW_TEXT = new HoverEvent.Action<>("show_text", true, Component.Serializer::fromJson, Component.Serializer::toJsonTree, Function.identity()); -+ public static final HoverEvent.Action SHOW_TEXT = new HoverEvent.Action<>("show_text", true, Component.Serializer::fromJsonSafe, Component.Serializer::toJsonTree, Function.identity()); // Scissors - Use safer method for getting Components from JSON - public static final HoverEvent.Action SHOW_ITEM = new HoverEvent.Action<>("show_item", true, HoverEvent.ItemStackInfo::create, HoverEvent.ItemStackInfo::serialize, HoverEvent.ItemStackInfo::create); - public static final HoverEvent.Action SHOW_ENTITY = new HoverEvent.Action<>("show_entity", true, HoverEvent.EntityTooltipInfo::create, HoverEvent.EntityTooltipInfo::serialize, HoverEvent.EntityTooltipInfo::create); - private static final Map> LOOKUP = Stream.of(SHOW_TEXT, SHOW_ITEM, SHOW_ENTITY).collect(ImmutableMap.toImmutableMap(HoverEvent.Action::getName, (action) -> { -@@ -182,7 +182,7 @@ public class HoverEvent { - return null; - } - // Scissors end -- Component component = Component.Serializer.fromJson(jsonObject.get("name")); -+ Component component = Component.Serializer.fromJsonSafe(jsonObject.get("name")); // Scissors - Use safer method for getting Components from JSON - return new HoverEvent.EntityTooltipInfo(entityType, uUID, component); - } - } -@@ -191,7 +191,7 @@ public class HoverEvent { - public static HoverEvent.EntityTooltipInfo create(Component text) { - try { - CompoundTag compoundTag = TagParser.parseTag(text.getString()); -- Component component = Component.Serializer.fromJson(compoundTag.getString("name")); -+ Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("name")); // Scissors - Use safer method for getting Components from JSON - EntityType entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type"))); - // Scissors start - UUID uUID; -diff --git a/src/main/java/net/minecraft/network/chat/contents/NbtContents.java b/src/main/java/net/minecraft/network/chat/contents/NbtContents.java -index 97a2657bc98d41c3c1e376b266d2c85f685acc88..7b6476455e095eed15c92797ce3a3e1146dbdc3f 100644 ---- a/src/main/java/net/minecraft/network/chat/contents/NbtContents.java -+++ b/src/main/java/net/minecraft/network/chat/contents/NbtContents.java -@@ -8,6 +8,7 @@ import java.util.Optional; - import java.util.stream.Collectors; - import java.util.stream.Stream; - import javax.annotation.Nullable; -+import net.kyori.adventure.text.TextComponent; - import net.minecraft.commands.CommandSourceStack; - import net.minecraft.commands.arguments.NbtPathArgument; - import net.minecraft.nbt.Tag; -@@ -107,10 +108,11 @@ public class NbtContents implements ComponentContents { - Component component = DataFixUtils.orElse(ComponentUtils.updateForEntity(source, this.separator, sender, depth), ComponentUtils.DEFAULT_NO_STYLE_SEPARATOR); - return stream.flatMap((text) -> { - try { -- MutableComponent mutableComponent = Component.Serializer.fromJson(text); -+ MutableComponent mutableComponent = Component.Serializer.fromJsonSafe(text); // Scissors - return Stream.of(ComponentUtils.updateForEntity(source, mutableComponent, sender, depth)); - } catch (Exception var5) { -- LOGGER.warn("Failed to parse component: {}", text, var5); -+ // Scissors - don't log -+ // LOGGER.warn("Failed to parse component: {}", text, var5); - return Stream.of(); - } - }).reduce((accumulator, current) -> { -diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 19a64b582bc042e426220e080d9c21b3a82cf3f7..1a38f82eb4650fcc0e0db8cb76f1ea1249703c02 100644 ---- a/src/main/java/net/minecraft/world/entity/Entity.java -+++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2304,12 +2304,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { - this.setRot(this.getYRot(), this.getXRot()); - if (nbt.contains("CustomName", 8)) { - String s = nbt.getString("CustomName"); -- -- try { -- this.setCustomName(Component.Serializer.fromJson(s)); -- } catch (Exception exception) { -- Entity.LOGGER.warn("Failed to parse entity custom name {}", s, exception); -- } -+ this.setCustomName(Component.Serializer.fromJsonSafe(s)); // Scissors - Use safer method for getting Components from JSON - } - - this.setCustomNameVisible(nbt.getBoolean("CustomNameVisible")); -diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index 5f6eeb36f57bd342b18590c8f0ffb668d2bf273c..5ae750a2f12917ecddb0c14c23e6b02735385599 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -@@ -408,7 +408,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider { - this.levels = nbt.getInt("Levels"); // SPIGOT-5053, use where available - // CraftBukkit end - if (nbt.contains("CustomName", 8)) { -- this.name = net.minecraft.server.MCUtil.getBaseComponentFromNbt("CustomName", nbt); // Paper - Catch ParseException -+ this.name = Component.Serializer.fromJsonSafe(nbt.getString("CustomName")); // Scissors - Use safer method for getting Components from JSON - } - - this.lockKey = LockCode.fromTag(nbt); -diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java -index 2341a5a249d455628165fc6ba508fc6d70c3dbfb..3e23451066894ebd88cad7022970cb2c0e9b75db 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java -@@ -42,7 +42,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable - public void load(CompoundTag nbt) { - super.load(nbt); - if (nbt.contains("CustomName", 8)) { -- this.name = net.minecraft.server.MCUtil.getBaseComponentFromNbt("CustomName", nbt); // Paper - Catch ParseException -+ this.name = Component.Serializer.fromJsonSafe(nbt.getString("CustomName")); // Scissors - Use safer method for getting Components from JSON - } - - } -diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java -index 2be7a697f08045b974579e6942b38571e744efac..84ec21c38bb44db1e9ff26c01d5c8af1a2417616 100644 ---- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java -+++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java -@@ -35,7 +35,7 @@ public class ScoreboardSaveData extends SavedData { - CompoundTag compoundTag = nbt.getCompound(i); - String string = compoundTag.getString("Name"); - PlayerTeam playerTeam = this.scoreboard.addPlayerTeam(string); -- Component component = Component.Serializer.fromJson(compoundTag.getString("DisplayName")); -+ Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("DisplayName")); // Scissors - Use safer method for getting Components from JSON - if (component != null) { - playerTeam.setDisplayName(component); - } -@@ -53,14 +53,14 @@ public class ScoreboardSaveData extends SavedData { - } - - if (compoundTag.contains("MemberNamePrefix", 8)) { -- Component component2 = Component.Serializer.fromJson(compoundTag.getString("MemberNamePrefix")); -+ Component component2 = Component.Serializer.fromJsonSafe(compoundTag.getString("MemberNamePrefix")); // Scissors - Use safer method for getting Components from JSON - if (component2 != null) { - playerTeam.setPlayerPrefix(component2); - } - } - - if (compoundTag.contains("MemberNameSuffix", 8)) { -- Component component3 = Component.Serializer.fromJson(compoundTag.getString("MemberNameSuffix")); -+ Component component3 = Component.Serializer.fromJsonSafe(compoundTag.getString("MemberNameSuffix")); // Scissors - Use safer method for getting Components from JSON - if (component3 != null) { - playerTeam.setPlayerSuffix(component3); - } -@@ -115,7 +115,7 @@ public class ScoreboardSaveData extends SavedData { - CompoundTag compoundTag = nbt.getCompound(i); - ObjectiveCriteria.byName(compoundTag.getString("CriteriaName")).ifPresent((criterion) -> { - String string = compoundTag.getString("Name"); -- Component component = Component.Serializer.fromJson(compoundTag.getString("DisplayName")); -+ Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("DisplayName")); // Scissors - Use safer method for getting Components from JSON - ObjectiveCriteria.RenderType renderType = ObjectiveCriteria.RenderType.byId(compoundTag.getString("RenderType")); - this.scoreboard.addObjective(string, criterion, component, renderType); - }); diff --git a/patches/server/0029-Reject-oversized-components-from-updating.patch b/patches/server/0029-Reject-oversized-components-from-updating.patch deleted file mode 100644 index bb5cf8f..0000000 --- a/patches/server/0029-Reject-oversized-components-from-updating.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 12 Jun 2022 00:33:21 -0500 -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 ---- 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 { - } - - public static MutableComponent updateForEntity(@Nullable CommandSourceStack source, Component text, @Nullable Entity sender, int depth) throws CommandSyntaxException { -+ // Scissors start - Reject oversized components -+ MutableComponent result; - if (depth > 100) { -- return text.copy(); -+ result = text.copy(); - } else { - MutableComponent mutableComponent = text.getContents().resolve(source, sender, depth + 1); - -@@ -48,8 +50,11 @@ public class ComponentUtils { - mutableComponent.append(updateForEntity(source, component, sender, depth + 1)); - } - -- return mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth)); -+ result = mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth)); - } -+ // Would the resulting component exceed 65535 bytes when encoded as a string? -+ return Component.Serializer.toJson(result).length() > 65535 ? Component.empty() : result; -+ // Scissors end - } - - 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); - } - } - diff --git a/patches/server/0030-Block-server-side-chunkbans.patch b/patches/server/0030-Block-server-side-chunkbans.patch deleted file mode 100644 index f4531d9..0000000 --- a/patches/server/0030-Block-server-side-chunkbans.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: ayunami2000 -Date: Fri, 17 Jun 2022 15:28:43 -0500 -Subject: [PATCH] Block server side chunkbans - - -diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java -index 5fce1177e7198d791d4ab1c64b394c5b1c145782..744d93fac1db1a8cd6d6ce37de717db97ccf73a1 100644 ---- a/src/main/java/net/minecraft/network/PacketEncoder.java -+++ b/src/main/java/net/minecraft/network/PacketEncoder.java -@@ -6,9 +6,18 @@ import io.netty.channel.ChannelHandlerContext; - import io.netty.handler.codec.MessageToByteEncoder; - import io.papermc.paper.adventure.PaperAdventure; // Paper - import java.io.IOException; -+import net.minecraft.nbt.CompoundTag; - import net.minecraft.network.protocol.Packet; - import net.minecraft.network.protocol.PacketFlow; -+import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -+import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket; -+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; -+import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData; -+import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; -+import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket; -+import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; - import net.minecraft.util.profiling.jfr.JvmProfiler; -+import net.minecraft.world.item.ItemStack; - import org.slf4j.Logger; - - public class PacketEncoder extends MessageToByteEncoder> { -@@ -41,30 +50,101 @@ public class PacketEncoder extends MessageToByteEncoder> { - packet.write(friendlyByteBuf); - int j = friendlyByteBuf.writerIndex() - i; - if (j > 8388608) { -- throw new IllegalArgumentException("Packet too big (is " + j + ", should be less than 8388608): " + packet); -+ // Scissors start -+ noKicking(friendlyByteBuf, packet, integer, channelHandlerContext); -+ // Scissors end - } else { - int k = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get().getId(); - JvmProfiler.INSTANCE.onPacketSent(k, integer, channelHandlerContext.channel().remoteAddress(), j); - } - } catch (Throwable var10) { -- LOGGER.error("Packet encoding of packet ID {} threw (skippable? {})", integer, packet.isSkippable(), var10); // Paper - Give proper error message -- if (packet.isSkippable()) { -- throw new SkipPacketException(var10); -- } else { -- throw var10; -- } -+ noKicking(friendlyByteBuf, packet, integer, channelHandlerContext); - } - - // Paper start - int packetLength = friendlyByteBuf.readableBytes(); - if (packetLength > MAX_PACKET_SIZE) { -- throw new PacketTooLargeException(packet, packetLength); -+ // Scissors start -+ friendlyByteBuf.clear(); -+ noKicking(friendlyByteBuf, packet, integer, channelHandlerContext); -+ packetLength = friendlyByteBuf.readableBytes(); -+ if (packetLength > MAX_PACKET_SIZE) { -+ friendlyByteBuf.clear(); -+ } -+ // Scissors end - } - // Paper end - } - } - } - -+ // Scissors start -+ private static void noKicking(FriendlyByteBuf friendlyByteBuf, Packet packet, Integer integer, ChannelHandlerContext channelHandlerContext) -+ { -+ friendlyByteBuf.clear(); -+ friendlyByteBuf.writeVarInt(integer); -+ friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper -+ boolean didIt = true; -+ if (packet instanceof ClientboundBlockEntityDataPacket blockEntityDataPacket) -+ { -+ packet = new ClientboundBlockEntityDataPacket(blockEntityDataPacket.getPos(), blockEntityDataPacket.getType(), new CompoundTag()); -+ } -+ else if (packet instanceof ClientboundLevelChunkPacketData chunkPacket) -+ { -+ chunkPacket.clearNBT(); -+ } -+ else if (packet instanceof ClientboundSetEntityDataPacket entityDataPacket) -+ { -+ friendlyByteBuf.writeVarInt(entityDataPacket.getId()); -+ friendlyByteBuf.writeByte(255); -+ didIt = false;//prevent default packet writing -+ } -+ else if (packet instanceof ClientboundContainerSetContentPacket containerSetContentPacket) -+ { -+ containerSetContentPacket.clearNBT(); -+ } -+ else if (packet instanceof ClientboundSetEquipmentPacket setEquipmentPacket) -+ { -+ friendlyByteBuf.writeVarInt(setEquipmentPacket.getEntity()); -+ didIt = false; //prevent default -+ } -+ else if (packet instanceof ClientboundContainerSetSlotPacket containerSetSlotPacket) -+ { -+ friendlyByteBuf.writeByte(containerSetSlotPacket.getContainerId()); -+ friendlyByteBuf.writeVarInt(containerSetSlotPacket.getStateId()); -+ friendlyByteBuf.writeShort(containerSetSlotPacket.getSlot()); -+ friendlyByteBuf.writeItem(ItemStack.EMPTY); -+ didIt = false; //prevent default -+ } -+ else if (packet instanceof ClientboundMapItemDataPacket mapItemDataPacket) -+ { -+ packet = new ClientboundMapItemDataPacket(mapItemDataPacket.getMapId(), mapItemDataPacket.getScale(), mapItemDataPacket.isLocked(), null, null); -+ } -+ else -+ { -+ didIt = false; -+ LOGGER.info(packet.getClass().getName() + " overflowed/errored and was not caught!!"); -+ } -+ if (didIt) -+ { -+ try -+ { -+ int i = friendlyByteBuf.writerIndex(); -+ packet.write(friendlyByteBuf); -+ int j = friendlyByteBuf.writerIndex() - i; -+ if (j > 8388608) -+ { -+ friendlyByteBuf.clear(); -+ } -+ } -+ catch (Throwable var69) -+ { -+ friendlyByteBuf.clear(); -+ } -+ } -+ } -+ // Scissors end -+ - // Paper start - private static int MAX_PACKET_SIZE = 2097152; - -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -index b1e326cf4f7fe447f81b588dcb0eda9a435e59a8..a49b4e711012b6047de113fc1d456a5190406d98 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -@@ -24,7 +24,8 @@ public class ClientboundBlockEntityDataPacket implements Packet blockEntityType, CompoundTag nbt) { -+ // Scissors - make this public -+ public ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType blockEntityType, CompoundTag nbt) { - this.pos = pos; - this.type = blockEntityType; - this.tag = nbt.isEmpty() ? null : nbt; -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java -index dbd8b9b09b82c1b75e8be9dc7416d9f0863c8c87..24e0f4ee1dc9b5a46ed063e087d4b7bcd2a7fe46 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java -@@ -10,7 +10,15 @@ public class ClientboundContainerSetContentPacket implements Packet items; -- private final ItemStack carriedItem; -+ private ItemStack carriedItem; // Scissors - removed "final" -+ -+ // Scissors start -+ public void clearNBT() -+ { -+ this.items.clear(); -+ this.carriedItem = ItemStack.EMPTY; -+ } -+ // Scissors end - - public ClientboundContainerSetContentPacket(int syncId, int revision, NonNullList contents, ItemStack cursorStack) { - this.containerId = syncId; -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -index 76b6437a1d807c7e1b673f8feeed1f171ee9a803..3d9b0525f931a684e14a56c368dfb5b452bc7b4a 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -@@ -33,6 +33,14 @@ public class ClientboundLevelChunkPacketData { - } - // Paper end - -+ // Scissors start -+ public void clearNBT() -+ { -+ this.blockEntitiesData.clear(); -+ this.extraPackets.clear(); -+ } -+ // Scissors end -+ - // Paper start - Anti-Xray - Add chunk packet info - @Deprecated @io.papermc.paper.annotation.DoNotUse public ClientboundLevelChunkPacketData(LevelChunk chunk) { this(chunk, null); } - public ClientboundLevelChunkPacketData(LevelChunk chunk, com.destroystokyo.paper.antixray.ChunkPacketInfo chunkPacketInfo) { diff --git a/patches/server/0031-Add-MasterBlockFireEvent.patch b/patches/server/0031-Add-MasterBlockFireEvent.patch deleted file mode 100644 index 14fd21a..0000000 --- a/patches/server/0031-Add-MasterBlockFireEvent.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Mon, 4 Jul 2022 22:12:19 +0100 -Subject: [PATCH] Add MasterBlockFireEvent - - -diff --git a/src/main/java/net/minecraft/world/level/block/CommandBlock.java b/src/main/java/net/minecraft/world/level/block/CommandBlock.java -index 2e7c03b00bc941b86df6a7f1b2b188c9f0aede22..333f9bcccbe9ecd88c1fd13e2956f69414d6e295 100644 ---- a/src/main/java/net/minecraft/world/level/block/CommandBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/CommandBlock.java -@@ -1,5 +1,6 @@ - package net.minecraft.world.level.block; - -+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; - import com.mojang.logging.LogUtils; - import net.minecraft.core.BlockPos; - import net.minecraft.core.Direction; -@@ -25,10 +26,10 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; - import net.minecraft.world.level.block.state.properties.BooleanProperty; - import net.minecraft.world.level.block.state.properties.DirectionProperty; - import net.minecraft.world.phys.BlockHitResult; -+import org.bukkit.event.block.BlockRedstoneEvent; -+import org.bukkit.Location; - import org.slf4j.Logger; - --import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit -- - public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { - - private static final Logger LOGGER = LogUtils.getLogger(); -@@ -117,6 +118,15 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock { - } - - private void execute(BlockState state, Level world, BlockPos pos, BaseCommandBlock executor, boolean hasCommand) { -+ // Scissors - Add master block fire event -+ final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ())); -+ -+ if (!event.callEvent()) -+ { -+ return; -+ } -+ // Scissors end -+ - if (hasCommand) { - executor.performCommand(world); - } else { -diff --git a/src/main/java/net/minecraft/world/level/block/StructureBlock.java b/src/main/java/net/minecraft/world/level/block/StructureBlock.java -index a3dac53b07618819b322b48339d850d80a1c55ba..4dd21b7ea247b3ced3d3ee6c67746cc6811d5bb8 100644 ---- a/src/main/java/net/minecraft/world/level/block/StructureBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/StructureBlock.java -@@ -1,6 +1,7 @@ - package net.minecraft.world.level.block; - - import javax.annotation.Nullable; -+ - import net.minecraft.core.BlockPos; - import net.minecraft.server.level.ServerLevel; - import net.minecraft.world.InteractionHand; -diff --git a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java -index fee4aef1bdae1b1ca57ff0b6c3fd2ec31439c37b..75cdeb8fddbb572b5ccdfcd1c745063b1ca76e80 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java -@@ -2,6 +2,8 @@ package net.minecraft.world.level.block.entity; - - import java.util.Arrays; - import java.util.Optional; -+ -+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; - import net.minecraft.core.BlockPos; - import net.minecraft.core.Holder; - import net.minecraft.core.Registry; -@@ -16,6 +18,7 @@ import net.minecraft.world.level.block.JigsawBlock; - import net.minecraft.world.level.block.state.BlockState; - import net.minecraft.world.level.levelgen.structure.pools.JigsawPlacement; - import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool; -+import org.bukkit.Location; - - public class JigsawBlockEntity extends BlockEntity { - public static final String TARGET = "target"; -@@ -106,6 +109,16 @@ public class JigsawBlockEntity extends BlockEntity { - } - - public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) { -+ // Scissors - Add master block fire event -+ final BlockPos pos = this.getBlockPos(); -+ final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), pos.getX(), pos.getY(), pos.getZ())); -+ -+ if (!event.callEvent()) -+ { -+ return; -+ } -+ // Scissors end -+ - BlockPos blockPos = this.getBlockPos().relative(this.getBlockState().getValue(JigsawBlock.ORIENTATION).front()); - Registry registry = world.registryAccess().registryOrThrow(Registry.TEMPLATE_POOL_REGISTRY); - Holder holder = registry.getHolderOrThrow(this.pool); -diff --git a/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java -index 9792bf3ee083f571f1f4089d30beb586839f5f6b..e9d584b0ca984f9b7c70f99e1665cdedecb710e1 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java -@@ -5,6 +5,8 @@ import java.util.Objects; - import java.util.Optional; - import java.util.stream.Stream; - import javax.annotation.Nullable; -+ -+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; - import net.minecraft.ResourceLocationException; - import net.minecraft.Util; - import net.minecraft.core.BlockPos; -@@ -29,6 +31,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProce - import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; - import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; - import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager; -+import org.bukkit.Location; - - public class StructureBlockEntity extends BlockEntity { - private static final int SCAN_CORNER_BLOCKS_RANGE = 5; -@@ -264,7 +267,6 @@ public class StructureBlockEntity extends BlockEntity { - return false; - } else { - BlockPos blockPos = this.getBlockPos(); -- int i = 80; - BlockPos blockPos2 = new BlockPos(blockPos.getX() - 80, this.level.getMinBuildHeight(), blockPos.getZ() - 80); - BlockPos blockPos3 = new BlockPos(blockPos.getX() + 80, this.level.getMaxBuildHeight() - 1, blockPos.getZ() + 80); - Stream stream = this.getRelatedCorners(blockPos2, blockPos3); -@@ -321,6 +323,16 @@ public class StructureBlockEntity extends BlockEntity { - - public boolean saveStructure(boolean bl) { - if (this.mode == StructureMode.SAVE && !this.level.isClientSide && this.structureName != null) { -+ // Scissors - Add master block fire event -+ final BlockPos pos = this.getBlockPos(); -+ final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), pos.getX(), pos.getY(), pos.getZ())); -+ -+ if (!event.callEvent()) -+ { -+ return false; -+ } -+ // Scissors end -+ - BlockPos blockPos = this.getBlockPos().offset(this.structurePos); - ServerLevel serverLevel = (ServerLevel)this.level; - StructureTemplateManager structureTemplateManager = serverLevel.getStructureManager(); -@@ -358,6 +370,16 @@ public class StructureBlockEntity extends BlockEntity { - - public boolean loadStructure(ServerLevel world, boolean bl) { - if (this.mode == StructureMode.LOAD && this.structureName != null) { -+ // Scissors - Add master block fire event -+ final BlockPos blockPos = this.getBlockPos(); -+ final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), blockPos.getX(), blockPos.getY(), blockPos.getZ())); -+ -+ if (!event.callEvent()) -+ { -+ return false; -+ } -+ // Scissors end -+ - StructureTemplateManager structureTemplateManager = world.getStructureManager(); - - Optional optional; -@@ -403,6 +425,16 @@ public class StructureBlockEntity extends BlockEntity { - } - - public void unloadStructure() { -+ // Scissors - Add master block fire event -+ final BlockPos blockPos = this.getBlockPos(); -+ final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), blockPos.getX(), blockPos.getY(), blockPos.getZ())); -+ -+ if (!event.callEvent()) -+ { -+ return; -+ } -+ // Scissors end -+ - if (this.structureName != null) { - ServerLevel serverLevel = (ServerLevel)this.level; - StructureTemplateManager structureTemplateManager = serverLevel.getStructureManager(); diff --git a/patches/server/0032-Add-spectator-teleport-event.patch b/patches/server/0032-Add-spectator-teleport-event.patch deleted file mode 100644 index 4baa8f1..0000000 --- a/patches/server/0032-Add-spectator-teleport-event.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Tue, 5 Jul 2022 04:12:31 +0100 -Subject: [PATCH] Add spectator teleport event - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ff31e7de543ee82e01b7d80382874732314504d6..68c9de9121d9e60e509b38b5e866d87d3782bd6a 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 @@ - package net.minecraft.server.network; - -+import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; - import com.google.common.collect.Lists; - import com.google.common.primitives.Floats; - import com.mojang.brigadier.ParseResults; -@@ -1985,6 +1986,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser - Entity entity = packet.getEntity(worldserver); - - if (entity != null) { -+ // Scissors start - Add spectator teleport event -+ final SpectatorTeleportEvent event = new SpectatorTeleportEvent(this.player.getBukkitEntity(), entity.getBukkitEntity()); -+ -+ if(!event.callEvent()) { -+ return; -+ } -+ // Scissors end -+ - this.player.teleportTo(worldserver, entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot(), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.SPECTATE); // CraftBukkit - return; - } diff --git a/patches/server/0033-Prevent-invalid-container-events.patch b/patches/server/0033-Prevent-invalid-container-events.patch deleted file mode 100644 index afc520f..0000000 --- a/patches/server/0033-Prevent-invalid-container-events.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Sun, 10 Jul 2022 02:55:01 +0100 -Subject: [PATCH] Prevent invalid container events - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 68c9de9121d9e60e509b38b5e866d87d3782bd6a..578568d841174b0d4adfda1916d30ac979df4b62 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -31,6 +31,8 @@ import java.util.function.UnaryOperator; - import java.util.stream.Collectors; - import java.util.stream.Stream; - import javax.annotation.Nullable; -+ -+import net.kyori.adventure.text.format.NamedTextColor; - import net.minecraft.ChatFormatting; - import net.minecraft.CrashReport; - import net.minecraft.CrashReportCategory; -@@ -2846,6 +2848,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser - public void handleContainerClick(ServerboundContainerClickPacket packet) { - PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); - if (this.player.isImmobile()) return; // CraftBukkit -+ - this.player.resetLastActionTime(); - if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit - boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if -@@ -2865,6 +2868,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser - return; - } - -+ // Scissors start - Do not call events when the slot/button number is invalid -+ final int sentSlotNum = packet.getSlotNum(); -+ if((Mth.clamp(sentSlotNum, -1, this.player.containerMenu.slots.size() - 1) != sentSlotNum) && sentSlotNum != -999) -+ { -+ this.getCraftPlayer().kick( -+ net.kyori.adventure.text.Component.text("Invalid container click slot (Hacking?)") -+ .color(NamedTextColor.RED) -+ ); -+ return; -+ } -+ // Scissors end -+ - InventoryView inventory = this.player.containerMenu.getBukkitView(); - SlotType type = inventory.getSlotType(packet.getSlotNum()); - diff --git a/patches/server/0034-Do-not-attempt-to-cast-items-to-recipes.patch b/patches/server/0034-Do-not-attempt-to-cast-items-to-recipes.patch deleted file mode 100644 index 1f69062..0000000 --- a/patches/server/0034-Do-not-attempt-to-cast-items-to-recipes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Sun, 10 Jul 2022 02:55:33 +0100 -Subject: [PATCH] Do not attempt to cast items to recipes - - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index 2a005e837108d1879da31e8054afbbd6bf7b175e..97bcfb36a37eb7d889d6233e7de9b7b53c8a8a5c 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -@@ -648,6 +648,13 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit - Entry entry = (Entry) objectiterator.next(); - - worldserver.getRecipeManager().byKey((ResourceLocation) entry.getKey()).ifPresent((irecipe) -> { -+ // Scissors start - Do not attempt to cast items to recipes -+ if (!(irecipe instanceof AbstractCookingRecipe)) -+ { -+ return; -+ } -+ // Scissors end -+ - list.add(irecipe); - AbstractFurnaceBlockEntity.createExperience(worldserver, vec3d, entry.getIntValue(), ((AbstractCookingRecipe) irecipe).getExperience(), blockposition, entityplayer, itemstack, amount); // CraftBukkit - }); diff --git a/patches/server/0035-Add-Scissors-configuration-file-command.patch b/patches/server/0035-Add-Scissors-configuration-file-command.patch deleted file mode 100644 index 5943346..0000000 --- a/patches/server/0035-Add-Scissors-configuration-file-command.patch +++ /dev/null @@ -1,483 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Sun, 10 Jul 2022 10:15:20 +0100 -Subject: [PATCH] Add Scissors configuration file & command - - -diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 06bff37e4c1fddd3be6343049a66787c63fb420c..1c1cb20190e8edb7f55a60fc662c28e204690223 100644 ---- a/src/main/java/co/aikar/timings/TimingsExport.java -+++ b/src/main/java/co/aikar/timings/TimingsExport.java -@@ -25,6 +25,7 @@ package co.aikar.timings; - - import com.google.common.collect.Sets; - import io.papermc.paper.adventure.PaperAdventure; -+import me.totalfreedom.scissors.ScissorsConfig; - import net.kyori.adventure.text.event.ClickEvent; - import net.kyori.adventure.text.format.NamedTextColor; - import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; -@@ -241,7 +242,8 @@ public class TimingsExport extends Thread { - parent.put("config", createObject( - pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), - pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), -- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)) -+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), -+ pair("scissors", mapAsJSON(ScissorsConfig.config, null)) // Scissors - )); - - new TimingsExport(listeners, parent, history).start(); -diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java b/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java -new file mode 100644 -index 0000000000000000000000000000000000000000..797677d892d83cf54d9a60af1e277b67ed3d6e95 ---- /dev/null -+++ b/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java -@@ -0,0 +1,150 @@ -+package me.totalfreedom.scissors; -+ -+import com.google.common.base.Functions; -+import com.google.common.base.Joiner; -+import com.google.common.collect.ImmutableSet; -+import com.google.common.collect.Iterables; -+import com.google.common.collect.Lists; -+import net.minecraft.resources.ResourceLocation; -+import net.minecraft.server.MinecraftServer; -+import org.bukkit.Bukkit; -+import org.bukkit.ChatColor; -+import org.bukkit.Location; -+import org.bukkit.command.Command; -+import org.bukkit.command.CommandSender; -+ -+import java.io.File; -+import java.util.*; -+import java.util.stream.Collectors; -+ -+public class ScissorsCommand extends Command -+{ -+ -+ private static final String BASE_PERM = "bukkit.command.scissors."; -+ private static final ImmutableSet SUBCOMMANDS = ImmutableSet.builder().add("reload", "version").build(); -+ -+ public ScissorsCommand(String name) -+ { -+ super(name); -+ this.description = "Scissors related commands"; -+ this.usageMessage = "/scissors [" + Joiner.on(" | ").join(SUBCOMMANDS) + "]"; -+ this.setPermission("bukkit.command.scissors;" + Joiner.on(';').join(SUBCOMMANDS.stream().map(s -> BASE_PERM + s).collect(Collectors.toSet()))); -+ } -+ -+ private static boolean testPermission(CommandSender commandSender, String permission) -+ { -+ if (commandSender.hasPermission(BASE_PERM + permission) || commandSender.hasPermission("bukkit.command.scissors")) -+ return true; -+ commandSender.sendMessage(Bukkit.getPermissionMessage()); // Sorry, kashike -+ return false; -+ } -+ -+ // Code from Mojang - copyright them -+ public static List getListMatchingLast(CommandSender sender, String[] args, String... matches) -+ { -+ return getListMatchingLast(sender, args, Arrays.asList(matches)); -+ } -+ -+ public static boolean matches(String s, String s1) -+ { -+ return s1.regionMatches(true, 0, s, 0, s.length()); -+ } -+ -+ public static List getListMatchingLast(CommandSender sender, String[] strings, Collection collection) -+ { -+ String last = strings[strings.length - 1]; -+ ArrayList results = Lists.newArrayList(); -+ -+ if (!collection.isEmpty()) -+ { -+ Iterator iterator = Iterables.transform(collection, Functions.toStringFunction()).iterator(); -+ -+ while (iterator.hasNext()) -+ { -+ String s1 = (String) iterator.next(); -+ -+ if (matches(last, s1) && (sender.hasPermission(BASE_PERM + s1) || sender.hasPermission("bukkit.command.scissors"))) -+ { -+ results.add(s1); -+ } -+ } -+ -+ if (results.isEmpty()) -+ { -+ iterator = collection.iterator(); -+ -+ while (iterator.hasNext()) -+ { -+ Object object = iterator.next(); -+ -+ if (object instanceof ResourceLocation && matches(last, ((ResourceLocation) object).getPath())) -+ { -+ results.add(String.valueOf(object)); -+ } -+ } -+ } -+ } -+ -+ return results; -+ } -+ -+ @Override -+ public List tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException -+ { -+ if (args.length <= 1) -+ return getListMatchingLast(sender, args, SUBCOMMANDS); -+ -+ return Collections.emptyList(); -+ } -+ // end copy stuff -+ -+ @Override -+ public boolean execute(CommandSender sender, String commandLabel, String[] args) -+ { -+ if (!testPermission(sender)) return true; -+ -+ if (args.length == 0) -+ { -+ sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage); -+ return false; -+ } -+ if (SUBCOMMANDS.contains(args[0].toLowerCase(Locale.ENGLISH))) -+ { -+ if (!testPermission(sender, args[0].toLowerCase(Locale.ENGLISH))) return true; -+ } -+ switch (args[0].toLowerCase(Locale.ENGLISH)) -+ { -+ case "reload": -+ doReload(sender); -+ break; -+ case "ver": -+ if (!testPermission(sender, "version")) -+ break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set) -+ case "version": -+ Command ver = MinecraftServer.getServer().server.getCommandMap().getCommand("version"); -+ if (ver != null) -+ { -+ ver.execute(sender, commandLabel, new String[0]); -+ break; -+ } -+ // else - fall through to default -+ default: -+ sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage); -+ return false; -+ } -+ -+ return true; -+ } -+ -+ private void doReload(CommandSender sender) -+ { -+ Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues."); -+ Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server."); -+ -+ MinecraftServer console = MinecraftServer.getServer(); -+ ScissorsConfig.init((File) console.options.valueOf("scissors-settings")); -+ console.server.reloadCount++; -+ -+ Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Scissors config reload complete."); -+ } -+} -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..e08f502fc7165f9f466217910210edb5059d39a8 ---- /dev/null -+++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java -@@ -0,0 +1,199 @@ -+package me.totalfreedom.scissors; -+ -+ -+import com.google.common.base.Throwables; -+import net.minecraft.server.MinecraftServer; -+import net.minecraft.server.dedicated.DedicatedServer; -+import org.bukkit.Bukkit; -+import org.bukkit.command.Command; -+import org.bukkit.configuration.InvalidConfigurationException; -+import org.bukkit.configuration.file.YamlConfiguration; -+ -+import java.io.File; -+import java.io.IOException; -+import java.lang.reflect.InvocationTargetException; -+import java.lang.reflect.Method; -+import java.lang.reflect.Modifier; -+import java.nio.file.Files; -+import java.nio.file.Path; -+import java.util.HashMap; -+import java.util.List; -+import java.util.Map; -+import java.util.logging.Level; -+import java.util.regex.Pattern; -+ -+// TODO - Migrate to new format -+public class ScissorsConfig -+{ -+ -+ private static final String HEADER = """ -+ This is the main configuration file for Scissors. -+ As you can see, there's tons to configure. Some options may impact gameplay, so use -+ with caution, and make sure you know what each option does before configuring. -+ -+ If you need help with the configuration or have any questions related to Scissors, -+ join us in our Discord. -+ -+ Discord: https://discord.com/invite/mtVQcHn58h -+ Website: https://scissors.gg/\s -+ Docs: https://scissors.gg/javadoc/1.19/\s -+ """; -+ private static final Pattern SPACE = Pattern.compile(" "); -+ private static final Pattern NOT_NUMERIC = Pattern.compile("[^-\\d.]"); -+ /*========================================================================*/ -+ public static YamlConfiguration config; -+ static int version; -+ /*========================================================================*/ -+ static Map commands; -+ private static File CONFIG_FILE; -+ -+ public static void init(File configFile) -+ { -+ final File configFolder = (File) DedicatedServer.getServer().options.valueOf("scissors-settings" + "-directory"); -+ final Path configFolderPath = configFolder.toPath(); -+ final Path oldConfigFilePath = configFile.toPath(); -+ final Path newConfigFilePath = configFolderPath.resolve(configFile.toPath()); -+ -+ if (configFile.exists()) -+ { -+ try -+ { -+ Files.move(oldConfigFilePath, newConfigFilePath); -+ } -+ catch (IOException e) -+ { -+ throw new RuntimeException("Error migrating configuration file to new directory!", e); -+ } -+ } -+ -+ CONFIG_FILE = newConfigFilePath.toFile(); -+ config = new YamlConfiguration(); -+ try -+ { -+ config.load(CONFIG_FILE); -+ } -+ catch (IOException ex) -+ { -+ } -+ catch (InvalidConfigurationException ex) -+ { -+ Bukkit.getLogger().log(Level.SEVERE, "Could not load scissors.yml, please correct your syntax errors", ex); -+ throw Throwables.propagate(ex); -+ } -+ -+ commands = new HashMap<>(); -+ commands.put("scissors", new ScissorsCommand("scissors")); -+ -+ config.options().header(HEADER); -+ config.options().copyDefaults(true); -+ -+ version = getInt("config-version", 1); -+ set("config-version", 1); -+ readConfig(ScissorsConfig.class, null); -+ } -+ -+ protected static void logError(String s) -+ { -+ Bukkit.getLogger().severe(s); -+ } -+ -+ protected static void fatal(String s) -+ { -+ throw new RuntimeException("Fatal scissors.yml config error: " + s); -+ } -+ -+ public static void registerCommands() -+ { -+ for (Map.Entry entry : commands.entrySet()) -+ { -+ MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Scissors", entry.getValue()); -+ } -+ } -+ -+ static void readConfig(Class clazz, Object instance) -+ { -+ for (Method method : clazz.getDeclaredMethods()) -+ { -+ if (Modifier.isPrivate(method.getModifiers())) -+ { -+ if (method.getParameterTypes().length == 0 && method.getReturnType() == Void.TYPE) -+ { -+ try -+ { -+ method.setAccessible(true); -+ method.invoke(instance); -+ } -+ catch (InvocationTargetException ex) -+ { -+ throw Throwables.propagate(ex.getCause()); -+ } -+ catch (Exception ex) -+ { -+ Bukkit.getLogger().log(Level.SEVERE, "Error invoking " + method, ex); -+ } -+ } -+ } -+ } -+ saveConfig(); -+ } -+ -+ static void saveConfig() -+ { -+ try -+ { -+ config.save(CONFIG_FILE); -+ } -+ catch (IOException ex) -+ { -+ Bukkit.getLogger().log(Level.SEVERE, "Could not save " + CONFIG_FILE, ex); -+ } -+ } -+ -+ public static boolean runCommandsInBooks = false; -+ -+ private static void runCommandsInBooks() { -+ runCommandsInBooks = getBoolean("runCommandsInBooks", false); -+ } -+ -+ private static void set(String path, Object val) -+ { -+ config.set(path, val); -+ } -+ -+ private static boolean getBoolean(String path, boolean def) -+ { -+ config.addDefault(path, def); -+ return config.getBoolean(path, config.getBoolean(path)); -+ } -+ -+ private static double getDouble(String path, double def) -+ { -+ config.addDefault(path, def); -+ return config.getDouble(path, config.getDouble(path)); -+ } -+ -+ private static float getFloat(String path, float def) -+ { -+ // TODO: Figure out why getFloat() always returns the default value. -+ return (float) getDouble(path, def); -+ } -+ -+ private static int getInt(String path, int def) -+ { -+ config.addDefault(path, def); -+ return config.getInt(path, config.getInt(path)); -+ } -+ -+ private static List getList(String path, T def) -+ { -+ config.addDefault(path, def); -+ return config.getList(path, config.getList(path)); -+ } -+ -+ private static String getString(String path, String def) -+ { -+ config.addDefault(path, def); -+ return config.getString(path, config.getString(path)); -+ } -+} -+ -diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 0a843e0afbcb1af8e2641515eb244b791b819b8c..f5c0375b171516c0ae734644b4449db8900143df 100644 ---- a/src/main/java/net/minecraft/server/Main.java -+++ b/src/main/java/net/minecraft/server/Main.java -@@ -114,6 +114,7 @@ public class Main { - // Paper start - load config files for access below if needed - org.bukkit.configuration.file.YamlConfiguration bukkitConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("bukkit-settings")); - org.bukkit.configuration.file.YamlConfiguration spigotConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("spigot-settings")); -+ org.bukkit.configuration.file.YamlConfiguration scissorsConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("scissors-settings")); // Scissors - TODO Change this - // Paper end - - Path path1 = Paths.get("eula.txt"); -diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index b42327dcf0cc9feaf4fdb67de949dd36cf71bbaa..b403405ca6783d1833381cb2b968bdc53743307e 100644 ---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -226,7 +226,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now - io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider - // Paper end -- -+ // Scissors start -+ try { -+ me.totalfreedom.scissors.ScissorsConfig.init((java.io.File) options.valueOf("scissors-settings")); -+ } catch (Exception e) { -+ DedicatedServer.LOGGER.error("Unable to load server configuration", e); -+ return false; -+ } -+ me.totalfreedom.scissors.ScissorsConfig.registerCommands(); -+ // Scissors end - this.setPvpAllowed(dedicatedserverproperties.pvp); - this.setFlightAllowed(dedicatedserverproperties.allowFlight); - this.setMotd(dedicatedserverproperties.motd); -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 10eecebce5eb8f9f062a10e9cbfbadbc54aec9b7..3c37c3912a0a66809c0bbb0d22590806766bbf9b 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -958,6 +958,8 @@ public final class CraftServer implements Server { - } - - org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot -+ me.totalfreedom.scissors.ScissorsConfig.init(((File) console.options.valueOf("scissors-settings"))); // Scissors -+ - this.console.paperConfigurations.reloadConfigs(this.console); - for (ServerLevel world : this.console.getAllLevels()) { - // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty -@@ -989,6 +991,7 @@ public final class CraftServer implements Server { - this.reloadData(); - org.spigotmc.SpigotConfig.registerCommands(); // Spigot - io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper -+ me.totalfreedom.scissors.ScissorsConfig.registerCommands(); // Scissors - this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); - this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); - -@@ -2724,6 +2727,12 @@ public final class CraftServer implements Server { - return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); - } - -+ @Override -+ public YamlConfiguration getScissorsConfig() -+ { -+ return me.totalfreedom.scissors.ScissorsConfig.config; -+ } -+ - @Override - public void 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 -index 3d624f3c980fa0f8ebcec36474768764265fa7cd..ea27620478b1238d14fb3747af2900e9b3de2219 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -165,6 +165,22 @@ public class Main { - .defaultsTo("Unknown Server") - .describedAs("Name"); - // Paper end -+ -+ // Scissors start -+ acceptsAll(asList("scissors-dir", "scissors-settings-directory"), "Directory for Scissors settings") -+ .withRequiredArg() -+ .ofType(File.class) -+ .defaultsTo(new File(io.papermc.paper.configuration.PaperConfigurations.CONFIG_DIR)) -+ .describedAs("Config directory"); -+ // Scissors end -+ -+ // Scissors start -+ acceptsAll(asList("scissors", "scissors-settings"), "File for scissors settings") -+ .withRequiredArg() -+ .ofType(File.class) -+ .defaultsTo(new File("scissors.yml")) -+ .describedAs("Yml file"); -+ // Scissors end - } - }; - diff --git a/patches/server/0036-Disable-running-commands-in-books-by-default.patch b/patches/server/0036-Disable-running-commands-in-books-by-default.patch deleted file mode 100644 index fdc8a86..0000000 --- a/patches/server/0036-Disable-running-commands-in-books-by-default.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Sun, 10 Jul 2022 10:29:03 +0100 -Subject: [PATCH] Disable running commands in books by default - - -diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java -index 31911c09fe15753ae32fa39417bdc9e9de552a88..8ef33e2e2374c456cb9d4aab8ed6f1742951f402 100644 ---- a/src/main/java/net/minecraft/world/item/WrittenBookItem.java -+++ b/src/main/java/net/minecraft/world/item/WrittenBookItem.java -@@ -2,6 +2,8 @@ package net.minecraft.world.item; - - import java.util.List; - import javax.annotation.Nullable; -+ -+import me.totalfreedom.scissors.ScissorsConfig; - import net.minecraft.ChatFormatting; - import net.minecraft.commands.CommandSourceStack; - import net.minecraft.core.BlockPos; -@@ -9,8 +11,7 @@ import net.minecraft.nbt.CompoundTag; - import net.minecraft.nbt.ListTag; - import net.minecraft.nbt.StringTag; - import net.minecraft.nbt.Tag; --import net.minecraft.network.chat.Component; --import net.minecraft.network.chat.ComponentUtils; -+import net.minecraft.network.chat.*; - import net.minecraft.stats.Stats; - import net.minecraft.util.StringUtil; - import net.minecraft.world.InteractionHand; -@@ -111,8 +112,7 @@ public class WrittenBookItem extends Item { - - public static boolean resolveBookComponents(ItemStack book, @Nullable CommandSourceStack commandSource, @Nullable Player player) { - CompoundTag compoundTag = book.getTag(); -- if (io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.resolveSelectorsInBooks && compoundTag != null && !compoundTag.getBoolean("resolved")) { // Paper -- compoundTag.putBoolean("resolved", true); -+ if (compoundTag != null) { // Paper - if (!makeSureTagIsValid(compoundTag)) { - return false; - } else { -@@ -161,8 +161,41 @@ public class WrittenBookItem extends Item { - component2 = Component.literal(text); - } - -- return Component.Serializer.toJson(component2); -+ return Component.Serializer.toJson(!ScissorsConfig.runCommandsInBooks ? sanitize(component2, 0) : component2); // Scissors - Allow server owners to disable run command in books -+ } -+ -+ // Scissors start - Allow server owners to disable run command in books -+ public static Component sanitize(Component component, int depth) { -+ if (depth > 128) { -+ return Component.nullToEmpty("Sanitization function depth limit exceeded"); -+ } -+ -+ MutableComponent component2 = component.copy(); -+ -+ final Style style = component2.getStyle(); -+ final ClickEvent clickEvent = style.getClickEvent(); -+ -+ if(clickEvent != null && clickEvent.getAction().equals(ClickEvent.Action.RUN_COMMAND)) -+ { -+ final String clickEventValue = clickEvent.getValue(); -+ -+ component2 = component2.copy().setStyle(style -+ .withClickEvent(null) -+ .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.nullToEmpty("Would've " + (clickEventValue.startsWith("/") ? "ran": "said") + ": " + clickEvent.getValue()))) -+ ); -+ } -+ -+ final List processedExtra = component2.getSiblings() -+ .stream() -+ .map(comp -> sanitize(comp, depth + 1)) -+ .toList(); -+ -+ component2.getSiblings().clear(); -+ component2.getSiblings().addAll(processedExtra); -+ -+ return component2; - } -+ // Scissors end - - @Override - public boolean isFoil(ItemStack stack) { diff --git a/patches/server/0037-Validate-block-entity-tag-query-positions.patch b/patches/server/0037-Validate-block-entity-tag-query-positions.patch deleted file mode 100644 index 8ab4a53..0000000 --- a/patches/server/0037-Validate-block-entity-tag-query-positions.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Luna -Date: Mon, 11 Jul 2022 17:29:12 -0300 -Subject: [PATCH] Validate block entity tag query positions - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5a8d4421c2de0680a3f4880451badcf5c4b46597..70b8e04d1b3081381956eaa969cbfbc6c91e1f45 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1303,7 +1303,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser - @Override - public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { - PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -- if (this.player.hasPermissions(2)) { -+ if (this.player.hasPermissions(2) && Level.isInSpawnableBounds(packet.getPos())) { // Scissors - Validate block entity tag query positions - BlockEntity tileentity = this.player.getLevel().getBlockEntity(packet.getPos()); - CompoundTag nbttagcompound = tileentity != null ? tileentity.saveWithoutMetadata() : null; - diff --git a/patches/server/0038-Fix-ClickEvents-on-Signs-bypassing-permissions.patch b/patches/server/0038-Fix-ClickEvents-on-Signs-bypassing-permissions.patch deleted file mode 100644 index 56a423c..0000000 --- a/patches/server/0038-Fix-ClickEvents-on-Signs-bypassing-permissions.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Wed, 13 Jul 2022 12:13:22 +0100 -Subject: [PATCH] Fix ClickEvents on Signs bypassing permissions - - -diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java -index e08f502fc7165f9f466217910210edb5059d39a8..42c833f58656ba80135419e18366f41a08f7d32d 100644 ---- a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java -+++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java -@@ -87,8 +87,8 @@ public class ScissorsConfig - config.options().header(HEADER); - config.options().copyDefaults(true); - -- version = getInt("config-version", 1); -- set("config-version", 1); -+ version = getInt("config-version", 2); -+ set("config-version", 2); - readConfig(ScissorsConfig.class, null); - } - -@@ -155,6 +155,13 @@ public class ScissorsConfig - runCommandsInBooks = getBoolean("runCommandsInBooks", false); - } - -+ // people still may want them to bypass permissions for warps -+ public static boolean commandSignsBypassPermissions = false; -+ public static void commandSignsBypassPermissions() -+ { -+ commandSignsBypassPermissions = getBoolean("commandSignsBypassPermissions", false); -+ } -+ - private static void set(String path, Object val) - { - config.set(path, val); -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 def4fdd2c7e4f925fa128692a744e5d10ae0203a..6ea38c4cb62c71e208b64629f8a427a40c062f3c 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 -@@ -1,11 +1,13 @@ - package net.minecraft.world.level.block.entity; - -+import me.totalfreedom.scissors.ScissorsConfig; - import com.mojang.brigadier.exceptions.CommandSyntaxException; - import java.util.UUID; - import java.util.function.Function; - import javax.annotation.Nullable; - import net.minecraft.commands.CommandSource; - import net.minecraft.commands.CommandSourceStack; -+import net.minecraft.commands.Commands; - import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; - import net.minecraft.network.chat.ClickEvent; -@@ -15,6 +17,7 @@ import net.minecraft.network.chat.ComponentUtils; - import net.minecraft.network.chat.MutableComponent; - import net.minecraft.network.chat.Style; - import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -+import net.minecraft.server.MinecraftServer; - import net.minecraft.server.level.ServerLevel; - import net.minecraft.server.level.ServerPlayer; - import net.minecraft.util.FormattedCharSequence; -@@ -23,6 +26,8 @@ import net.minecraft.world.item.DyeColor; - import net.minecraft.world.level.block.state.BlockState; - import net.minecraft.world.phys.Vec2; - import net.minecraft.world.phys.Vec3; -+import org.bukkit.craftbukkit.CraftServer; -+import org.bukkit.craftbukkit.entity.CraftPlayer; - - public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements - private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); // Paper -@@ -234,7 +239,21 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C - if (!event.callEvent()) { - return false; - } -- player.getServer().getCommands().performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle()), event.getMessage()); -+ -+ // Scissors start - Add optional permissions to command signs -+ final MinecraftServer vanillaServer = player.getServer(); -+ final CraftServer craftServer = vanillaServer.server; -+ final CraftPlayer craftPlayer = player.getBukkitEntity(); -+ final Commands commands = vanillaServer.getCommands(); -+ -+ if (ScissorsConfig.commandSignsBypassPermissions) -+ { -+ commands.performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle()), event.getMessage()); -+ } else -+ { -+ craftServer.dispatchCommand(craftPlayer, command.substring(1)); -+ } -+ // Scissors end - // Paper end - } - }