mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
415f7ca165
Upstream has released updates that appear 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: e0598aa2 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter CraftBukkit Changes: 2cdc6b1e4 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter
29 lines
1.2 KiB
Diff
29 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 b3d49b652790a98f1426498a555c6826f8657c63..77dd225e6cc20b4faa55aab2b52af77298639e0e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -900,6 +900,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().connection.send(new net.minecraft.network.protocol.game.ClientboundSetPassengersPacket(this.getHandle()));
|
|
+ }
|
|
+ return wasSet;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void setSneaking(boolean sneak) {
|
|
this.getHandle().setShiftKeyDown(sneak);
|