From 2936726bf8a8e18cd07eaf5c0f563a50589f7916 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Mon, 3 Apr 2023 22:46:14 +0100
Subject: [PATCH] Fixed packets sent by EntityEventBroadcaster not firing
 DataPacketSendEvent closes #5670

I'm not super happy with this fix, since it can still be broken if StandardPacketBroadcaster is replaced by something else. However, fixing that problem is probably going to require internal BC breaks, which are not suitable for a patch release.
---
 src/network/mcpe/NetworkBroadcastUtils.php     |  7 -------
 src/network/mcpe/StandardPacketBroadcaster.php | 10 ++++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/network/mcpe/NetworkBroadcastUtils.php b/src/network/mcpe/NetworkBroadcastUtils.php
index ce173119e0..76ae987384 100644
--- a/src/network/mcpe/NetworkBroadcastUtils.php
+++ b/src/network/mcpe/NetworkBroadcastUtils.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe;
 
-use pocketmine\event\server\DataPacketSendEvent;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\player\Player;
 use pocketmine\timings\Timings;
@@ -57,12 +56,6 @@ final class NetworkBroadcastUtils{
 				return false;
 			}
 
-			$ev = new DataPacketSendEvent($sessions, $packets);
-			$ev->call();
-			if($ev->isCancelled()){
-				return false;
-			}
-
 			/** @var PacketBroadcaster[] $uniqueBroadcasters */
 			$uniqueBroadcasters = [];
 			/** @var NetworkSession[][] $broadcasterTargets */
diff --git a/src/network/mcpe/StandardPacketBroadcaster.php b/src/network/mcpe/StandardPacketBroadcaster.php
index 1ed0f16aee..da9fa5101f 100644
--- a/src/network/mcpe/StandardPacketBroadcaster.php
+++ b/src/network/mcpe/StandardPacketBroadcaster.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe;
 
+use pocketmine\event\server\DataPacketSendEvent;
 use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
@@ -41,6 +42,15 @@ final class StandardPacketBroadcaster implements PacketBroadcaster{
 	){}
 
 	public function broadcastPackets(array $recipients, array $packets) : void{
+		//TODO: this shouldn't really be called here, since the broadcaster might be replaced by an alternative
+		//implementation that doesn't fire events
+		$ev = new DataPacketSendEvent($recipients, $packets);
+		$ev->call();
+		if($ev->isCancelled()){
+			return;
+		}
+		$packets = $ev->getPackets();
+
 		$compressors = [];
 
 		/** @var NetworkSession[][] $targetsByCompressor */