fix conflict

Legacy-Fabric · Aug 4, 2023 · b637a88 · b637a88
1 parent fc04d5b
commit b637a88
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping
@@ -42,9 +42,6 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 	METHOD method_7997 getMapState (Ljava/lang/Integer;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22;
 		ARG 0 id
 		ARG 1 world
-	METHOD method_7997 getMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22;
-		ARG 0 stack
-		ARG 1 world
 	METHOD method_7999 getMapColor (Lnet/minecraft/class_1799;)I
 		ARG 0 stack
 	METHOD method_8000 createMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_2874;)Lnet/minecraft/class_22;
@@ -100,6 +97,3 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 		ARG 1 world
 		ARG 2 entity
 		ARG 3 state
-	METHOD method_8001 getMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22;
-		ARG 0 map
-		ARG 1 world