mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-31 12:03:27 +01:00
Fix conflicts.
This commit is contained in:
parent
950d51d5e3
commit
84c55fb710
3 changed files with 5 additions and 5 deletions
Bukkit-Patches
CraftBukkit-Patches
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 );
|
||||
|
|
Loading…
Add table
Reference in a new issue