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

Added milk drinking

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-15 16:45:03 +02:00
parent 1ef6328635
commit dfec44645b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pocketmine/Player.php
View File

@ -2162,7 +2162,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
switch($packet->event){ switch($packet->event){
case 9: //Eating case 9: //Eating
$items = [ $items = [ //TODO: move this to item classes
Item::APPLE => 4, Item::APPLE => 4,
Item::MUSHROOM_STEW => 10, Item::MUSHROOM_STEW => 10,
Item::BEETROOT_SOUP => 10, Item::BEETROOT_SOUP => 10,
@ -2192,7 +2192,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
], ],
]; ];
$slot = $this->inventory->getItemInHand(); $slot = $this->inventory->getItemInHand();
if($this->getHealth() < 20 and isset($items[$slot->getId()])){ if($this->getHealth() < $this->getMaxHealth() and isset($items[$slot->getId()])){
$this->server->getPluginManager()->callEvent($ev = new PlayerItemConsumeEvent($this, $slot)); $this->server->getPluginManager()->callEvent($ev = new PlayerItemConsumeEvent($this, $slot));
if($ev->isCancelled()){ if($ev->isCancelled()){
$this->inventory->sendContents($this); $this->inventory->sendContents($this);
@ -2222,6 +2222,25 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->addEffect(Effect::getEffect(Effect::NAUSEA)->setAmplifier(1)->setDuration(15 * 20)); $this->addEffect(Effect::getEffect(Effect::NAUSEA)->setAmplifier(1)->setDuration(15 * 20));
$this->addEffect(Effect::getEffect(Effect::POISON)->setAmplifier(3)->setDuration(60 * 20)); $this->addEffect(Effect::getEffect(Effect::POISON)->setAmplifier(3)->setDuration(60 * 20));
} }
}elseif($slot->getId() === Item::BUCKET and $slot->getId() === 1){ //Milk!
$this->server->getPluginManager()->callEvent($ev = new PlayerItemConsumeEvent($this, $slot));
if($ev->isCancelled()){
$this->inventory->sendContents($this);
break;
}
$pk = new EntityEventPacket();
$pk->eid = $this->getId();
$pk->event = 9;
$pk->setChannel(Network::CHANNEL_WORLD_EVENTS);
$this->dataPacket($pk);
Server::broadcastPacket($this->getViewers(), $pk);
--$slot->count;
$this->inventory->setItemInHand($slot, $this);
$this->inventory->addItem(Item::get(Item::BUCKET, 0, 1));
$this->removeAllEffects();
} }
break; break;
} }