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

Flying damage

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo
2013-02-05 21:33:30 +01:00
parent f53e08bb84
commit e433f0f6dc
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/BlockAPI.php
View File

@@ -171,7 +171,7 @@ class BlockAPI{
if(count($drops) > 0){
foreach($drops as $drop){
$this->drop($target->x, $target->y, $target->z, $drop[0] & 0xFFFF, $drop[1] & 0xFFFF, $drop[2] & 0xFF);
}
}
}
return false;
}

12
src/API/PlayerAPI.php
View File

@@ -44,11 +44,11 @@ class PlayerAPI{
public function handle($data, $event){
switch($event){
case "server.regeneration":
$result = $this->server->query("SELECT EID FROM players WHERE EID = (SELECT EID FROM entities WHERE health < 20);");
$result = $this->server->query("SELECT EID FROM entities WHERE class = ".ENTITY_PLAYER." AND health < 20;");
if($result !== true and $result !== false){
while(false !== ($player = $result->fetchArray())){
while(($player = $result->fetchArray()) !== false){
if(($player = $this->server->api->entity->get($player["EID"])) !== false){
if($player->dead === true){
if($player->getHealth() <= 0){
continue;
}
$player->setHealth(min(20, $player->getHealth() + $data), "regeneration");
@@ -94,6 +94,9 @@ class PlayerAPI{
case "fall":
$message .= " hit the ground too hard";
break;
case "flying":
$message .= " tried to get up to the sky";
break;
default:
$message .= " died";
break;
@@ -171,6 +174,8 @@ class PlayerAPI{
public function tppos($name, $x, $y, $z){
$player = $this->get($name);
if($player !== false){
$player->entity->setPosition($x, $y, $z, 0, 0);
$player->fallY = false;
$player->dataPacket(MC_MOVE_PLAYER, array(
"eid" => 0,
"x" => $x,
@@ -179,6 +184,7 @@ class PlayerAPI{
"yaw" => 0,
"pitch" => 0,
));
$player->fallY = false;
return true;
}
return false;