2019-05-27 06:14:14 +00:00
|
|
|
From 4611e03e312ad16587c541642b5edf6819ce9b73 Mon Sep 17 00:00:00 2001
|
2018-10-18 20:53:10 +00:00
|
|
|
From: Caleb Bassham <caleb.bassham@gmail.com>
|
|
|
|
Date: Fri, 28 Sep 2018 02:32:19 -0500
|
|
|
|
Subject: [PATCH] Call player spectator target events
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2019-05-27 00:16:47 +00:00
|
|
|
index 251166c4fe..bf1a38eb9e 100644
|
2018-10-18 20:53:10 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2019-05-06 02:58:04 +00:00
|
|
|
@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2019-05-05 08:33:44 +00:00
|
|
|
private EnumChatVisibility ck;
|
|
|
|
private boolean cl = true;
|
|
|
|
private long cm = SystemUtils.getMonotonicMillis();
|
2018-12-17 05:18:06 +00:00
|
|
|
- private Entity spectatedEntity;
|
|
|
|
+ private Entity spectatedEntity; private void setSpectatorTargetField(Entity e) { this.spectatedEntity = e; } // Paper - OBFHELPER
|
2018-10-18 20:53:10 +00:00
|
|
|
public boolean worldChangeInvuln;
|
2019-05-05 08:33:44 +00:00
|
|
|
private boolean cp; private void setHasSeenCredits(boolean has) { this.cp = has; } // Paper - OBFHELPER
|
2018-12-17 05:18:06 +00:00
|
|
|
private final RecipeBookServer recipeBook;
|
2019-05-10 18:11:17 +00:00
|
|
|
@@ -1569,15 +1569,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2018-12-17 05:18:06 +00:00
|
|
|
return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
|
2018-10-18 20:53:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
- public void setSpectatorTarget(Entity entity) {
|
|
|
|
+ public void setSpectatorTarget(Entity newSpectatorTarget) {
|
2018-10-21 19:27:53 +00:00
|
|
|
+ // Paper start - Add PlayerStartSpectatingEntityEvent and PlayerStopSpectatingEntity Event
|
2018-10-18 20:53:10 +00:00
|
|
|
Entity entity1 = this.getSpecatorTarget();
|
|
|
|
|
2018-12-17 05:18:06 +00:00
|
|
|
- this.spectatedEntity = (Entity) (entity == null ? this : entity);
|
|
|
|
- if (entity1 != this.spectatedEntity) {
|
|
|
|
- this.playerConnection.sendPacket(new PacketPlayOutCamera(this.spectatedEntity));
|
|
|
|
- this.playerConnection.a(this.spectatedEntity.locX, this.spectatedEntity.locY, this.spectatedEntity.locZ, this.yaw, this.pitch, TeleportCause.SPECTATE); // CraftBukkit
|
2018-10-18 20:53:10 +00:00
|
|
|
+ if (newSpectatorTarget == null) {
|
|
|
|
+ newSpectatorTarget = this;
|
2018-10-21 19:27:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
+ if (entity1 == newSpectatorTarget) return; // new spec target is the current spec target
|
2018-10-18 20:53:10 +00:00
|
|
|
+
|
2018-10-21 19:27:53 +00:00
|
|
|
+ if (newSpectatorTarget == this) {
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent playerStopSpectatingEntityEvent = new com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent(this.getBukkitEntity(), entity1.getBukkitEntity());
|
2018-10-18 20:53:10 +00:00
|
|
|
+
|
2018-10-21 19:27:53 +00:00
|
|
|
+ if (!playerStopSpectatingEntityEvent.callEvent()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerStartSpectatingEntityEvent playerStartSpectatingEntityEvent = new com.destroystokyo.paper.event.player.PlayerStartSpectatingEntityEvent(this.getBukkitEntity(), entity1.getBukkitEntity(), newSpectatorTarget.getBukkitEntity());
|
2018-10-18 20:53:10 +00:00
|
|
|
+
|
2018-10-21 19:27:53 +00:00
|
|
|
+ if (!playerStartSpectatingEntityEvent.callEvent()) {
|
|
|
|
+ return;
|
2018-10-18 20:53:10 +00:00
|
|
|
+ }
|
2018-10-21 19:27:53 +00:00
|
|
|
+ }
|
2018-10-18 20:53:10 +00:00
|
|
|
+
|
|
|
|
+ setSpectatorTargetField(newSpectatorTarget);
|
2018-10-21 19:27:53 +00:00
|
|
|
+
|
|
|
|
+ this.playerConnection.sendPacket(new PacketPlayOutCamera(newSpectatorTarget));
|
2018-12-17 05:18:06 +00:00
|
|
|
+ this.playerConnection.a(this.spectatedEntity.locX, this.spectatedEntity.locY, this.spectatedEntity.locZ, this.yaw, this.pitch, TeleportCause.SPECTATE); // CraftBukkit
|
2018-10-21 19:27:53 +00:00
|
|
|
+ // Paper end
|
2018-10-18 20:53:10 +00:00
|
|
|
}
|
|
|
|
|
2019-05-05 08:33:44 +00:00
|
|
|
@Override
|
2018-10-18 20:53:10 +00:00
|
|
|
--
|
2019-05-05 11:32:20 +00:00
|
|
|
2.21.0
|
2018-10-18 20:53:10 +00:00
|
|
|
|