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

Merge remote-tracking branch 'origin/master' into mcpe-0.12

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-08-12 15:00:04 +02:00
commit 6e2ea63ce1
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/block/FenceGate.php
View File

@ -107,7 +107,7 @@ class FenceGate extends Transparent{
]; ];
$this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04); $this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04);
$this->getLevel()->setBlock($this, $this, true); $this->getLevel()->setBlock($this, $this, true);
$this->level->addSound(new DoorSound($this));
return true; return true;
} }
} }

4
src/pocketmine/block/Trapdoor.php
View File

@ -146,11 +146,11 @@ class Trapdoor extends Transparent{
public function onActivate(Item $item, Player $player = null){ public function onActivate(Item $item, Player $player = null){
$this->meta ^= 0x04; $this->meta ^= 0x04;
$this->getLevel()->setBlock($this, $this, true); $this->getLevel()->setBlock($this, $this, true);
$this->level->addSound(new DoorSound($this));
return true; return true;
} }
public function getToolType(){ public function getToolType(){
return Tool::TYPE_AXE; return Tool::TYPE_AXE;
} }
} }

4
src/pocketmine/item/CookedFish.php
View File

@ -24,10 +24,10 @@ namespace pocketmine\item;
class CookedFish extends Item{ class CookedFish extends Item{
public function __construct($meta = 0, $count = 1){ public function __construct($meta = 0, $count = 1){
parent::__construct(self::RAW_FISH, $meta, $count, "Cooked Fish"); parent::__construct(self::COOKED_FISH, $meta, $count, "Cooked Fish");
if($this->meta === 1){ if($this->meta === 1){
$this->name = "Cooked Salmon"; $this->name = "Cooked Salmon";
} }
} }
} }

11
src/pocketmine/plugin/PluginManager.php
View File

@ -748,8 +748,15 @@ class PluginManager{
* @throws PluginException * @throws PluginException
*/ */
public function registerEvent($event, Listener $listener, $priority, EventExecutor $executor, Plugin $plugin, $ignoreCancelled = false){ public function registerEvent($event, Listener $listener, $priority, EventExecutor $executor, Plugin $plugin, $ignoreCancelled = false){
if(!is_subclass_of($event, Event::class) or (new \ReflectionClass($event))->isAbstract()){ if(!is_subclass_of($event, Event::class)){
throw new PluginException($event . " is not a valid Event"); throw new PluginException($event . " is not an Event");
}
$class = new \ReflectionClass($event);
if($class->isAbstract()){
throw new PluginException($event . " is an abstract Event");
}
if($class->getProperty("handlerList")->getDeclaringClass()->getName() !== $event){
throw new PluginException($event . " does not have a handler list");
} }
if(!$plugin->isEnabled()){ if(!$plugin->isEnabled()){