diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index f48b7b242f..de43cfc11b 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -8,6 +8,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	FIELD field_22418 climbingPos Ljava/util/Optional;
 	FIELD field_23128 SOUL_SPEED_BOOST_ID Ljava/util/UUID;
 	FIELD field_27859 POWDER_SNOW_SLOW_ID Ljava/util/UUID;
+	FIELD field_30064 USING_ITEM_FLAG I
+	FIELD field_30065 OFF_HAND_ACTIVE_FLAG I
+	FIELD field_30066 USING_RIPTIDE_FLAG I
 	FIELD field_30082 noDrag Z
 	FIELD field_6210 bodyTrackingIncrements I
 	FIELD field_6211 lastLimbDistance F
diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping
index fc307e9d68..1012e0d214 100644
--- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping
+++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping
@@ -1,23 +1,24 @@
 CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntity
 	FIELD field_18120 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051;
 	FIELD field_20865 yawAcceleration F
+	FIELD field_30428 MAX_HEALTH I
 	FIELD field_7008 pathHeap Lnet/minecraft/class_5;
-	FIELD field_7009 partTail2 Lnet/minecraft/class_1508;
+	FIELD field_7009 tail2 Lnet/minecraft/class_1508;
 	FIELD field_7010 latestSegment I
-	FIELD field_7011 partNeck Lnet/minecraft/class_1508;
+	FIELD field_7011 neck Lnet/minecraft/class_1508;
 	FIELD field_7012 pathNodes [Lnet/minecraft/class_9;
 		COMMENT The first 12 path nodes are used for end crystals; the others are not tied to them.
 	FIELD field_7013 PHASE_TYPE Lnet/minecraft/class_2940;
-	FIELD field_7014 partWingLeft Lnet/minecraft/class_1508;
-	FIELD field_7015 partWingRight Lnet/minecraft/class_1508;
+	FIELD field_7014 leftWing Lnet/minecraft/class_1508;
+	FIELD field_7015 rightWing Lnet/minecraft/class_1508;
 	FIELD field_7016 fight Lnet/minecraft/class_2881;
-	FIELD field_7017 partHead Lnet/minecraft/class_1508;
+	FIELD field_7017 head Lnet/minecraft/class_1508;
 	FIELD field_7018 ticksUntilNextGrowl I
 	FIELD field_7019 prevWingPosition F
-	FIELD field_7020 partTail1 Lnet/minecraft/class_1508;
+	FIELD field_7020 tail1 Lnet/minecraft/class_1508;
 	FIELD field_7021 LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD field_7022 partTail3 Lnet/minecraft/class_1508;
-	FIELD field_7023 partBody Lnet/minecraft/class_1508;
+	FIELD field_7022 tail3 Lnet/minecraft/class_1508;
+	FIELD field_7023 body Lnet/minecraft/class_1508;
 	FIELD field_7024 connectedCrystal Lnet/minecraft/class_1511;
 	FIELD field_7025 pathNodeConnections [I
 		COMMENT An array of 24 bitflags, where node #i leads to #j if and only if
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 5d898fb680..d8fda1defa 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -3,6 +3,9 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	FIELD field_18075 positionTargetRange F
 	FIELD field_18279 holdingEntityId I
 	FIELD field_30086 LEASH_KEY Ljava/lang/String;
+	FIELD field_30088 AI_DISABLED_FLAG I
+	FIELD field_30089 LEFT_HANDED_FLAG I
+	FIELD field_30090 ATTACKING_FLAG I
 	FIELD field_6184 lootTableSeed J
 	FIELD field_6185 targetSelector Lnet/minecraft/class_1355;
 	FIELD field_6186 armorDropChances [F