--- a/net/minecraft/world/entity/Leashable.java
+++ b/net/minecraft/world/entity/Leashable.java
@@ -40,7 +40,7 @@
 
     default void setDelayedLeashHolderId(int p_352387_) {
         this.setLeashData(new Leashable.LeashData(p_352387_));
-        dropLeash((Entity)this, false, false);
+        dropLeash((Entity & Leashable)this, false, false);
     }
 
     @Nullable
@@ -49,7 +49,7 @@
             return new Leashable.LeashData(Either.left(p_352410_.getCompound("leash").getUUID("UUID")));
         } else {
             if (p_352410_.contains("leash", 11)) {
-                Either<UUID, BlockPos> either = NbtUtils.readBlockPos(p_352410_, "leash").map(Either::right).orElse(null);
+                Either<UUID, BlockPos> either = NbtUtils.readBlockPos(p_352410_, "leash").<Either<UUID, BlockPos>>map(Either::right).orElse(null);
                 if (either != null) {
                     return new Leashable.LeashData(either);
                 }
@@ -101,7 +101,7 @@
     }
 
     default void dropLeash(boolean p_352294_, boolean p_352456_) {
-        dropLeash((Entity)this, p_352294_, p_352456_);
+        dropLeash((Entity & Leashable)this, p_352294_, p_352456_);
     }
 
     private static <E extends Entity & Leashable> void dropLeash(E p_352163_, boolean p_352286_, boolean p_352272_) {
@@ -160,7 +160,7 @@
     }
 
     default void elasticRangeLeashBehaviour(Entity p_353036_, float p_353047_) {
-        legacyElasticRangeLeashBehaviour((Entity)this, p_353036_, p_353047_);
+        legacyElasticRangeLeashBehaviour((Entity & Leashable)this, p_353036_, p_353047_);
     }
 
     private static <E extends Entity & Leashable> void legacyElasticRangeLeashBehaviour(E p_353048_, Entity p_353039_, float p_353053_) {
@@ -173,7 +173,7 @@
     }
 
     default void setLeashedTo(Entity p_352411_, boolean p_352183_) {
-        setLeashedTo((Entity)this, p_352411_, p_352183_);
+        setLeashedTo((Entity & Leashable)this, p_352411_, p_352183_);
     }
 
     private static <E extends Entity & Leashable> void setLeashedTo(E p_352280_, Entity p_352109_, boolean p_352239_) {
@@ -196,7 +196,7 @@
 
     @Nullable
     default Entity getLeashHolder() {
-        return getLeashHolder((Entity)this);
+        return getLeashHolder((Entity & Leashable)this);
     }
 
     @Nullable
