EndCrystal: defer explosion until next tick update

README.md

@@ -73,7 +73,7 @@ PocketMine-MP is free, but it requires a lot of time and effort from unpaid volu
 You can support development using the following methods:
 
 - [Patreon](https://www.patreon.com/pocketminemp)
-- Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV`
+- Bitcoin (BTC): `bc1q2v5ngyf8ugyd55kqa9ep35g2rv342ueqm6ks33`
 - Stellar Lumens (XLM): `GAAC5WZ33HCTE3BFJFZJXONMEIBNHFLBXM2HJVAZHXXPYA3HP5XPPS7T`
 
 Thanks for your support!

composer.lock

@@ -818,20 +818,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.9.1",
+            "version": "4.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0",
-                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
             },
@@ -890,9 +890,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.9.1"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.0"
             },
-            "time": "2025-09-04T20:59:21+00:00"
+            "time": "2025-06-25T14:20:11+00:00"
         },
         {
             "name": "symfony/filesystem",

src/entity/object/EndCrystal.php

@@ -52,6 +52,8 @@ class EndCrystal extends Entity implements Explosive{
 	protected bool $showBase = false;
 	protected ?Vector3 $beamTarget = null;
 
+	private bool $primed = false;
+
 	protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(2.0, 2.0); }
 
 	protected function getInitialDragMultiplier() : float{ return 1.0; }
@@ -88,11 +90,9 @@ class EndCrystal extends Entity implements Explosive{
 		parent::attack($source);
 		if(
 			$source->getCause() !== EntityDamageEvent::CAUSE_VOID &&
-			!$this->isFlaggedForDespawn() &&
 			!$source->isCancelled()
 		){
-			$this->flagForDespawn();
+			$this->primed = true;
-			$this->explode();
 		}
 	}
 
@@ -125,6 +125,13 @@ class EndCrystal extends Entity implements Explosive{
 		return $nbt;
 	}
 
+	protected function onDeathUpdate(int $tickDiff) : bool{
+		if($this->primed){
+			$this->explode();
+		}
+		return true;
+	}
+
 	public function explode() : void{
 		$ev = new EntityPreExplodeEvent($this, 6);
 		$ev->call();