fix conflict

OrnitheMC · Jun 26, 2024 · 33e975e · 33e975e
1 parent 13f1ad0
commit 33e975e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mappings/1.3.1#12w32a.tinydiff b/mappings/1.3.1#12w32a.tinydiff
@@ -71,8 +71,8 @@ c	net/minecraft/unmapped/C_1013763
 	m	()V	m_0480570		updateHandSwing
 	m	(I)V	m_7500176		removeStatusEffect
 		p	1			id
-	m	(I)Lnet/minecraft/unmapped/C_2750078;	m_4716717		getStackInInventory
-		p	1			id
+	m	(I)Lnet/minecraft/unmapped/C_2750078;	m_4716717		getItem
+		p	1			slot
 	m	(I)Lnet/minecraft/unmapped/C_2750078;	m_5792818		getArmor
 		p	1			slot
 	m	(ILnet/minecraft/unmapped/C_2750078;)V	m_0129682		m_0129682

diff --git a/mappings/12w32a#12w34a.tinydiff b/mappings/12w32a#12w34a.tinydiff
@@ -41,8 +41,8 @@ c	net/minecraft/unmapped/C_1013763
 		c		An array containing the probability of a mob dropping their inventory. These are sorted by increasing probability with item[0] being difficulty easy and item[3] being difficulty hard.
 	f	Z	f_9177400		capPickUpLoot
 	m	()Lnet/minecraft/unmapped/C_2750078;	m_2674028	getStackInHand	
-	m	(I)Lnet/minecraft/unmapped/C_2750078;	m_4716717	getStackInInventory	
-		p	1		id	
+	m	(I)Lnet/minecraft/unmapped/C_2750078;	m_4716717	getItem	
+		p	1		slot	
 	m	()[Lnet/minecraft/unmapped/C_2750078;	m_9919834	m_9919834	
 	m	(II)Lnet/minecraft/unmapped/C_4030632;	m_9577593
 		p	2		p_2