Send packets when a hat is dismounted.

Pet hats were also being secretly dismounted, so we block dismounts not done by SonarPets. Fixes #21
TechzoneMC · Apr 12, 2016 · 8764e46 · 8764e46
1 parent 7f223ac
commit 8764e46
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/modules/v1_9_R1/src/main/java/com/dsh105/echopet/compat/nms/v1_9_R1/NMSImpl.java b/modules/v1_9_R1/src/main/java/com/dsh105/echopet/compat/nms/v1_9_R1/NMSImpl.java
@@ -66,7 +66,18 @@ public SpawnEggItemData createSpawnEggData(EntityType entityType, ItemMeta meta)
     public void mount(org.bukkit.entity.Entity bukkitRider, org.bukkit.entity.Entity bukkitVehicle) {
         Entity rider = NMS.getHandle(Objects.requireNonNull(bukkitRider, "Null rider"));
         if (bukkitVehicle == null) {
-            rider.stopRiding();
+            Entity vehicle = rider.getVehicle(); // This is how you *really* get the vehicle :/
+            if (rider instanceof EntityPet) {
+                ((EntityPet) rider).reallyStopRiding(); // normally we block dismounting, but now we really do want to dismount
+            } else {
+                rider.stopRiding();
+            }
+            if (vehicle != null) {
+                Packet packet = new PacketPlayOutMount(vehicle);
+                for (EntityHuman human : rider.world.players) {
+                    ((EntityPlayer) human).playerConnection.sendPacket(packet);
+                }
+            }
         } else {
             Preconditions.checkArgument(bukkitRider.getWorld().equals(bukkitVehicle.getWorld()), "Rider is in world %s, while vehicle is in world %s", bukkitRider.getWorld().getName(), bukkitVehicle.getWorld().getName());
             Entity vehicle = NMS.getHandle(bukkitVehicle);

diff --git a/modules/v1_9_R1/src/main/java/com/dsh105/echopet/compat/nms/v1_9_R1/entity/EntityPet.java b/modules/v1_9_R1/src/main/java/com/dsh105/echopet/compat/nms/v1_9_R1/entity/EntityPet.java
@@ -127,6 +127,13 @@ public PetType getEntityPetType() {
         return null;
     }
 
+    @Override
+    public void stopRiding() {} // Pets are being secretly dismounted, so we have to block it here
+
+    public void reallyStopRiding() {
+        super.stopRiding();
+    }
+
     @Override
     public void resizeBoundingBox(boolean flag) {
         EntitySize es = this.getClass().getAnnotation(EntitySize.class);