callback improvements, new structures for shootmania callbacks

core/Callbacks/Structures/ArmorEmptyStructure.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace ManiaControl\Callbacks\Structures;
+
+
+use ManiaControl\ManiaControl;
+use ManiaControl\Players\Player;
+
+class ArmorEmptyStructure {
+	private $shooter;
+	private $victim;
+	private $damage;
+	private $shooterPoints;
+	private $weapon;
+	/** @var ManiaControl $maniaControl */
+	private $maniaControl;
+
+	public function __construct(ManiaControl $maniaControl, $data) {
+		$this->shooter       = $data[0];
+		$this->victim        = $data[1];
+		$this->damage        = $data[2];
+		$this->weapon        = $data[3];
+		$this->shooterPoints = $data[4];
+	}
+
+	/**
+	 * @return Player
+	 */
+	public function getShooter() {
+		$shooter = $this->maniaControl->getPlayerManager()->getPlayer($this->shooter);
+		return $shooter;
+	}
+
+	/**
+	 * @return Player
+	 */
+	public function getVictim() {
+		$victim = $this->maniaControl->getPlayerManager()->getPlayer($this->victim);
+		return $victim;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getDamage() {
+		return $this->damage;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getShooterPoints() {
+		return $this->shooterPoints;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getWeapon() { //TODO any way of returning type "Weapon?"
+		return $this->weapon;
+	}
+}

core/Callbacks/Structures/CaptureStructure.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace ManiaControl\Callbacks\Structures;
+
+
+use ManiaControl\Players\Player;
+
+class CaptureStructure {
+	private $playerArray;
+
+	public function __construct($maniaControl, $data) {
+		$this->playerArray = $data;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getLoginArray() {
+		return $this->playerArray;
+	}
+
+	/**
+	 * @return Player[]
+	 */
+	public function getPlayerArray() {
+		//TODO build array with player objects
+		return $this->playerArray;
+	}
+}

core/Callbacks/Structures/NearMissStructure.php

@@ -23,7 +23,7 @@ class NearMissStructure {
 	}
 
 	/**
-	 * @return Player
+	 * @return Player|null
 	 */
 	public function getShooter() {
 		$shooter = $this->maniaControl->getPlayerManager()->getPlayer($this->shooter);
@@ -31,7 +31,7 @@ class NearMissStructure {
 	}
 
 	/**
-	 * @return Player
+	 * @return Player|null
 	 */
 	public function getVictim() {
 		$victim = $this->maniaControl->getPlayerManager()->getPlayer($this->victim);

core/Callbacks/Structures/PlayerHitStructure.php

@@ -24,7 +24,7 @@ class PlayerHitStructure {
 	}
 
 	/**
-	 * @return Player
+	 * @return Player|null
 	 */
 	public function getShooter() {
 		$shooter = $this->maniaControl->getPlayerManager()->getPlayer($this->shooter);
@@ -32,7 +32,7 @@ class PlayerHitStructure {
 	}
 
 	/**
-	 * @return Player
+	 * @return Player|null
 	 */
 	public function getVictim() {
 		$victim = $this->maniaControl->getPlayerManager()->getPlayer($this->victim);