mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-28 14:31:07 +01:00
2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 76094a87a75e2c9210e92725976841980c3ccb23 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 3e1a7be6f3..3d37f78c62 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -754,6 +754,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.server.PacketPlayOutMount(this.getHandle()));
|
|
+ }
|
|
+ return wasSet;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void setSneaking(boolean sneak) {
|
|
getHandle().setSneaking(sneak);
|
|
--
|
|
2.21.0
|
|
|