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

Added more death messages

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-16 11:51:43 +02:00
parent f0e7713dce
commit 34139c7efe
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pocketmine/Player.php
View File

@ -982,7 +982,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$pk = new StartGamePacket; $pk = new StartGamePacket;
$pk->seed = $this->getLevel()->getSeed(); $pk->seed = $this->getLevel()->getSeed();
$pk->x = $this->x; $pk->x = $this->x;
$pk->y = $this->y + 1.62; $pk->y = $this->y + $this->getEyeHeight();
$pk->z = $this->z; $pk->z = $this->z;
$pk->spawnX = (int) $spawnPosition->x; $pk->spawnX = (int) $spawnPosition->x;
$pk->spawnY = (int) $spawnPosition->y; $pk->spawnY = (int) $spawnPosition->y;
@ -1393,7 +1393,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$pk = new MovePlayerPacket(); $pk = new MovePlayerPacket();
$pk->eid = 0; $pk->eid = 0;
$pk->x = $this->x; $pk->x = $this->x;
$pk->y = $this->y + 1.62; $pk->y = $this->y + $this->getEyeHeight();
$pk->z = $this->z; $pk->z = $this->z;
$pk->bodyYaw = $this->yaw; $pk->bodyYaw = $this->yaw;
$pk->pitch = $this->pitch; $pk->pitch = $this->pitch;
@ -1567,7 +1567,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$nbt = new Compound("", [ $nbt = new Compound("", [
"Pos" => new Enum("Pos", [ "Pos" => new Enum("Pos", [
new Double("", $this->x), new Double("", $this->x),
new Double("", $this->y + 1.62), new Double("", $this->y + $this->getEyeHeight()),
new Double("", $this->z) new Double("", $this->z)
]), ]),
"Motion" => new Enum("Motion", [ "Motion" => new Enum("Motion", [
@ -2327,12 +2327,27 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$message = $this->getName() . " hit the ground too hard"; $message = $this->getName() . " hit the ground too hard";
break; break;
case EntityDamageEvent::CAUSE_CONTACT:
case EntityDamageEvent::CAUSE_SUFFOCATION: case EntityDamageEvent::CAUSE_SUFFOCATION:
case EntityDamageEvent::CAUSE_FIRE: $message = $this->getName() . " suffocated in a wall";
case EntityDamageEvent::CAUSE_FIRE_TICK: break;
case EntityDamageEvent::CAUSE_LAVA: case EntityDamageEvent::CAUSE_LAVA:
$message = $this->getName() . " tried to swim in lava";
break;
case EntityDamageEvent::CAUSE_FIRE:
$message = $this->getName() . " went up in flames";
break;
case EntityDamageEvent::CAUSE_FIRE_TICK:
$message = $this->getName() . " burned to death";
break;
case EntityDamageEvent::CAUSE_DROWNING: case EntityDamageEvent::CAUSE_DROWNING:
$message = $this->getName() . " drowned";
break;
case EntityDamageEvent::CAUSE_CONTACT:
case EntityDamageEvent::CAUSE_BLOCK_EXPLOSION: case EntityDamageEvent::CAUSE_BLOCK_EXPLOSION:
case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION: case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
case EntityDamageEvent::CAUSE_MAGIC: case EntityDamageEvent::CAUSE_MAGIC:
@ -2423,7 +2438,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$pk = new MovePlayerPacket; $pk = new MovePlayerPacket;
$pk->eid = 0; $pk->eid = 0;
$pk->x = $this->x; $pk->x = $this->x;
$pk->y = $this->y + 1.62; //teleport from head $pk->y = $this->y + $this->getEyeHeight();
$pk->z = $this->z; $pk->z = $this->z;
$pk->bodyYaw = $this->yaw; $pk->bodyYaw = $this->yaw;
$pk->pitch = $this->pitch; $pk->pitch = $this->pitch;