diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt
index 98da8edde..a8a437341 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt
@@ -51,7 +51,7 @@ class Horse(connection: PlayConnection, entityType: EntityType, position: Vec3d,
                 1 -> LEGACY_IRON_ARMOR
                 2 -> LEGACY_GOLD_ARMOR
                 3 -> LEGACY_DIAMOND_ARMOR
-                else -> error("Invalid armor set")
+                else -> null
             }]
         }
 
diff --git a/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt
index 7b184b52a..1b116a3bf 100644
--- a/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt
@@ -253,6 +253,10 @@ class BaseComponent : ChatComponent {
         }
     }
 
+    override fun hashCode(): Int {
+        return parts.hashCode()
+    }
+
     override fun equals(other: Any?): Boolean {
         if (other === this) {
             return true
diff --git a/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt
index edb7cb8fe..23aea771f 100644
--- a/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt
@@ -211,6 +211,11 @@ open class TextComponent(
         )
     }
 
+    override fun hashCode(): Int {
+        return message.hashCode()
+    }
+
+
     override fun equals(other: Any?): Boolean {
         if (other === this) {
             return true
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt
index 8cabb4443..25491c8b3 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarCoreElement.kt
@@ -66,9 +66,9 @@ class HotbarCoreElement(hudRenderer: HUDRenderer) : Element(hudRenderer) {
         topLeft += protection
         topLeft += health
 
+        topRight += vehicleHealth // ToDo: Also show in creative
         topRight += air
         topRight += hunger
-        topRight += vehicleHealth // non notchain, but better imho
 
 
         base.parent = this
diff --git a/src/main/java/de/bixilon/minosoft/util/KUtil.kt b/src/main/java/de/bixilon/minosoft/util/KUtil.kt
index a9b03906b..1d0c633ac 100644
--- a/src/main/java/de/bixilon/minosoft/util/KUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/util/KUtil.kt
@@ -428,7 +428,6 @@ object KUtil {
         return this.toString().replace("-", "")
     }
 
-
     fun <T : ResourceLocationAble> List<T>.asResourceLocationMap(): Map<ResourceLocation, T> {
         val ret: MutableMap<ResourceLocation, T> = mutableMapOf()
 
@@ -450,7 +449,6 @@ object KUtil {
         return Base64.getEncoder().encodeToString(this)
     }
 
-
     fun String?.nullCompare(other: String?): Int? {
         (this ?: "").compareTo(other ?: "").let {
             if (it != 0) {
diff --git a/src/main/java/de/bixilon/minosoft/util/MMath.kt b/src/main/java/de/bixilon/minosoft/util/MMath.kt
index 9953af041..30c589347 100644
--- a/src/main/java/de/bixilon/minosoft/util/MMath.kt
+++ b/src/main/java/de/bixilon/minosoft/util/MMath.kt
@@ -19,13 +19,6 @@ import kotlin.math.floor
 
 object MMath {
 
-    fun minClamp(value: Int, min: Int): Int {
-        if (value < min) {
-            return min
-        }
-        return value
-    }
-
     fun clamp(value: Vec2i, min: Vec2i, max: Vec2i): Vec2i {
         value.x = clamp(value.x, min.x, max.x)
         value.y = clamp(value.y, min.y, max.y)
diff --git a/src/main/resources/assets/minosoft/mapping/atlas.json b/src/main/resources/assets/minosoft/mapping/atlas.json
index fcc623d5b..d62e422ad 100644
--- a/src/main/resources/assets/minosoft/mapping/atlas.json
+++ b/src/main/resources/assets/minosoft/mapping/atlas.json
@@ -478,14 +478,14 @@
       "end": [61, 18]
     }
   },
-  "minecraft:vehicle_heart": {
+  "minecraft:vehicle_half_heart": {
     "0": {
       "texture": "minecraft:textures/gui/icons.png",
       "start": [97, 9],
       "end": [106, 18]
     }
   },
-  "minecraft:vehicle_half_heart": {
+  "minecraft:vehicle_heart": {
     "0": {
       "texture": "minecraft:textures/gui/icons.png",
       "start": [88, 9],