mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-31 23:33:06 +00:00
Code Issues Projects Releases Wiki Activity

Removed old trigger_error() calls, closes #2335

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-11-27 13:16:39 +01:00
parent 4a90ac270f
commit 441a98e60a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/level/format/anvil/RegionLoader.php
View File

@ -31,6 +31,7 @@ use pocketmine\nbt\tag\Int;
use pocketmine\nbt\tag\IntArray; use pocketmine\nbt\tag\IntArray;
use pocketmine\nbt\tag\Long; use pocketmine\nbt\tag\Long;
use pocketmine\utils\Binary; use pocketmine\utils\Binary;
use pocketmine\utils\MainLogger;
class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
const VERSION = 1; const VERSION = 1;
@ -88,11 +89,11 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
} }
if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors
trigger_error("Corrupted bigger chunk detected", E_USER_WARNING); MainLogger::getLogger()->error("Corrupted chunk detected");
$this->locationTable[$index][1] = $length >> 12; $this->locationTable[$index][1] = $length >> 12;
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
}elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){ }elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
trigger_error("Invalid compression type", E_USER_WARNING); MainLogger::getLogger()->error("Invalid compression type");
return false; return false;
} }
@ -101,7 +102,7 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
if($chunk instanceof Chunk){ if($chunk instanceof Chunk){
return $chunk; return $chunk;
}elseif($forward === false){ }elseif($forward === false){
trigger_error("Corrupted chunk detected", E_USER_WARNING); MainLogger::getLogger()->error("Corrupted chunk detected");
$this->generateChunk($x, $z); $this->generateChunk($x, $z);
return $this->readChunk($x, $z, $generate, true); return $this->readChunk($x, $z, $generate, true);

7
src/pocketmine/level/format/mcregion/RegionLoader.php
View File

@ -32,6 +32,7 @@ use pocketmine\nbt\tag\Int;
use pocketmine\nbt\tag\IntArray; use pocketmine\nbt\tag\IntArray;
use pocketmine\nbt\tag\Long; use pocketmine\nbt\tag\Long;
use pocketmine\utils\Binary; use pocketmine\utils\Binary;
use pocketmine\utils\MainLogger;
class RegionLoader{ class RegionLoader{
const VERSION = 1; const VERSION = 1;
@ -109,11 +110,11 @@ class RegionLoader{
} }
if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors
trigger_error("Corrupted bigger chunk detected", E_USER_WARNING); MainLogger::getLogger()->error("Corrupted bigger chunk detected");
$this->locationTable[$index][1] = $length >> 12; $this->locationTable[$index][1] = $length >> 12;
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
}elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){ }elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
trigger_error("Invalid compression type", E_USER_WARNING); MainLogger::getLogger()->error("Invalid compression type");
return false; return false;
} }
@ -122,7 +123,7 @@ class RegionLoader{
if($chunk instanceof Chunk){ if($chunk instanceof Chunk){
return $chunk; return $chunk;
}elseif($forward === false){ }elseif($forward === false){
trigger_error("Corrupted chunk detected", E_USER_WARNING); MainLogger::getLogger()->error("Corrupted chunk detected");
$this->generateChunk($x, $z); $this->generateChunk($x, $z);
return $this->readChunk($x, $z, $generate, true); return $this->readChunk($x, $z, $generate, true);

6
src/pocketmine/plugin/PluginDescription.php
View File

@ -66,7 +66,7 @@ class PluginDescription{
$this->main = $plugin["main"]; $this->main = $plugin["main"];
$this->api = !is_array($plugin["api"]) ? [$plugin["api"]] : $plugin["api"]; $this->api = !is_array($plugin["api"]) ? [$plugin["api"]] : $plugin["api"];
if(stripos($this->main, "pocketmine\\") === 0){ if(stripos($this->main, "pocketmine\\") === 0){
trigger_error("Invalid PluginDescription main, cannot start within the PocketMine namespace", E_USER_ERROR); throw new PluginException("Invalid PluginDescription main, cannot start within the PocketMine namespace");
return; return;
} }
@ -97,9 +97,7 @@ class PluginDescription{
if(isset($plugin["load"])){ if(isset($plugin["load"])){
$order = strtoupper($plugin["load"]); $order = strtoupper($plugin["load"]);
if(!defined(PluginLoadOrder::class . "::" . $order)){ if(!defined(PluginLoadOrder::class . "::" . $order)){
trigger_error("Invalid PluginDescription load", E_USER_ERROR); throw new PluginException("Invalid PluginDescription load");
return;
}else{ }else{
$this->order = constant(PluginLoadOrder::class . "::" . $order); $this->order = constant(PluginLoadOrder::class . "::" . $order);
} }