Added Cactus damage

pmmp · Sep 16, 2014 · 8a8a954 · 8a8a954
1 parent 34139c7
commit 8a8a954
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
@@ -2348,6 +2348,9 @@ public function kill(){
 				break;
 
 			case EntityDamageEvent::CAUSE_CONTACT:
+				$message = $this->getName() . " was pricked to death";
+				break;
+
 			case EntityDamageEvent::CAUSE_BLOCK_EXPLOSION:
 			case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
 			case EntityDamageEvent::CAUSE_MAGIC:

diff --git a/src/pocketmine/block/Cactus.php b/src/pocketmine/block/Cactus.php
@@ -26,6 +26,9 @@
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3 as Vector3;
 use pocketmine\Player;
+use pocketmine\entity\Entity;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\Server;
 
 class Cactus extends Transparent{
 	public function __construct($meta = 0){
@@ -45,6 +48,14 @@ public function getBoundingBox(){
 		);
 	}
 
+	public function onEntityCollide(Entity $entity){
+		$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_CONTACT, 1);
+		Server::getInstance()->getPluginManager()->callEvent($ev);
+		if(!$ev->isCancelled()){
+			$entity->attack($ev->getFinalDamage(), $ev);
+		}
+	}
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);