mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #179 from williamtdr/master

Browse Source 
Updated Player.php for sword damage amounts
This commit is contained in:
Shoghi Cervantes 2013-04-02 07:27:55 -07:00
commit e3a858a089
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Player.php
View File

@ -852,7 +852,24 @@ class Player{
if(($target instanceof Entity) and $target->class === ENTITY_PLAYER and ($this->server->difficulty <= 0 or $target->gamemode === CREATIVE)){
break;
}elseif($this->handle("player.interact", $data) !== false){
$this->server->api->entity->harm($data["target"], $this->server->difficulty, $this->eid);
// Swords do proper damage amiunt (by williamtdr)
$harmamount = $this->server->difficulty;
if($data["entity"]->hand == 268) { // wooden sword
$harmamount = $harmamount + 3;
}
if($data["entity"]->hand == 283) { // gold sword
$harmamount = $harmamount + 3;
}
if($data["entity"]->hand == 272) { // stone sword
$harmamount = $harmamount + 4;
}
if($data["entity"]->hand == 267) { // iron sword
$harmamount = $harmamount + 5;
}
if($data["entity"]->hand == 276) { // diamond sword
$harmamount = $harmamount + 6;
}
$this->server->api->entity->harm($data["target"], $harmamount, $this->eid);
}
}
break;
@ -1001,7 +1018,7 @@ class Player{
}
$tile->setSlot($data["slot"], $item);
break;
case MC_SEND_INVENTORY: //TODO, Mojang, enable this ´^_^`
case MC_SEND_INVENTORY: //TODO, Mojang, enable this <EFBFBD>^_^`
break;
default:
console("[DEBUG] Unhandled 0x".dechex($data["id"])." Data Packet for Client ID ".$this->clientID.": ".print_r($data, true), true, true, 2);
@ -1116,4 +1133,4 @@ class Player{
return $this->clientID;
}
}
}