mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-13 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

Block more player actions when dead, closes #2102

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-19 20:19:27 +02:00
parent 056ed4802f
commit d1f22ee395
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pocketmine/Player.php
View File

@ -228,7 +228,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
* @param Player $player * @param Player $player
*/ */
public function spawnTo(Player $player){ public function spawnTo(Player $player){
if($this->spawned === true and $player->getLevel() === $this->getLevel() and $player->canSee($this)){ if($this->spawned === true and $this->dead !== true and $player->getLevel() === $this->getLevel() and $player->canSee($this)){
parent::spawnTo($player); parent::spawnTo($player);
} }
} }
@ -237,7 +237,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
* @param Player $player * @param Player $player
*/ */
public function despawnFrom(Player $player){ public function despawnFrom(Player $player){
if($this->spawned === true){ if($this->spawned === true and $this->dead !== true){
parent::despawnFrom($player); parent::despawnFrom($player);
} }
} }
@ -1085,7 +1085,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
public function onUpdate(){ public function onUpdate(){
if($this->spawned === false){ if($this->spawned === false or $this->dead === true){
return true; return true;
} }
$hasUpdate = $this->entityBaseTick(); $hasUpdate = $this->entityBaseTick();
@ -1128,6 +1128,8 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
} }
} }
return true;
} }
/** /**
@ -1325,20 +1327,17 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
break; break;
case ProtocolInfo::ROTATE_HEAD_PACKET: case ProtocolInfo::ROTATE_HEAD_PACKET:
if($this->spawned === false){ if($this->spawned === false or $this->dead === true){
break; break;
} }
$this->setRotation($packet->yaw, $this->pitch); $this->setRotation($packet->yaw, $this->pitch);
break; break;
case ProtocolInfo::MOVE_PLAYER_PACKET: case ProtocolInfo::MOVE_PLAYER_PACKET:
if($this->spawned === false){
break;
}
$newPos = new Vector3($packet->x, $packet->y, $packet->z); $newPos = new Vector3($packet->x, $packet->y, $packet->z);
$oldPos = new Vector3($this->x, $this->y, $this->z); $oldPos = new Vector3($this->x, $this->y, $this->z);
$revert = false; $revert = ($this->dead === true or $this->spawned !== true);
if($this->forceMovement instanceof Vector3 and $newPos->distance($this->forceMovement) > 0.1){ if($this->forceMovement instanceof Vector3 and $newPos->distance($this->forceMovement) > 0.1){
$revert = true; $revert = true;
@ -1407,7 +1406,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
break; break;
case ProtocolInfo::PLAYER_EQUIPMENT_PACKET: case ProtocolInfo::PLAYER_EQUIPMENT_PACKET:
if($this->spawned === false){ if($this->spawned === false or $this->dead === true){
break; break;
} }
@ -1685,7 +1684,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
break; break;
case ProtocolInfo::INTERACT_PACKET: case ProtocolInfo::INTERACT_PACKET:
if($this->spawned === false){ if($this->spawned === false or $this->dead === true){
break; break;
} }
@ -1806,7 +1805,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
break; break;
case ProtocolInfo::ANIMATE_PACKET: case ProtocolInfo::ANIMATE_PACKET:
if($this->spawned === false){ if($this->spawned === false or $this->dead === true){
break; break;
} }
@ -1929,7 +1928,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
break; break;
case ProtocolInfo::MESSAGE_PACKET: case ProtocolInfo::MESSAGE_PACKET:
if($this->spawned === false){ if($this->spawned === false or $this->dead === true){
break; break;
} }
$this->craftingType = 0; $this->craftingType = 0;