From f21e457dc0e84731d838e418e26fd30dc39de9a7 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 18 Mar 2015 21:49:01 +0100
Subject: [PATCH] Fixed particle constructor

---
 src/pocketmine/level/particle/BubbleParticle.php      | 2 +-
 src/pocketmine/level/particle/CriticalParticle.php    | 2 +-
 src/pocketmine/level/particle/DustParticle.php        | 2 +-
 src/pocketmine/level/particle/EnchantParticle.php     | 2 +-
 src/pocketmine/level/particle/EntityFlameParticle.php | 2 +-
 src/pocketmine/level/particle/ExplodeParticle.php     | 2 +-
 src/pocketmine/level/particle/FlameParticle.php       | 2 +-
 src/pocketmine/level/particle/HeartParticle.php       | 2 +-
 src/pocketmine/level/particle/InkCloudParticle.php    | 2 +-
 src/pocketmine/level/particle/InkParticle.php         | 2 +-
 src/pocketmine/level/particle/ItemBreakParticle.php   | 2 +-
 src/pocketmine/level/particle/LavaDripParticle.php    | 2 +-
 src/pocketmine/level/particle/LavaParticle.php        | 2 +-
 src/pocketmine/level/particle/PortalParticle.php      | 2 +-
 src/pocketmine/level/particle/RedstoneParticle.php    | 2 +-
 src/pocketmine/level/particle/SmokeParticle.php       | 2 +-
 src/pocketmine/level/particle/SplashParticle.php      | 2 +-
 src/pocketmine/level/particle/TerrainParticle.php     | 2 +-
 src/pocketmine/level/particle/WaterDripParticle.php   | 2 +-
 src/pocketmine/level/particle/WaterParticle.php       | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/pocketmine/level/particle/BubbleParticle.php b/src/pocketmine/level/particle/BubbleParticle.php
index 2aa5751fb..ad3e06c2e 100644
--- a/src/pocketmine/level/particle/BubbleParticle.php
+++ b/src/pocketmine/level/particle/BubbleParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class BubbleParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 1);
+		parent::__construct($pos, 1);
 	}
 }
diff --git a/src/pocketmine/level/particle/CriticalParticle.php b/src/pocketmine/level/particle/CriticalParticle.php
index c35fd28a7..cfe624362 100644
--- a/src/pocketmine/level/particle/CriticalParticle.php
+++ b/src/pocketmine/level/particle/CriticalParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class CriticalParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 2);
+		parent::__construct($pos, 2);
 	}
 }
diff --git a/src/pocketmine/level/particle/DustParticle.php b/src/pocketmine/level/particle/DustParticle.php
index 15a96f9e0..e3de30907 100644
--- a/src/pocketmine/level/particle/DustParticle.php
+++ b/src/pocketmine/level/particle/DustParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class DustParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, $r, $g, $b, $a = 255){
-		parent::__construct($pos->x, $pos->y, $pos->z, 22, (($a & 0xff) << 24) | (($r & 0xff) << 16) | (($g & 0xff) << 8) | ($b & 0xff));
+		parent::__construct($pos, 22, (($a & 0xff) << 24) | (($r & 0xff) << 16) | (($g & 0xff) << 8) | ($b & 0xff));
 	}
 }
diff --git a/src/pocketmine/level/particle/EnchantParticle.php b/src/pocketmine/level/particle/EnchantParticle.php
index d9c216961..a5c82daf2 100644
--- a/src/pocketmine/level/particle/EnchantParticle.php
+++ b/src/pocketmine/level/particle/EnchantParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class EnchantParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 23);
+		parent::__construct($pos, 23);
 	}
 }
diff --git a/src/pocketmine/level/particle/EntityFlameParticle.php b/src/pocketmine/level/particle/EntityFlameParticle.php
index 37749f09f..283f8b4e2 100644
--- a/src/pocketmine/level/particle/EntityFlameParticle.php
+++ b/src/pocketmine/level/particle/EntityFlameParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class EntityFlameParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 13);
+		parent::__construct($pos, 13);
 	}
 }
diff --git a/src/pocketmine/level/particle/ExplodeParticle.php b/src/pocketmine/level/particle/ExplodeParticle.php
index fc8748f8c..0504697f9 100644
--- a/src/pocketmine/level/particle/ExplodeParticle.php
+++ b/src/pocketmine/level/particle/ExplodeParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class ExplodeParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 4);
+		parent::__construct($pos, 4);
 	}
 }
diff --git a/src/pocketmine/level/particle/FlameParticle.php b/src/pocketmine/level/particle/FlameParticle.php
index 108aa5a77..400ef7092 100644
--- a/src/pocketmine/level/particle/FlameParticle.php
+++ b/src/pocketmine/level/particle/FlameParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class FlameParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 5);
+		parent::__construct($pos, 5);
 	}
 }
diff --git a/src/pocketmine/level/particle/HeartParticle.php b/src/pocketmine/level/particle/HeartParticle.php
index 79f33978b..dd3bbe3e6 100644
--- a/src/pocketmine/level/particle/HeartParticle.php
+++ b/src/pocketmine/level/particle/HeartParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class HeartParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, $scale = 0){
-		parent::__construct($pos->x, $pos->y, $pos->z, 14, $scale);
+		parent::__construct($pos, 14, $scale);
 	}
 }
diff --git a/src/pocketmine/level/particle/InkCloudParticle.php b/src/pocketmine/level/particle/InkCloudParticle.php
index 61725a7d5..0f07e0602 100644
--- a/src/pocketmine/level/particle/InkCloudParticle.php
+++ b/src/pocketmine/level/particle/InkCloudParticle.php
@@ -34,7 +34,7 @@ class InkCloudParticle extends Particle{
 	protected $count = 1;
 
 	public function __construct(Vector3 $pos, $count = 1){
-		parent::__construct($pos->x, $pos->y, $pos->z);
+		parent::__construct($pos);
 		$this->count = (int) $count;
 	}
 	
diff --git a/src/pocketmine/level/particle/InkParticle.php b/src/pocketmine/level/particle/InkParticle.php
index 1effda9a7..eff22b05e 100644
--- a/src/pocketmine/level/particle/InkParticle.php
+++ b/src/pocketmine/level/particle/InkParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class InkParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, $scale = 0){
-		parent::__construct($pos->x, $pos->y, $pos->z, 25, $scale);
+		parent::__construct($pos, 25, $scale);
 	}
 }
diff --git a/src/pocketmine/level/particle/ItemBreakParticle.php b/src/pocketmine/level/particle/ItemBreakParticle.php
index 11108a9df..4314c896c 100644
--- a/src/pocketmine/level/particle/ItemBreakParticle.php
+++ b/src/pocketmine/level/particle/ItemBreakParticle.php
@@ -26,6 +26,6 @@ use pocketmine\item\Item;
 
 class ItemBreakParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, Item $item){
-		parent::__construct($pos->x, $pos->y, $pos->z, 9, ($item->getId() << 16) | $item->getDamage());
+		parent::__construct($pos, 9, ($item->getId() << 16) | $item->getDamage());
 	}
 }
diff --git a/src/pocketmine/level/particle/LavaDripParticle.php b/src/pocketmine/level/particle/LavaDripParticle.php
index d95f0a12d..c0b557632 100644
--- a/src/pocketmine/level/particle/LavaDripParticle.php
+++ b/src/pocketmine/level/particle/LavaDripParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class LavaDripParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 21);
+		parent::__construct($pos, 21);
 	}
 }
diff --git a/src/pocketmine/level/particle/LavaParticle.php b/src/pocketmine/level/particle/LavaParticle.php
index 9ad06b45e..d5e2b0c47 100644
--- a/src/pocketmine/level/particle/LavaParticle.php
+++ b/src/pocketmine/level/particle/LavaParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class LavaParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 6);
+		parent::__construct($pos, 6);
 	}
 }
diff --git a/src/pocketmine/level/particle/PortalParticle.php b/src/pocketmine/level/particle/PortalParticle.php
index d1f1706cc..95ce3b16d 100644
--- a/src/pocketmine/level/particle/PortalParticle.php
+++ b/src/pocketmine/level/particle/PortalParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class PortalParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 17);
+		parent::__construct($pos, 17);
 	}
 }
diff --git a/src/pocketmine/level/particle/RedstoneParticle.php b/src/pocketmine/level/particle/RedstoneParticle.php
index 24795bfdc..c976da531 100644
--- a/src/pocketmine/level/particle/RedstoneParticle.php
+++ b/src/pocketmine/level/particle/RedstoneParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class RedstoneParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, $lifetime = 1){
-		parent::__construct($pos->x, $pos->y, $pos->z, 8, $lifetime);
+		parent::__construct($pos, 8, $lifetime);
 	}
 }
diff --git a/src/pocketmine/level/particle/SmokeParticle.php b/src/pocketmine/level/particle/SmokeParticle.php
index f98570c55..b21f66090 100644
--- a/src/pocketmine/level/particle/SmokeParticle.php
+++ b/src/pocketmine/level/particle/SmokeParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class SmokeParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, $scale = 0){
-		parent::__construct($pos->x, $pos->y, $pos->z, 3, (int) $scale);
+		parent::__construct($pos, 3, (int) $scale);
 	}
 }
diff --git a/src/pocketmine/level/particle/SplashParticle.php b/src/pocketmine/level/particle/SplashParticle.php
index 9a9942273..62da9de07 100644
--- a/src/pocketmine/level/particle/SplashParticle.php
+++ b/src/pocketmine/level/particle/SplashParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class SplashParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 18);
+		parent::__construct($pos, 18);
 	}
 }
diff --git a/src/pocketmine/level/particle/TerrainParticle.php b/src/pocketmine/level/particle/TerrainParticle.php
index 3b74c8c67..a74137dd9 100644
--- a/src/pocketmine/level/particle/TerrainParticle.php
+++ b/src/pocketmine/level/particle/TerrainParticle.php
@@ -26,6 +26,6 @@ use pocketmine\math\Vector3;
 
 class TerrainParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, Block $b){
-		parent::__construct($pos->x, $pos->y, $pos->z, 15, ($b->getId() << 8) | $b->getDamage());
+		parent::__construct($pos, 15, ($b->getId() << 8) | $b->getDamage());
 	}
 }
diff --git a/src/pocketmine/level/particle/WaterDripParticle.php b/src/pocketmine/level/particle/WaterDripParticle.php
index 6792114eb..2ae566217 100644
--- a/src/pocketmine/level/particle/WaterDripParticle.php
+++ b/src/pocketmine/level/particle/WaterDripParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class WaterDripParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 20);
+		parent::__construct($pos, 20);
 	}
 }
diff --git a/src/pocketmine/level/particle/WaterParticle.php b/src/pocketmine/level/particle/WaterParticle.php
index 60b92713a..8a5682232 100644
--- a/src/pocketmine/level/particle/WaterParticle.php
+++ b/src/pocketmine/level/particle/WaterParticle.php
@@ -25,6 +25,6 @@ use pocketmine\math\Vector3;
 
 class WaterParticle extends GenericParticle{
 	public function __construct(Vector3 $pos){
-		parent::__construct($pos->x, $pos->y, $pos->z, 19);
+		parent::__construct($pos, 19);
 	}
 }