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

fix conflicts

This commit is contained in:
Adrian Siekierka 2017-05-13 14:44:07 +02:00
parent f8eac78aa4
commit 8773f5423a
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/block/BlockDeadbush.mapping
View File

@ -1,5 +1,5 @@
CLASS aoi net/minecraft/block/BlockDeadbush
FIELD a BOX Lbfm;
FIELD a BOX_DEADBUSH Lbfm;
METHOD a afterBreak (Lali;Lacu;Ldx;Lave;Latu;Lahf;)V
ARG 0 world
ARG 1 player

2
mappings/net/minecraft/block/BlockSapling.mapping
View File

@ -1,7 +1,7 @@
CLASS asd net/minecraft/block/BlockSapling
FIELD a TYPE Lavs;
FIELD c STAGE Lavt;
FIELD d BOX Lbfm;
FIELD d BOX_SAPLING Lbfm;
METHOD a deserializeState (I)Lave;
ARG 0 meta
METHOD a addStacksForDisplay (Lahd;Lagf;Lem;)V

1
mappings/net/minecraft/entity/ai/AiGoalTrackTarget.mapping
View File

@ -5,7 +5,6 @@ CLASS xu net/minecraft/entity/ai/AiGoalTrackTarget
FIELD d timeWithoutVisibility I
FIELD e entity Lus;
FIELD f checkVisibility Z
FIELD g target Luk;
FIELD h maxTimeWithoutVisibility I
METHOD <init> (Lus;Z)V
ARG 0 entity

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

@ -139,7 +139,7 @@ CLASS acu net/minecraft/entity/player/EntityPlayer
ARG 0 value
METHOD c isUsingEffectiveTool (Lave;)Z
ARG 0 state
METHOD c registerTagUpgraders (Lqv;)V
METHOD c registerTagUpgradersServer (Lqv;)V
ARG 0 handler
METHOD cA getMainHand ()Luj;
METHOD cP getScore ()I