From b50f9eceff4bd4e1fb7c9bf5beef8a0927efd851 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 24 Apr 2024 09:39:22 +0100 Subject: [PATCH] Fix command argument types for 1.20.5 --- proxy/build.gradle.kts | 1 + .../protocol/packet/brigadier/ArgumentPropertyRegistry.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts index 0edd10cce..5e1387b06 100644 --- a/proxy/build.gradle.kts +++ b/proxy/build.gradle.kts @@ -8,6 +8,7 @@ plugins { application { mainClass.set("com.velocitypowered.proxy.Velocity") + applicationDefaultJvmArgs += listOf("-Dvelocity.packet-decode-logging=true"); } tasks { diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java index 17bdd976f..7c04c97bc 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ArgumentPropertyRegistry.java @@ -262,9 +262,9 @@ public class ArgumentPropertyRegistry { empty(id("minecraft:uuid", mapSet(MINECRAFT_1_20_5, 53), mapSet(MINECRAFT_1_20_3, 48), mapSet(MINECRAFT_1_19_4, 48), mapSet(MINECRAFT_1_19, 47))); // added in 1.16 - empty(id("minecraft:loot_table", mapSet(MINECRAFT_1_20_5, 50)), RegistryIdArgumentSerializer.REGISTRY_ID); - empty(id("minecraft:loot_predicate", mapSet(MINECRAFT_1_20_5, 51)), RegistryIdArgumentSerializer.REGISTRY_ID); - empty(id("minecraft:loot_modifier", mapSet(MINECRAFT_1_20_5, 52)), RegistryIdArgumentSerializer.REGISTRY_ID); + empty(id("minecraft:loot_table", mapSet(MINECRAFT_1_20_5, 50))); + empty(id("minecraft:loot_predicate", mapSet(MINECRAFT_1_20_5, 51))); + empty(id("minecraft:loot_modifier", mapSet(MINECRAFT_1_20_5, 52))); // Crossstitch support register(id("crossstitch:mod_argument", mapSet(MINECRAFT_1_19, -256)), ModArgumentProperty.class, MOD);