diff --git a/Bukkit-Patches/0004-BungeeCord-Support.patch b/Bukkit-Patches/0004-BungeeCord-Support.patch index 0fb40b0ab1..dc1af3d944 100644 --- a/Bukkit-Patches/0004-BungeeCord-Support.patch +++ b/Bukkit-Patches/0004-BungeeCord-Support.patch @@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline - * {@link GameMode#SPECTATOR} */ - public void setSpectatorTarget(Entity entity); + @Deprecated + public void resetTitle(); + + // Spigot start + public class Spigot extends Entity.Spigot diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index cdb3c0e1c0..69b68c8bdc 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -108,8 +108,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - Preconditions.checkArgument(getGameMode() == GameMode.SPECTATOR, "Player must be in spectator mode"); - getHandle().setSpectatorTarget((entity == null) ? null : ((CraftEntity) entity).getHandle()); + PacketPlayOutTitle packetReset = new PacketPlayOutTitle(EnumTitleAction.RESET, null); + getHandle().playerConnection.sendPacket(packetReset); } + + // Spigot start diff --git a/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch index c901b0bfd1..9bc22daa16 100644 --- a/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch @@ -99,7 +99,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.server.*; - + import net.minecraft.server.PacketPlayOutTitle.EnumTitleAction; @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return java.util.Collections.unmodifiableSet( ret );