mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix 2 conflicts. (#1038) 

ProtectionEnchantment.type conflicted with Enchantment.type
FoxEntity.wakeUp conflicted with LivingEntity.wakeUp
This commit is contained in:
modmuss50 2020-01-07 16:56:19 +00:00 committed by GitHub
parent 805178edc7
commit 88d6801de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping
View File

@ -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 <init> (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1900$class_1901;[Lnet/minecraft/class_1304;)V
ARG 1 weight
ARG 2 type

2
mappings/net/minecraft/entity/passive/FoxEntity.mapping
View File

@ -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