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

fix Entity.getName() conflict

This commit is contained in:
asie 2018-11-07 20:46:53 +01:00
parent 13fa40451a
commit a1b90d58a7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/entity/Entity.mapping
View File

@ -221,7 +221,7 @@ CLASS afy net/minecraft/entity/Entity
METHOD bu doesRenderOnFire ()Z
METHOD bv getUuid ()Ljava/util/UUID;
METHOD bw getUuidAsString ()Ljava/lang/String;
METHOD bx getName ()Ljava/lang/String;
METHOD bx getEntityName ()Ljava/lang/String;
METHOD by canFly ()Z
METHOD bz getRenderDistanceMultiplier ()D
METHOD c handleFallDamage (FF)V

2
mappings/net/minecraft/entity/player/EntityPlayer.mapping
View File

@ -111,7 +111,7 @@ CLASS apv net/minecraft/entity/player/EntityPlayer
METHOD bX getSoundCategory ()Lxb;
METHOD bd isSwimming ()Z
METHOD bj stickInWeb ()V
METHOD bx getName ()Ljava/lang/String;
METHOD bx getEntityName ()Ljava/lang/String;
METHOD by canFly ()Z
METHOD c handleFallDamage (FF)V
ARG 1 fallDistance

2
mappings/net/minecraft/util/CustomNameable.mapping → mappings/net/minecraft/util/EntityNameable.mapping
View File

@ -1,4 +1,4 @@
CLASS aey net/minecraft/util/CustomNameable
CLASS aey net/minecraft/util/EntityNameable
METHOD O_ getName ()Liz;
METHOD P_ hasCustomName ()Z
METHOD Q getDisplayedName ()Liz;