2022-07-28 03:57:50 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Allink <arclicious@vivaldi.net>
|
|
|
|
Date: Tue, 5 Jul 2022 04:12:31 +0100
|
|
|
|
Subject: [PATCH] Add spectator teleport event
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2023-07-04 21:10:53 +00:00
|
|
|
index aa287d7f37f38d938d195114408cb6dbda59063d..e46febba49530c4c71a15bfc75d731c45fcb48f2 100644
|
2022-07-28 03:57:50 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
package net.minecraft.server.network;
|
|
|
|
|
2023-07-04 21:10:53 +00:00
|
|
|
+import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors
|
2022-07-28 03:57:50 +00:00
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
import com.google.common.primitives.Floats;
|
|
|
|
import com.mojang.brigadier.ParseResults;
|
2023-07-04 21:10:53 +00:00
|
|
|
@@ -2056,6 +2057,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
2022-07-28 03:57:50 +00:00
|
|
|
Entity entity = packet.getEntity(worldserver);
|
|
|
|
|
|
|
|
if (entity != null) {
|
|
|
|
+ // Scissors start - Add spectator teleport event
|
|
|
|
+ final SpectatorTeleportEvent event = new SpectatorTeleportEvent(this.player.getBukkitEntity(), entity.getBukkitEntity());
|
|
|
|
+
|
|
|
|
+ if(!event.callEvent()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Scissors end
|
|
|
|
+
|
|
|
|
this.player.teleportTo(worldserver, entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot(), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.SPECTATE); // CraftBukkit
|
|
|
|
return;
|
|
|
|
}
|