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

Internal Fixes

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo
2013-01-21 00:19:49 +01:00
parent c049b5fb72
commit ef76138a1c
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/classes/world/Entity.php
View File

@@ -49,7 +49,7 @@ class Entity extends stdClass{
$this->closed = false;
$this->name = "";
$this->server->query("INSERT OR REPLACE INTO entities (EID, type, class, health) VALUES (".$this->eid.", ".$this->type.", ".$this->class.", ".$this->health.");");
$this->server->schedule(2, array($this, "update"), array(), true);
$this->server->schedule(4, array($this, "update"), array(), true);
$this->metadata = array();
$this->x = isset($this->data["x"]) ? $this->data["x"]:0;
$this->y = isset($this->data["y"]) ? $this->data["y"]:0;
@@ -82,7 +82,7 @@ class Entity extends stdClass{
public function update(){
$this->calculateVelocity();
$this->server->api->dhandle("entity.move", $this);
if($this->class === ENTITY_ITEM and $this->closed === false){
if($this->class === ENTITY_ITEM and $this->closed === false and $this->server->gamemode === 0){
$player = $this->server->query("SELECT EID FROM entities WHERE class == ".ENTITY_PLAYER." AND abs(x - {$this->x}) <= 1.5 AND abs(y - {$this->y}) <= 1.5 AND abs(z - {$this->z}) <= 1.5 LIMIT 1;", true);
if($player !== true and $player !== false){
if($this->server->api->dhandle("player.pickup", array(