From 88d6801de18d2bdf3422bb21531e05f808694583 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 7 Jan 2020 16:56:19 +0000 Subject: [PATCH] Fix 2 conflicts. (#1038) ProtectionEnchantment.type conflicted with Enchantment.type FoxEntity.wakeUp conflicted with LivingEntity.wakeUp --- .../net/minecraft/enchantment/ProtectionEnchantment.mapping | 2 +- mappings/net/minecraft/entity/passive/FoxEntity.mapping | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping index 1274301605..3dd5839abb 100644 --- a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1900 net/minecraft/enchantment/ProtectionEnchantment - FIELD field_9133 type Lnet/minecraft/class_1900$class_1901; + FIELD field_9133 protectionType Lnet/minecraft/class_1900$class_1901; METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1900$class_1901;[Lnet/minecraft/class_1304;)V ARG 1 weight ARG 2 type diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 65c945aa47..4596b12d36 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18280 addTypeSpecificGoals ()V METHOD method_18281 getTrustedUuids ()Ljava/util/List; METHOD method_18282 isAggressive ()Z - METHOD method_18283 wakeUp ()V + METHOD method_18283 stopSleeping ()V METHOD method_18284 stopActions ()V METHOD method_18285 wantsToPickupItem ()Z METHOD method_18289 spit (Lnet/minecraft/class_1799;)V