Add WatcherManager#removeEntityWatcher

Author: FirstMegaGame4

src/main/java/com/mmodding/mmodding_lib/library/debug/WatcherManager.java

@@ -28,6 +28,11 @@ public static void toggleEntityWatcher(Entity entity) {
 		}
 	}
 
+	// Used by the integrated server.
+	public static void removeEntityWatcher(Entity entity) {
+		WatcherManager.ENTITY_WATCHERS.remove(entity.getUuid());
+	}
+
 	// Used by the client.
 	public static Set<Map.Entry<UUID, WatcherProvider>> getEntries() {
 		return WatcherManager.ENTITY_WATCHERS.entrySet();

src/main/java/com/mmodding/mmodding_lib/mixin/injectors/EntityMixin.java

@@ -6,6 +6,7 @@
 import com.mmodding.mmodding_lib.ducks.PortalForcerDuckInterface;
 import com.mmodding.mmodding_lib.ducks.ServerPlayerDuckInterface;
 import com.mmodding.mmodding_lib.interface_injections.EntitySyncableDataRegistry;
+import com.mmodding.mmodding_lib.library.debug.WatcherManager;
 import com.mmodding.mmodding_lib.library.entities.data.syncable.SyncableData;
 import com.mmodding.mmodding_lib.library.portals.squared.CustomSquaredPortal;
 import com.mmodding.mmodding_lib.library.portals.squared.CustomSquaredPortalBlock;
@@ -16,6 +17,7 @@
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityPose;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.state.property.Properties;
@@ -139,6 +141,13 @@ private float changeVelocityMultiplier(float original) {
 		return original;
 	}
 
+	@Inject(method = "remove", at = @At("HEAD"))
+	private void remove(Entity.RemovalReason reason, CallbackInfo ci) {
+		if (this.getWorld() instanceof ServerWorld serverWorld && serverWorld.getServer() instanceof IntegratedServer) {
+			WatcherManager.removeEntityWatcher((Entity) (Object) this);
+		}
+	}
+
 	@Override
 	public SyncableData.Registry getSyncableDataRegistry() {
 		return this.syncableDataRegistry;