From afaf4b010bd6cbef9a60baa234f994ccf5ceed1e Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Wed, 12 Dec 2018 05:36:16 -0500 Subject: [PATCH] Assorted dragon fight work (#258) * Assorted dragon fight work * PhaseBase -> AbstractPhase, PhaseBaseOther -> AbstractSittingPhase * crystalWasDamaged -> crystalDestroyed * More dragon fight work --- .../client/network/ClientPlayerEntity.mapping | 1 + .../network/OtherClientPlayerEntity.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 1 + .../entity/ExperienceOrbEntity.mapping | 1 + .../net/minecraft/entity/ItemEntity.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 1 + .../entity/boss/EntityWither.mapping | 1 + .../entity/boss/ServerBossBar.mapping | 2 ++ .../boss/dragon/EnderDragonEntity.mapping | 9 +++++++ .../boss/dragon/EnderDragonFight.mapping | 26 +++++++++++++++++++ .../boss/dragon/phase/AbstractPhase.mapping | 16 ++++++++++++ .../dragon/phase/AbstractSittingPhase.mapping | 7 +++++ .../dragon/phase/ChargingPlayerPhase.mapping | 7 +++++ .../boss/dragon/phase/DyingPhase.mapping | 4 +++ .../dragon/phase/HoldingPatternPhase.mapping | 9 +++++++ .../boss/dragon/phase/HoverPhase.mapping | 4 +++ .../dragon/phase/LandingApproachPhase.mapping | 4 +++ .../boss/dragon/phase/LandingPhase.mapping | 4 +++ .../entity/boss/dragon/phase/Phase.mapping | 12 +++++++++ .../boss/dragon/phase/PhaseManager.mapping | 9 +++++++ .../boss/dragon/phase/PhaseType.mapping | 14 ++++++++++ .../phase/SittingAttackingPhase.mapping | 3 +++ .../dragon/phase/SittingFlamingPhase.mapping | 4 +++ .../dragon/phase/SittingScanningPhase.mapping | 3 +++ .../dragon/phase/StrafePlayerPhase.mapping | 4 +++ .../boss/dragon/phase/TakeoffPhase.mapping | 4 +++ .../AbstractDecorationEntity.mapping | 1 + .../decoration/ArmorStandEntity.mapping | 1 + .../decoration/EnderCrystalEntity.mapping | 3 +++ .../entity/decoration/ItemFrameEntity.mapping | 1 + .../entity/mob/EndermanEntity.mapping | 1 + .../minecraft/entity/mob/GhastEntity.mapping | 1 + .../entity/mob/GuardianEntity.mapping | 1 + .../entity/mob/HostileEntity.mapping | 1 + .../entity/mob/PigZombieEntity.mapping | 1 + .../entity/mob/ShulkerEntity.mapping | 1 + .../entity/mob/SilverfishEntity.mapping | 1 + .../minecraft/entity/mob/ZombieEntity.mapping | 1 + .../minecraft/entity/parts/EntityPart.mapping | 1 + .../parts/IEntityPartDamageDelegate.mapping | 1 + .../entity/passive/AnimalEntity.mapping | 1 + .../entity/passive/BatEntity.mapping | 1 + .../entity/passive/HorseBaseEntity.mapping | 1 + .../entity/passive/OcelotEntity.mapping | 1 + .../entity/passive/PandaEntity.mapping | 1 + .../entity/passive/ParrotEntity.mapping | 1 + .../entity/passive/RabbitEntity.mapping | 1 + .../entity/passive/SquidEntity.mapping | 1 + .../entity/passive/WolfEntity.mapping | 1 + .../entity/player/PlayerEntity.mapping | 1 + .../projectile/DragonFireballEntity.mapping | 1 + .../ExplodingWitherSkullEntity.mapping | 1 + .../ExplosiveProjectileEntity.mapping | 1 + .../projectile/ShulkerBulletEntity.mapping | 1 + .../projectile/SmallFireballEntity.mapping | 1 + .../vehicle/AbstractMinecartEntity.mapping | 1 + .../entity/vehicle/BoatEntity.mapping | 1 + .../entity/vehicle/TNTMinecartEntity.mapping | 1 + .../server/network/ServerPlayerEntity.mapping | 1 + 59 files changed, 187 insertions(+) create mode 100644 mappings/net/minecraft/entity/boss/dragon/phase/AbstractPhase.mapping create mode 100644 mappings/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.mapping diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 7b452d7439..2e98603466 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -16,6 +16,7 @@ CLASS dbx net/minecraft/client/network/ClientPlayerEntity METHOD a openContainer (Lafe;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a copyEntityData (Lagk;)V METHOD a startRiding (Lagk;Z)Z ARG 1 entity diff --git a/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping index 0dd806d1a5..f5941a17f5 100644 --- a/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping @@ -5,5 +5,6 @@ CLASS dby net/minecraft/client/network/OtherClientPlayerEntity METHOD a shouldRenderAtDistance (D)Z METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a appendCommandFeedback (Ljb;)V METHOD k updateMovement ()V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 5dd2b619c5..41fdadced3 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -94,6 +94,7 @@ CLASS agk net/minecraft/entity/Entity ARG 1 width METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a startRiding (Lagk;Z)Z ARG 1 entity METHOD a setEquippedStack (Lagp;Lavu;)V diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index 2ecb8c37e2..d7abfdc79a 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -11,6 +11,7 @@ CLASS agq net/minecraft/entity/ExperienceOrbEntity ARG 0 value METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a readCustomDataFromTag (Lhq;)V METHOD aA getLightmapCoordinates ()I METHOD aw onSwimmingStart ()V diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index c19d97148c..2c025a3cf1 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -9,6 +9,7 @@ CLASS aon net/minecraft/entity/ItemEntity METHOD a setPickupDelay (I)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a tryMerge (Laon;)Z METHOD a changeDimension (Lbrf;)Lagk; METHOD a readCustomDataFromTag (Lhq;)V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index e991d3f353..30532c9195 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -44,6 +44,7 @@ CLASS agt net/minecraft/entity/LivingEntity METHOD a onDeath (Laft;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a dropEquipment (Laft;IZ)V METHOD a hasPotionEffect (Lagc;)Z METHOD a isEquippedStackValid (Lagp;)Z diff --git a/mappings/net/minecraft/entity/boss/EntityWither.mapping b/mappings/net/minecraft/entity/boss/EntityWither.mapping index 5dc69e93b0..a8d402572f 100644 --- a/mappings/net/minecraft/entity/boss/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/EntityWither.mapping @@ -12,6 +12,7 @@ CLASS any net/minecraft/entity/boss/EntityWither ARG 1 headIndex METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a dropEquipment (Laft;IZ)V METHOD a attack (Lagt;F)V ARG 1 target diff --git a/mappings/net/minecraft/entity/boss/ServerBossBar.mapping b/mappings/net/minecraft/entity/boss/ServerBossBar.mapping index 37d94bc144..b7879d2fca 100644 --- a/mappings/net/minecraft/entity/boss/ServerBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/ServerBossBar.mapping @@ -7,3 +7,5 @@ CLASS ui net/minecraft/entity/boss/ServerBossBar METHOD a setDarkenSky (Z)Laeu; METHOD b setDragonMusic (Z)Laeu; METHOD c setThickenFog (Z)Laeu; + METHOD d setVisible (Z)V + ARG 1 visible diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index 972a28a29a..1207bbf1bd 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -1,4 +1,5 @@ CLASS ane net/minecraft/entity/boss/dragon/EnderDragonEntity + FIELD a PHASE_TYPE Lpo; FIELD bF parts [Lanc; FIELD bG partHead Lanc; FIELD bH partNeck Lanc; @@ -17,9 +18,15 @@ CLASS ane net/minecraft/entity/boss/dragon/EnderDragonEntity METHOD U kill ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a damage (Lanc;Laft;F)Z ARG 1 part ARG 2 source + ARG 3 amount + METHOD a crystalDestroyed (Land;Let;Laft;)V + ARG 1 crystal + ARG 2 pos + ARG 3 source METHOD a readCustomDataFromTag (Lhq;)V METHOD a onTrackedDataSet (Lpo;)V METHOD aD doesCollide ()Z @@ -31,6 +38,8 @@ CLASS ane net/minecraft/entity/boss/dragon/EnderDragonEntity METHOD cH getSoundVolume ()F METHOD ca initAttributes ()V METHOD cc updatePostDeath ()V + METHOD dr getPhaseManager ()Lanv; + METHOD ds getFight ()Lbrj; METHOD e getHurtSound (Laft;)Lxg; METHOD k updateMovement ()V METHOD n canStartRiding (Lagk;)Z diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index 58526271cd..1bd1020b32 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -1 +1,27 @@ CLASS brj net/minecraft/entity/boss/dragon/EnderDragonFight + CLASS brj$a LoadState + CLASS brj$b + FIELD b loadState Lbrj$a; + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c bossBar Lui; + FIELD d world Luk; + FIELD e gateways Ljava/util/List; + FIELD k dragonKilled Z + FIELD l previouslyKilled Z + FIELD m dragonUuid Ljava/util/UUID; + FIELD o exitPortalLocation Let; + FIELD r crystals Ljava/util/List; + METHOD (Luk;Lhq;)V + ARG 1 world + ARG 2 tag + METHOD a toTag ()Lhq; + METHOD a crystalDestroyed (Land;Laft;)V + ARG 1 enderCrystal + ARG 2 source + METHOD a dragonKilled (Lane;)V + ARG 1 dragon + METHOD b updateFight (Lane;)V + ARG 1 dragon + METHOD g convertFromLegacy ()V + METHOD i worldContainsEndPortal ()Z + METHOD n createDragon ()Lane; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/AbstractPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/AbstractPhase.mapping new file mode 100644 index 0000000000..0942a5529d --- /dev/null +++ b/mappings/net/minecraft/entity/boss/dragon/phase/AbstractPhase.mapping @@ -0,0 +1,16 @@ +CLASS ang net/minecraft/entity/boss/dragon/phase/AbstractPhase + FIELD a dragon Lane; + METHOD (Lane;)V + ARG 1 dragon + METHOD a modifyDamageTaken (Lanc;Laft;F)F + ARG 1 part + ARG 2 source + ARG 3 amount + METHOD a crystalDestroyed (Land;Let;Laft;Laql;)V + ARG 1 crystal + ARG 2 pos + ARG 3 source + ARG 4 player + METHOD d beginPhase ()V + METHOD e endPhase ()V + METHOD g getTarget ()Lckz; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.mapping new file mode 100644 index 0000000000..9e7c6f842c --- /dev/null +++ b/mappings/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.mapping @@ -0,0 +1,7 @@ +CLASS anh net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD a modifyDamageTaken (Lanc;Laft;F)F + ARG 1 part + ARG 2 source + ARG 3 amount diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping index 29f5758a40..2b1dfc5e39 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping @@ -1,3 +1,10 @@ CLASS ani net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c target Lckz; + METHOD (Lane;)V + ARG 1 dragon + METHOD a setTarget (Lckz;)V + ARG 1 target + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping index a70d67e51b..db8bc1542a 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping @@ -1,2 +1,6 @@ CLASS anj net/minecraft/entity/boss/dragon/phase/DyingPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping index a4b133985e..3241520377 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping @@ -1,2 +1,11 @@ CLASS ank net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD a crystalDestroyed (Land;Let;Laft;Laql;)V + ARG 1 crystal + ARG 2 pos + ARG 3 source + ARG 4 player + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/HoverPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/HoverPhase.mapping index 586f29d870..195141f194 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/HoverPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/HoverPhase.mapping @@ -1,2 +1,6 @@ CLASS anl net/minecraft/entity/boss/dragon/phase/HoverPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping index 43f0bba53d..abdd793c68 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping @@ -1,2 +1,6 @@ CLASS anm net/minecraft/entity/boss/dragon/phase/LandingApproachPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/LandingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/LandingPhase.mapping index 41661ca0bd..33075e5108 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/LandingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/LandingPhase.mapping @@ -1,2 +1,6 @@ CLASS ann net/minecraft/entity/boss/dragon/phase/LandingPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping index 42c1dbe4ab..33b433b865 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping @@ -1,2 +1,14 @@ CLASS ano net/minecraft/entity/boss/dragon/phase/Phase + METHOD a modifyDamageTaken (Lanc;Laft;F)F + ARG 1 part + ARG 2 source + ARG 3 amount + METHOD a crystalDestroyed (Land;Let;Laft;Laql;)V + ARG 1 crystal + ARG 2 pos + ARG 3 source + ARG 4 player + METHOD d beginPhase ()V + METHOD e endPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/PhaseManager.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/PhaseManager.mapping index d87a776cb4..1d2977c655 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/PhaseManager.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/PhaseManager.mapping @@ -1,3 +1,12 @@ CLASS anv net/minecraft/entity/boss/dragon/phase/PhaseManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b dragon Lane; + FIELD c phases [Lano; + FIELD d current Lano; + METHOD (Lane;)V + ARG 1 dragon + METHOD a getCurrent ()Lano; METHOD a setPhase (Lanu;)V + ARG 1 type + METHOD b create (Lanu;)Lano; + ARG 1 type diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping index aa0fda8c31..980d8adc40 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping @@ -11,6 +11,20 @@ CLASS anu net/minecraft/entity/boss/dragon/phase/PhaseType FIELD j DYING Lanu; FIELD k HOVER Lanu; FIELD l types [Lanu; + FIELD m phaseClass Ljava/lang/Class; + FIELD n id I + FIELD o name Ljava/lang/String; + METHOD (ILjava/lang/Class;Ljava/lang/String;)V + ARG 1 id + ARG 2 phaseClass + ARG 3 name METHOD a getConstructor ()Ljava/lang/reflect/Constructor; + METHOD a getFromId (I)Lanu; + ARG 0 id METHOD a create (Lane;)Lano; + ARG 1 dragon METHOD a register (Ljava/lang/Class;Ljava/lang/String;)Lanu; + ARG 0 phaseClass + ARG 1 name + METHOD b getTypeId ()I + METHOD c count ()I diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping index 0b0e7ee788..1f51cfd4e2 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping @@ -1,2 +1,5 @@ CLASS anp net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping index 05e3c23204..5fcc3ceb98 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping @@ -1,2 +1,6 @@ CLASS anq net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V + METHOD e endPhase ()V METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping index aa6165b1b4..0924136c8c 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping @@ -1,2 +1,5 @@ CLASS anr net/minecraft/entity/boss/dragon/phase/SittingScanningPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping index 5f83eb5883..e427a34b45 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping @@ -1,3 +1,7 @@ CLASS ans net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping index cef2981055..3cca57af10 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping @@ -1,2 +1,6 @@ CLASS ant net/minecraft/entity/boss/dragon/phase/TakeoffPhase + METHOD (Lane;)V + ARG 1 dragon + METHOD d beginPhase ()V + METHOD g getTarget ()Lckz; METHOD i getType ()Lanu; diff --git a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping index ff6ba11cef..f4264e1def 100644 --- a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping @@ -9,6 +9,7 @@ CLASS aob net/minecraft/entity/decoration/AbstractDecorationEntity METHOD T_ update ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a copyEntityData (Lagk;)V METHOD a move (Lagy;DDD)V ARG 1 type diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index ad48a3f101..a3fc10e84c 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -34,6 +34,7 @@ CLASS aoa net/minecraft/entity/decoration/ArmorStandEntity ARG 1 width METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a setEquippedStack (Lagp;Lavu;)V ARG 1 slot METHOD a onStruckByLightning (Laok;)V diff --git a/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping b/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping index 2009a2fa50..fcaacc9c17 100644 --- a/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping @@ -4,8 +4,11 @@ CLASS and net/minecraft/entity/decoration/EnderCrystalEntity METHOD T_ update ()V METHOD U kill ()V METHOD a shouldRenderAtDistance (D)Z + METHOD a crystalDestroyed (Laft;)V + ARG 1 source METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a setBeamTarget (Let;)V METHOD a readCustomDataFromTag (Lhq;)V METHOD a setShowBottom (Z)V diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index d9e563f3d0..2cef029b31 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -8,6 +8,7 @@ CLASS aoc net/minecraft/entity/decoration/ItemFrameEntity ARG 1 value METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a copyEntityData (Lagk;)V METHOD a setHeldItemStack (Lavu;Z)V ARG 1 value diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 7f44aaf7e8..3cb693da32 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -20,6 +20,7 @@ CLASS aoy net/minecraft/entity/mob/EndermanEntity METHOD H mobTick ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a dropEquipment (Laft;IZ)V METHOD a readCustomDataFromTag (Lhq;)V METHOD a onTrackedDataSet (Lpo;)V diff --git a/mappings/net/minecraft/entity/mob/GhastEntity.mapping b/mappings/net/minecraft/entity/mob/GhastEntity.mapping index 400b527e3e..c40f8375a5 100644 --- a/mappings/net/minecraft/entity/mob/GhastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GhastEntity.mapping @@ -23,6 +23,7 @@ CLASS apc net/minecraft/entity/mob/GhastEntity METHOD T_ update ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a readCustomDataFromTag (Lhq;)V METHOD a setShooting (Z)V METHOD b writeCustomDataToTag (Lhq;)V diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping index ecabc40e56..5d47cb829c 100644 --- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping @@ -13,6 +13,7 @@ CLASS ape net/minecraft/entity/mob/GuardianEntity METHOD D getAmbientSound ()Lxg; METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a onTrackedDataSet (Lpo;)V METHOD b createNavigation (Lbas;)Lakv; METHOD bG getEyeHeight ()F diff --git a/mappings/net/minecraft/entity/mob/HostileEntity.mapping b/mappings/net/minecraft/entity/mob/HostileEntity.mapping index 776ae950ae..ae25f2d962 100644 --- a/mappings/net/minecraft/entity/mob/HostileEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HostileEntity.mapping @@ -4,6 +4,7 @@ CLASS apj net/minecraft/entity/mob/HostileEntity METHOD T_ update ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD af getSoundSwim ()Lxg; METHOD ag getSoundSplash ()Lxg; METHOD bW getSoundCategory ()Lxi; diff --git a/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping b/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping index ad36824a45..4bcdfb5a5d 100644 --- a/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping @@ -6,6 +6,7 @@ CLASS apm net/minecraft/entity/mob/PigZombieEntity METHOD a initEquipment (Lafc;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a copyEntityData (Lagk;)V METHOD a setAttacker (Lagt;)V METHOD a interactMob (Laql;Lafd;)Z diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index c95946b6cd..0590e9492e 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -29,6 +29,7 @@ CLASS apq net/minecraft/entity/mob/ShulkerEntity METHOD a setPeekAmount (I)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a move (Lagy;DDD)V ARG 1 type ARG 2 x diff --git a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping index 64a0ce24c1..6857f90aca 100644 --- a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping @@ -10,6 +10,7 @@ CLASS apr net/minecraft/entity/mob/SilverfishEntity METHOD T_ update ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a playStepSound (Let;Lbom;)V ARG 1 pos METHOD aK getHeightOffset ()D diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 472a20833e..a06968bef4 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -13,6 +13,7 @@ CLASS aqb net/minecraft/entity/mob/ZombieEntity METHOD a initEquipment (Lafc;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a dropEquipment (Laft;IZ)V METHOD a (Lbat;Lafc;Lagw;Lahe;Lhq;)Lahe; ARG 3 difficulty diff --git a/mappings/net/minecraft/entity/parts/EntityPart.mapping b/mappings/net/minecraft/entity/parts/EntityPart.mapping index 8aaad8b803..ede8619f84 100644 --- a/mappings/net/minecraft/entity/parts/EntityPart.mapping +++ b/mappings/net/minecraft/entity/parts/EntityPart.mapping @@ -7,6 +7,7 @@ CLASS anc net/minecraft/entity/parts/EntityPart ARG 3 width METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a readCustomDataFromTag (Lhq;)V METHOD aD doesCollide ()Z METHOD b writeCustomDataToTag (Lhq;)V diff --git a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping index 3c9fd1d3d0..4fe68b7d32 100644 --- a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping +++ b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping @@ -4,3 +4,4 @@ CLASS anb net/minecraft/entity/parts/IEntityPartDamageDelegate METHOD a damage (Lanc;Laft;F)Z ARG 1 part ARG 2 source + ARG 3 amount diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index 6d8de4144c..6ce3b0ad02 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -5,6 +5,7 @@ CLASS alp net/minecraft/entity/passive/AnimalEntity METHOD H mobTick ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a interactMob (Laql;Lafd;)Z ARG 1 player METHOD a readCustomDataFromTag (Lhq;)V diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping index 4c400d6454..ec378d01bf 100644 --- a/mappings/net/minecraft/entity/passive/BatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping @@ -6,6 +6,7 @@ CLASS alk net/minecraft/entity/passive/BatEntity METHOD T_ update ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a readCustomDataFromTag (Lhq;)V METHOD a setRoosting (Z)V METHOD b writeCustomDataToTag (Lhq;)V diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index d089538a95..494777f672 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -13,6 +13,7 @@ CLASS amp net/minecraft/entity/passive/HorseBaseEntity METHOD a onInvChange (Laex;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a createChild (Lagh;)Lagh; METHOD a canBeLeashedBy (Laql;)Z METHOD a (Lbat;Lafc;Lagw;Lahe;Lhq;)Lahe; diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index eb04ac976b..a22199be17 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -6,6 +6,7 @@ CLASS aly net/minecraft/entity/passive/OcelotEntity METHOD H mobTick ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a createChild (Lagh;)Lagh; METHOD a interactMob (Laql;Lafd;)Z ARG 1 player diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 56a09b15a0..5fb10e367b 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -35,6 +35,7 @@ CLASS alz net/minecraft/entity/passive/PandaEntity METHOD T_ update ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a createChild (Lagh;)Lagh; METHOD a setAttacker (Lagt;)V METHOD a canBeLeashedBy (Laql;)Z diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index d1a5c593d6..b91ac9b113 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -4,6 +4,7 @@ CLASS ama net/minecraft/entity/passive/ParrotEntity METHOD D getAmbientSound ()Lxg; METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a createChild (Lagh;)Lagh; METHOD a interactMob (Laql;Lafd;)Z ARG 1 player diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 437dd134ad..d148a78c28 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -20,6 +20,7 @@ CLASS ame net/minecraft/entity/passive/RabbitEntity METHOD H mobTick ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a createChild (Lagh;)Lagh; METHOD a (Lbat;Lafc;Lagw;Lahe;Lhq;)Lahe; ARG 3 difficulty diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index 15e7a5ca70..4781bf20b5 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -9,6 +9,7 @@ CLASS amj net/minecraft/entity/passive/SquidEntity METHOD D getAmbientSound ()Lxg; METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD bG getEyeHeight ()F METHOD cH getSoundVolume ()F METHOD ca initAttributes ()V diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 43b442d5bd..5bddc89e5b 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -11,6 +11,7 @@ CLASS amn net/minecraft/entity/passive/WolfEntity METHOD T_ update ()V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a createChild (Lagh;)Lagh; METHOD a canBeLeashedBy (Laql;)Z METHOD a interactMob (Laql;Lafd;)Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index adda661e78..2ee8fcc828 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -52,6 +52,7 @@ CLASS aql net/minecraft/entity/player/PlayerEntity METHOD a onDeath (Laft;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a copyEntityData (Lagk;)V METHOD a interact (Lagk;Lafd;)Laff; ARG 1 entity diff --git a/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping index 335e6ed96a..1764f22853 100644 --- a/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping @@ -1,6 +1,7 @@ CLASS aqs net/minecraft/entity/projectile/DragonFireballEntity METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a onCollision (Lckw;)V METHOD aD doesCollide ()Z METHOD k getParticleType ()Lft; diff --git a/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping index cc437b742d..b3a4bb802e 100644 --- a/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping @@ -2,6 +2,7 @@ CLASS ark net/minecraft/entity/projectile/ExplodingWitherSkullEntity FIELD e CHARGED Lpo; METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a getEffectiveExplosionResistance (Lbal;Lbae;Let;Lbom;Lcdz;F)F ARG 1 explosion ARG 2 world diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index da6e12d0c6..d5c7eb7e6e 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -9,6 +9,7 @@ CLASS aqq net/minecraft/entity/projectile/ExplosiveProjectileEntity METHOD a shouldRenderAtDistance (D)Z METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a onCollision (Lckw;)V METHOD a readCustomDataFromTag (Lhq;)V METHOD aA getLightmapCoordinates ()I diff --git a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping index 97d54212f3..16138e5296 100644 --- a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping @@ -3,6 +3,7 @@ CLASS ara net/minecraft/entity/projectile/ShulkerBulletEntity METHOD a shouldRenderAtDistance (D)Z METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a readCustomDataFromTag (Lhq;)V METHOD aA getLightmapCoordinates ()I METHOD aD doesCollide ()Z diff --git a/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping index 6880beecf8..d4bec1ffc9 100644 --- a/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping @@ -1,5 +1,6 @@ CLASS arb net/minecraft/entity/projectile/SmallFireballEntity METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a onCollision (Lckw;)V METHOD aD doesCollide ()Z diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 3464f7a92d..cd14a982cd 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -28,6 +28,7 @@ CLASS arp net/minecraft/entity/vehicle/AbstractMinecartEntity METHOD a dropItems (Laft;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a create (Lbas;DDDLarp$a;)Larp; ARG 0 world ARG 1 x diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping index 71183927f1..3711ba7702 100644 --- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping @@ -21,6 +21,7 @@ CLASS arr net/minecraft/entity/vehicle/BoatEntity ARG 5 z METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a copyEntityData (Lagk;)V METHOD a setBoatType (Larr$b;)V METHOD a readCustomDataFromTag (Lhq;)V diff --git a/mappings/net/minecraft/entity/vehicle/TNTMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/TNTMinecartEntity.mapping index cbbffef9aa..957e5c758a 100644 --- a/mappings/net/minecraft/entity/vehicle/TNTMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/TNTMinecartEntity.mapping @@ -8,6 +8,7 @@ CLASS ary net/minecraft/entity/vehicle/TNTMinecartEntity METHOD a dropItems (Laft;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a canExplosionDestroyBlock (Lbal;Lbae;Let;Lbom;F)Z ARG 1 explosion ARG 2 world diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 3be05ec353..725ace6d54 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -23,6 +23,7 @@ CLASS um net/minecraft/server/network/ServerPlayerEntity METHOD a onDeath (Laft;)V METHOD a damage (Laft;F)Z ARG 1 source + ARG 2 amount METHOD a copyEntityData (Lagk;)V METHOD a startRiding (Lagk;Z)Z ARG 1 entity