From 9036b17674a91c052a4958865bee98e084bba779 Mon Sep 17 00:00:00 2001
From: bconlon <bconlon.gml@gmail.com>
Date: Mon, 29 Apr 2024 12:43:50 -0700
Subject: [PATCH] build(version): 1.4.1->1.4.2

---
 .circleci/continue_config.yml                        |  2 +-
 docs/CHANGELOG.md                                    |  5 +++++
 gradle.properties                                    |  2 +-
 .../com/aetherteam/aether/entity/passive/Moa.java    | 12 ------------
 update.json                                          |  8 ++++----
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
index 7283016c86..29e9953c08 100644
--- a/.circleci/continue_config.yml
+++ b/.circleci/continue_config.yml
@@ -6,7 +6,7 @@ orbs:
 parameters:
   artifact-name:
     type: string
-    default: aether-1.20.1-1.4.1-neoforge.jar
+    default: aether-1.20.1-1.4.2-neoforge.jar
   deploy-branch:
     type: string
     default: 1.20.1-develop
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5edb5d3c9a..58ac6fae36 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,8 @@
+# The Aether - NeoForge - 1.20.1-1.4.2
+
+Fixes
+- Fix issue with Moa following.
+
 # The Aether - NeoForge - 1.20.1-1.4.1
 
 Changes
diff --git a/gradle.properties b/gradle.properties
index c11517e84b..f6fa113037 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.daemon=false
 # Mod
 mod_id=aether
 mod_name=The Aether
-mod_version=1.4.1
+mod_version=1.4.2
 mc_version=1.20.1
 neoforge_version=47.1.70
 mappings=2023.08.20-1.20.1
diff --git a/src/main/java/com/aetherteam/aether/entity/passive/Moa.java b/src/main/java/com/aetherteam/aether/entity/passive/Moa.java
index 80628f0442..4775f83c8a 100644
--- a/src/main/java/com/aetherteam/aether/entity/passive/Moa.java
+++ b/src/main/java/com/aetherteam/aether/entity/passive/Moa.java
@@ -408,18 +408,6 @@ public void spawnExplosionParticle() {
 		}
 	}
 
-	/**
-	 * When a player dismounts, the Moa will follow them.
-	 * @param passenger The passenger {@link Entity}.
-	 */
-	@Override
-	protected void removePassenger(Entity passenger) {
-		super.removePassenger(passenger);
-		if (passenger instanceof Player player && (this.getFollowing() == null || this.getFollowing().toString().equals(player.getUUID().toString()))) {
-			this.setFollowing(player.getUUID());
-		}
-	}
-
 	/**
 	 * Generates a {@link UUID} for this Moa; used for Moa Skin tracking.
 	 */
diff --git a/update.json b/update.json
index c353597a5c..b20f053ce4 100644
--- a/update.json
+++ b/update.json
@@ -1,10 +1,10 @@
 {
   "homepage": "https://modrinth.com/mod/aether",
   "promos": {
-    "1.19.2-recommended": "1.19.2-1.4.1-forge",
-    "1.19.4-recommended": "1.19.4-1.4.1-forge",
-    "1.20.1-recommended": "1.20.1-1.4.1-neoforge",
-    "1.20.2-recommended": "1.20.2-1.4.1-neoforge",
+    "1.19.2-recommended": "1.19.2-1.4.2-forge",
+    "1.19.4-recommended": "1.19.4-1.4.2-forge",
+    "1.20.1-recommended": "1.20.1-1.4.2-neoforge",
+    "1.20.2-recommended": "1.20.2-1.4.2-neoforge",
     "1.20.4-recommended": "1.20.4-1.4.1-neoforge"
   }
 }