From 1049ffecc94097161cf0b6e6d53e4d25f03ccfa2 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Thu, 30 May 2019 19:51:27 +0100
Subject: [PATCH] Sound->encode() now accepts Vector3|null

this will be needed for proper no-relative sound support.
---
 src/pocketmine/world/sound/ArrowHitSound.php         | 2 +-
 src/pocketmine/world/sound/BlockBreakSound.php       | 2 +-
 src/pocketmine/world/sound/BlockPlaceSound.php       | 2 +-
 src/pocketmine/world/sound/BowShootSound.php         | 2 +-
 src/pocketmine/world/sound/BucketEmptyLavaSound.php  | 2 +-
 src/pocketmine/world/sound/BucketEmptyWaterSound.php | 2 +-
 src/pocketmine/world/sound/BucketFillLavaSound.php   | 2 +-
 src/pocketmine/world/sound/BucketFillWaterSound.php  | 2 +-
 src/pocketmine/world/sound/ChestCloseSound.php       | 2 +-
 src/pocketmine/world/sound/ChestOpenSound.php        | 2 +-
 src/pocketmine/world/sound/EnderChestCloseSound.php  | 2 +-
 src/pocketmine/world/sound/EnderChestOpenSound.php   | 2 +-
 src/pocketmine/world/sound/ExplodeSound.php          | 2 +-
 src/pocketmine/world/sound/FlintSteelSound.php       | 2 +-
 src/pocketmine/world/sound/IgniteSound.php           | 2 +-
 src/pocketmine/world/sound/ItemBreakSound.php        | 2 +-
 src/pocketmine/world/sound/LevelEventSound.php       | 2 +-
 src/pocketmine/world/sound/PotionSplashSound.php     | 2 +-
 src/pocketmine/world/sound/RedstonePowerOffSound.php | 2 +-
 src/pocketmine/world/sound/RedstonePowerOnSound.php  | 2 +-
 src/pocketmine/world/sound/Sound.php                 | 4 ++--
 src/pocketmine/world/sound/ThrowSound.php            | 2 +-
 src/pocketmine/world/sound/TotemUseSound.php         | 2 +-
 src/pocketmine/world/sound/XpCollectSound.php        | 2 +-
 src/pocketmine/world/sound/XpLevelUpSound.php        | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/pocketmine/world/sound/ArrowHitSound.php b/src/pocketmine/world/sound/ArrowHitSound.php
index 0490d5fa8..84899ab59 100644
--- a/src/pocketmine/world/sound/ArrowHitSound.php
+++ b/src/pocketmine/world/sound/ArrowHitSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class ArrowHitSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BOW_HIT, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/BlockBreakSound.php b/src/pocketmine/world/sound/BlockBreakSound.php
index 32ea532da..8beed8cd7 100644
--- a/src/pocketmine/world/sound/BlockBreakSound.php
+++ b/src/pocketmine/world/sound/BlockBreakSound.php
@@ -36,7 +36,7 @@ class BlockBreakSound implements Sound{
 		$this->block = $block;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BREAK, $pos, $this->block->getRuntimeId());
 	}
 }
diff --git a/src/pocketmine/world/sound/BlockPlaceSound.php b/src/pocketmine/world/sound/BlockPlaceSound.php
index 3f5427472..ae8e2e277 100644
--- a/src/pocketmine/world/sound/BlockPlaceSound.php
+++ b/src/pocketmine/world/sound/BlockPlaceSound.php
@@ -36,7 +36,7 @@ class BlockPlaceSound implements Sound{
 		$this->block = $block;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_PLACE, $pos, $this->block->getRuntimeId());
 	}
 }
diff --git a/src/pocketmine/world/sound/BowShootSound.php b/src/pocketmine/world/sound/BowShootSound.php
index 00355b17f..ddbc310e9 100644
--- a/src/pocketmine/world/sound/BowShootSound.php
+++ b/src/pocketmine/world/sound/BowShootSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class BowShootSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BOW, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/BucketEmptyLavaSound.php b/src/pocketmine/world/sound/BucketEmptyLavaSound.php
index d33fa5d15..da9f4a703 100644
--- a/src/pocketmine/world/sound/BucketEmptyLavaSound.php
+++ b/src/pocketmine/world/sound/BucketEmptyLavaSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class BucketEmptyLavaSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BUCKET_EMPTY_LAVA, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/BucketEmptyWaterSound.php b/src/pocketmine/world/sound/BucketEmptyWaterSound.php
index 47a4686d3..6c50d9ef7 100644
--- a/src/pocketmine/world/sound/BucketEmptyWaterSound.php
+++ b/src/pocketmine/world/sound/BucketEmptyWaterSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class BucketEmptyWaterSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BUCKET_EMPTY_WATER, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/BucketFillLavaSound.php b/src/pocketmine/world/sound/BucketFillLavaSound.php
index 83cebdc0f..a20601ef7 100644
--- a/src/pocketmine/world/sound/BucketFillLavaSound.php
+++ b/src/pocketmine/world/sound/BucketFillLavaSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class BucketFillLavaSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BUCKET_FILL_LAVA, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/BucketFillWaterSound.php b/src/pocketmine/world/sound/BucketFillWaterSound.php
index 24bb70983..29e05e697 100644
--- a/src/pocketmine/world/sound/BucketFillWaterSound.php
+++ b/src/pocketmine/world/sound/BucketFillWaterSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class BucketFillWaterSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BUCKET_FILL_WATER, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/ChestCloseSound.php b/src/pocketmine/world/sound/ChestCloseSound.php
index 78fc5e740..e3476e47d 100644
--- a/src/pocketmine/world/sound/ChestCloseSound.php
+++ b/src/pocketmine/world/sound/ChestCloseSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class ChestCloseSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_CHEST_CLOSED, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/ChestOpenSound.php b/src/pocketmine/world/sound/ChestOpenSound.php
index 33dde6627..2668b8e8d 100644
--- a/src/pocketmine/world/sound/ChestOpenSound.php
+++ b/src/pocketmine/world/sound/ChestOpenSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class ChestOpenSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_CHEST_OPEN, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/EnderChestCloseSound.php b/src/pocketmine/world/sound/EnderChestCloseSound.php
index d092646c2..021d6c357 100644
--- a/src/pocketmine/world/sound/EnderChestCloseSound.php
+++ b/src/pocketmine/world/sound/EnderChestCloseSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class EnderChestCloseSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_ENDERCHEST_CLOSED, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/EnderChestOpenSound.php b/src/pocketmine/world/sound/EnderChestOpenSound.php
index e8b02367f..13788a6e8 100644
--- a/src/pocketmine/world/sound/EnderChestOpenSound.php
+++ b/src/pocketmine/world/sound/EnderChestOpenSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class EnderChestOpenSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_ENDERCHEST_OPEN, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/ExplodeSound.php b/src/pocketmine/world/sound/ExplodeSound.php
index 11849ef1f..7e9ee4715 100644
--- a/src/pocketmine/world/sound/ExplodeSound.php
+++ b/src/pocketmine/world/sound/ExplodeSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class ExplodeSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_EXPLODE, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/FlintSteelSound.php b/src/pocketmine/world/sound/FlintSteelSound.php
index 94d130bdf..eb4fe3e93 100644
--- a/src/pocketmine/world/sound/FlintSteelSound.php
+++ b/src/pocketmine/world/sound/FlintSteelSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class FlintSteelSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_IGNITE, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/IgniteSound.php b/src/pocketmine/world/sound/IgniteSound.php
index 4d70f65c5..4066ef189 100644
--- a/src/pocketmine/world/sound/IgniteSound.php
+++ b/src/pocketmine/world/sound/IgniteSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 
 class IgniteSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_IGNITE, 0, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/ItemBreakSound.php b/src/pocketmine/world/sound/ItemBreakSound.php
index d1246c712..7dd7de43b 100644
--- a/src/pocketmine/world/sound/ItemBreakSound.php
+++ b/src/pocketmine/world/sound/ItemBreakSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class ItemBreakSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BREAK, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/LevelEventSound.php b/src/pocketmine/world/sound/LevelEventSound.php
index 1e2d75b45..14c0fb7ca 100644
--- a/src/pocketmine/world/sound/LevelEventSound.php
+++ b/src/pocketmine/world/sound/LevelEventSound.php
@@ -48,7 +48,7 @@ abstract class LevelEventSound implements Sound{
 		$this->pitch = $pitch * 1000;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelEventPacket::create($this->getLevelEventId(), (int) $this->pitch, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/PotionSplashSound.php b/src/pocketmine/world/sound/PotionSplashSound.php
index 24ce0fcdf..97c1dab08 100644
--- a/src/pocketmine/world/sound/PotionSplashSound.php
+++ b/src/pocketmine/world/sound/PotionSplashSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class PotionSplashSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_GLASS, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/RedstonePowerOffSound.php b/src/pocketmine/world/sound/RedstonePowerOffSound.php
index 5e2dcf16e..f8ea474f3 100644
--- a/src/pocketmine/world/sound/RedstonePowerOffSound.php
+++ b/src/pocketmine/world/sound/RedstonePowerOffSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class RedstonePowerOffSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_POWER_OFF, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/RedstonePowerOnSound.php b/src/pocketmine/world/sound/RedstonePowerOnSound.php
index bcd238939..c01ee10b4 100644
--- a/src/pocketmine/world/sound/RedstonePowerOnSound.php
+++ b/src/pocketmine/world/sound/RedstonePowerOnSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class RedstonePowerOnSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_POWER_ON, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/Sound.php b/src/pocketmine/world/sound/Sound.php
index 63f6739be..ad486f0b6 100644
--- a/src/pocketmine/world/sound/Sound.php
+++ b/src/pocketmine/world/sound/Sound.php
@@ -29,9 +29,9 @@ use pocketmine\network\mcpe\protocol\ClientboundPacket;
 interface Sound{
 
 	/**
-	 * @param Vector3 $pos
+	 * @param Vector3|null $pos
 	 *
 	 * @return ClientboundPacket|ClientboundPacket[]
 	 */
-	public function encode(Vector3 $pos);
+	public function encode(?Vector3 $pos);
 }
diff --git a/src/pocketmine/world/sound/ThrowSound.php b/src/pocketmine/world/sound/ThrowSound.php
index bc387654a..feb0ca724 100644
--- a/src/pocketmine/world/sound/ThrowSound.php
+++ b/src/pocketmine/world/sound/ThrowSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class ThrowSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_THROW, $pos, -1, "minecraft:player");
 	}
 }
diff --git a/src/pocketmine/world/sound/TotemUseSound.php b/src/pocketmine/world/sound/TotemUseSound.php
index 20d3810f2..064008942 100644
--- a/src/pocketmine/world/sound/TotemUseSound.php
+++ b/src/pocketmine/world/sound/TotemUseSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 
 class TotemUseSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_TOTEM, 0, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/XpCollectSound.php b/src/pocketmine/world/sound/XpCollectSound.php
index 8b3994ecc..f87c2719f 100644
--- a/src/pocketmine/world/sound/XpCollectSound.php
+++ b/src/pocketmine/world/sound/XpCollectSound.php
@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 
 class XpCollectSound implements Sound{
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_ORB, 0, $pos);
 	}
 }
diff --git a/src/pocketmine/world/sound/XpLevelUpSound.php b/src/pocketmine/world/sound/XpLevelUpSound.php
index e173ca7be..6e41e9689 100644
--- a/src/pocketmine/world/sound/XpLevelUpSound.php
+++ b/src/pocketmine/world/sound/XpLevelUpSound.php
@@ -44,7 +44,7 @@ class XpLevelUpSound implements Sound{
 		return $this->xpLevel;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(?Vector3 $pos){
 		//No idea why such odd numbers, but this works...
 		//TODO: check arbitrary volume
 		return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_LEVELUP, $pos, 0x10000000 * intdiv(min(30, $this->xpLevel), 5));