mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 04:31:58 +01:00
87a726351b
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
Bukkit Changes:
7634491f Added Entity#setRotation.
CraftBukkit Changes:
0e1cea5a Added Entity#setRotation.
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 61bdfa719486008ab22f8a9efa127db9fa5dbc76 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 d0f8ad0b6..ff9c2c04f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -727,6 +727,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
|
|
|