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

Merge branch 'release/3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-12-30 17:33:31 +00:00
parent 39c0fa6103 e0e2e1775f
commit ae497a828f
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Player.php
View File

@@ -3346,9 +3346,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
public function onChunkChanged(Chunk $chunk){
if(isset($this->usedChunks[$hash = Level::chunkHash($chunk->getX(), $chunk->getZ())])){
$this->usedChunks[$hash] = false;
if(!$this->spawned){
$this->nextChunkOrderRun = 0;
}
$this->nextChunkOrderRun = 0;
}
}

12
src/pocketmine/entity/Attribute.php
View File

@@ -110,8 +110,8 @@ class Attribute{
}
public function setMinValue(float $minValue){
if($minValue > $this->getMaxValue()){
throw new \InvalidArgumentException("Value $minValue is bigger than the maxValue!");
if($minValue > ($max = $this->getMaxValue())){
throw new \InvalidArgumentException("Minimum $minValue is greater than the maximum $max");
}
if($this->minValue != $minValue){
@@ -126,8 +126,8 @@ class Attribute{
}
public function setMaxValue(float $maxValue){
if($maxValue < $this->getMinValue()){
throw new \InvalidArgumentException("Value $maxValue is bigger than the minValue!");
if($maxValue < ($min = $this->getMinValue())){
throw new \InvalidArgumentException("Maximum $maxValue is less than the minimum $min");
}
if($this->maxValue != $maxValue){
@@ -143,7 +143,7 @@ class Attribute{
public function setDefaultValue(float $defaultValue){
if($defaultValue > $this->getMaxValue() or $defaultValue < $this->getMinValue()){
throw new \InvalidArgumentException("Value $defaultValue exceeds the range!");
throw new \InvalidArgumentException("Default $defaultValue is outside the range " . $this->getMinValue() . " - " . $this->getMaxValue());
}
if($this->defaultValue !== $defaultValue){
@@ -171,7 +171,7 @@ class Attribute{
public function setValue(float $value, bool $fit = false, bool $forceSend = false){
if($value > $this->getMaxValue() or $value < $this->getMinValue()){
if(!$fit){
throw new \InvalidArgumentException("Value $value exceeds the range!");
throw new \InvalidArgumentException("Value $value is outside the range " . $this->getMinValue() . " - " . $this->getMaxValue());
}
$value = min(max($value, $this->getMinValue()), $this->getMaxValue());
}

4
src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
View File

@@ -114,7 +114,9 @@ class ClientboundMapItemDataPacket extends DataPacket{
$this->yOffset = $this->getVarInt();
$count = $this->getUnsignedVarInt();
assert($count === $this->width * $this->height);
if($count !== $this->width * $this->height){
throw new \UnexpectedValueException("Expected colour count of " . ($this->height * $this->width) . " (height $this->height * width $this->width), got $count");
}
for($y = 0; $y < $this->height; ++$y){
for($x = 0; $x < $this->width; ++$x){

4
src/pocketmine/network/mcpe/protocol/DataPacket.php
View File

@@ -69,7 +69,9 @@ abstract class DataPacket extends NetworkBinaryStream{
protected function decodeHeader() : void{
$pid = $this->getUnsignedVarInt();
assert($pid === static::NETWORK_ID);
if($pid !== static::NETWORK_ID){
throw new \UnexpectedValueException("Expected " . static::NETWORK_ID . " for packet ID, got $pid");
}
}
/**