diff --git a/mappings/net/minecraft/client/world/ClientEntityManager.mapping b/mappings/net/minecraft/client/world/ClientEntityManager.mapping
index 86f8d90cc5..e1b3e25896 100644
--- a/mappings/net/minecraft/client/world/ClientEntityManager.mapping
+++ b/mappings/net/minecraft/client/world/ClientEntityManager.mapping
@@ -23,11 +23,19 @@ CLASS net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager
 	METHOD method_31874 getEntityCount ()I
 	METHOD method_31875 stopTicking (Lnet/minecraft/class_1923;)V
 		ARG 1 pos
+	METHOD method_31876 (Lnet/minecraft/class_5568;)Z
+		ARG 0 e
 	METHOD method_31877 (Lnet/minecraft/class_5572;)V
 		ARG 1 sections
 	METHOD method_31879 getDebugString ()Ljava/lang/String;
+	METHOD method_31880 (Lnet/minecraft/class_5568;)Z
+		ARG 0 e
 	CLASS class_5583 Listener
 		FIELD field_27285 manager Lnet/minecraft/class_5582;
 		FIELD field_27286 entity Lnet/minecraft/class_5568;
 		FIELD field_27287 lastSectionPos J
 		FIELD field_27288 section Lnet/minecraft/class_5572;
+		METHOD <init> (Lnet/minecraft/class_5582;Lnet/minecraft/class_5568;JLnet/minecraft/class_5572;)V
+			ARG 2 entity
+			ARG 3 pos
+			ARG 5 section
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 4f958f9006..91278da026 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -47,12 +47,20 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	FIELD field_5974 random Ljava/util/Random;
 	FIELD field_5975 NAME_VISIBLE Lnet/minecraft/class_2940;
 	FIELD field_5976 horizontalCollision Z
-	FIELD field_5978 ENTITY_ID_COUNTER Ljava/util/concurrent/atomic/AtomicInteger;
+	FIELD field_5978 CURRENT_ID Ljava/util/concurrent/atomic/AtomicInteger;
+		COMMENT A generator of unique entity {@link #id network IDs}. The generated
+		COMMENT ID for client entities are useless and discarded subsequently through
+		COMMENT {@link #setId(int)} calls.
 	FIELD field_5979 passengerList Lcom/google/common/collect/ImmutableList;
 	FIELD field_5981 uuidString Ljava/lang/String;
 	FIELD field_5982 prevYaw F
 	FIELD field_5985 ignoreCameraFrustum Z
-	FIELD field_5986 entityId I
+	FIELD field_5986 id I
+		COMMENT The entity's network ID, used as a reference for synchronization over network.
+		COMMENT This is not persistent across save and loads; use {@link #uuid} to identify
+		COMMENT an entity in those cases.
+		COMMENT
+		COMMENT @see #getId()
 	FIELD field_5989 lastRenderZ D
 	FIELD field_5990 FLAGS Lnet/minecraft/class_2940;
 	FIELD field_5991 lastNetherPortalPosition Lnet/minecraft/class_2338;
@@ -792,7 +800,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 tickDelta
 	METHOD method_5837 onStartedTrackingBy (Lnet/minecraft/class_3222;)V
 		ARG 1 player
-	METHOD method_5838 setEntityId (I)V
+	METHOD method_5838 setId (I)V
+		COMMENT Sets the network ID of this entity.
+		COMMENT
+		COMMENT @apiNote This is used by client-side networking logic to set up the network
+		COMMENT ID of entities from the server. This shouldn't be used by server-side logic
+		COMMENT as the network ID is already properly initialized on entity object construction.
+		COMMENT
+		COMMENT @see #getId()
 		ARG 1 id
 	METHOD method_5839 spawnSprintingParticles ()V
 	METHOD method_5840 setRenderDistanceMultiplier (D)V
diff --git a/mappings/net/minecraft/world/entity/EntityLike.mapping b/mappings/net/minecraft/world/entity/EntityLike.mapping
index 5c9aac62c7..dbeef4f648 100644
--- a/mappings/net/minecraft/world/entity/EntityLike.mapping
+++ b/mappings/net/minecraft/world/entity/EntityLike.mapping
@@ -31,6 +31,11 @@ CLASS net/minecraft/class_5568 net/minecraft/world/entity/EntityLike
 		COMMENT
 		COMMENT @see #streamSelfAndPassengers()
 	METHOD method_5628 getId ()I
-		COMMENT Returns the network ID of this entity.
+		COMMENT {@return the network ID of this entity}
+		COMMENT
+		COMMENT <p>Compared to the {@linkplain #getUuid() UUID}, the integer network ID is
+		COMMENT significantly smaller and more suitable for network transportation. However, it
+		COMMENT is not persistent across game runs. For persistent purposes such as commands
+		COMMENT or game data, use the UUID.
 	METHOD method_5667 getUuid ()Ljava/util/UUID;
 	METHOD method_5829 getBoundingBox ()Lnet/minecraft/class_238;