Support Keys.LEASH_HOLDER for all Leashable entities and fix remove (#…

…4090)

src/main/java/org/spongepowered/common/data/provider/entity/EntityDataProviders.java

@@ -78,6 +78,7 @@ public void registerProviders() {
         IronGolemData.register(this.registrator);
         ItemData.register(this.registrator);
         ItemFrameData.register(this.registrator);
+        LeashableData.register(this.registrator);
         LightningBoltData.register(this.registrator);
         LivingData.register(this.registrator);
         LlamaData.register(this.registrator);

src/main/java/org/spongepowered/common/data/provider/entity/LeashableData.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.data.provider.entity;
+
+import net.minecraft.world.entity.Leashable;
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.entity.Entity;
+import org.spongepowered.common.data.provider.DataProviderRegistrator;
+
+public final class LeashableData {
+
+    private LeashableData() {
+    }
+
+    public static void register(final DataProviderRegistrator registrator) {
+        registrator
+            .asMutable(Leashable.class)
+            .create(Keys.LEASH_HOLDER)
+            .get(h -> {
+                final var ld = h.getLeashData();
+                return ld == null ? null : (Entity) ld.leashHolder;
+            })
+            .delete(h -> {
+                h.dropLeash(true, false);
+            })
+            .set((h, v) -> {
+                if (v == null) {
+                    // TODO remove
+                    h.dropLeash(true, false);
+                } else {
+                    h.setLeashedTo((net.minecraft.world.entity.Entity) v, true);
+                }
+            });
+    }
+}

src/main/java/org/spongepowered/common/data/provider/entity/MobData.java

@@ -29,7 +29,6 @@
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.type.HandPreference;
 import org.spongepowered.api.data.type.HandPreferences;
-import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.common.accessor.world.entity.MobAccessor;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
@@ -46,15 +45,6 @@ public static void register(final DataProviderRegistrator registrator) {
                     .create(Keys.DOMINANT_HAND)
                         .get(h -> (HandPreference) (Object) h.getMainArm())
                         .set((h, v) -> h.setLeftHanded(v.equals(HandPreferences.LEFT.get())))
-                    .create(Keys.LEASH_HOLDER)
-                        .get(h -> ((Entity) h.getLeashHolder()))
-                        .set((h, v) -> {
-                            if (v == null) {
-                                h.dropLeash(true, false);
-                            } else {
-                                h.setLeashedTo((net.minecraft.world.entity.Entity) v, true);
-                            }
-                        })
                     .create(Keys.TARGET_ENTITY)
                         .get(h -> (Living) h.getTarget())
                         .setAnd((h, v) -> {