New speed limit

This commit is contained in:
Shoghi Cervantes 2013-06-09 13:37:27 +02:00
parent bd1875f5e4
commit 099bedf8ee
2 changed files with 7 additions and 3 deletions

View File

@ -1150,8 +1150,8 @@ class Player{
}
if(($this->entity instanceof Entity) and $data["counter"] > $this->lastMovement){
$this->lastMovement = $data["counter"];
$speed = $this->entity->getSpeed();
if($this->blocked === true or ($this->server->api->getProperty("allow-flight") !== true and (($speed > 6 and ($this->gamemode & 0x01) === 0x00) or $speed > 15)) or $this->server->api->handle("player.move", $this->entity) === false){
$speed = $this->entity->speed;
if($this->blocked === true or ($this->server->api->getProperty("allow-flight") !== true and (($speed > 7 and ($this->gamemode & 0x01) === 0x00) or $speed > 15)) or $this->server->api->handle("player.move", $this->entity) === false){
if($this->lastCorrect instanceof Vector3){
$this->teleport($this->lastCorrect, $this->entity->yaw, $this->entity->pitch, false);
}

View File

@ -501,7 +501,7 @@ class Entity extends Position{
}
$this->calculateVelocity();
if($this->speed <= 5 or ($this->speed <= 12 and ($this->player->gamemode & 0x01) === 0x01)){
if($this->speed <= 7 or ($this->speed <= 15 and ($this->player->gamemode & 0x01) === 0x01)){
$this->player->lastCorrect = new Vector3($this->last[0], $this->last[1], $this->last[2]);
}
}
@ -782,6 +782,10 @@ class Entity extends Position{
}
public function getSpeed(){
return $this->speed;
}
public function getSpeedMeasure(){
return array_sum($this->speedMeasure) / count($this->speedMeasure);
}