30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||
|
|
Date: Sun, 10 Apr 2016 03:23:32 -0500
|
||
|
|
Subject: [PATCH] Workaround for setting passengers on players
|
||
|
|
|
||
|
|
SPIGOT-1915 & GH-114
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
index ab7e731cb04a75b829f0cd24d7b94f7ddad166e8..4bb57229c045956bab631982e12c0fc420db450e 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -872,6 +872,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start - Ugly workaround for SPIGOT-1915 & GH-114
|
||
|
|
+ @Override
|
||
|
|
+ public boolean setPassenger(org.bukkit.entity.Entity passenger) {
|
||
|
|
+ boolean wasSet = super.setPassenger(passenger);
|
||
|
|
+ if (wasSet) {
|
||
|
|
+ this.getHandle().playerConnection.sendPacket(new net.minecraft.network.protocol.game.PacketPlayOutMount(this.getHandle()));
|
||
|
|
+ }
|
||
|
|
+ return wasSet;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
@Override
|
||
|
|
public void setSneaking(boolean sneak) {
|
||
|
|
getHandle().setSneaking(sneak);
|