From 1375af221306e621b4009d215c56c106b3d48256 Mon Sep 17 00:00:00 2001
From: +merlan #flirora <uruwi@protonmail.com>
Date: Wed, 11 Oct 2023 15:13:49 -0400
Subject: [PATCH] Fix name conflict

---
 mappings/net/minecraft/server/function/CommandFunction.mapping | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping
index bbba3159c1..686632c1c9 100644
--- a/mappings/net/minecraft/server/function/CommandFunction.mapping
+++ b/mappings/net/minecraft/server/function/CommandFunction.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction
-	METHOD comp_1994 getId ()Lnet/minecraft/class_2960;
+	METHOD comp_1994 id ()Lnet/minecraft/class_2960;
 	METHOD method_52592 continuesToNextLine (Ljava/lang/CharSequence;)Z
 		ARG 0 string
 	METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;Ljava/lang/Object;)Lnet/minecraft/class_8868;