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

Ignore spawn protection when no ops are set

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-02-22 19:07:45 +01:00
parent f49db47b2e
commit eb0525e892
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/level/Level.php
View File

@ -1225,10 +1225,10 @@ class Level implements ChunkManager, Metadatable{
$ev->setCancelled(); $ev->setCancelled();
} }
if(!$player->isOp() and ($distance = $this->server->getConfigInt("spawn-protection", 16)) > -1){ if(!$player->isOp() and ($distance = $this->server->getSpawnRadius()) > -1){
$t = new Vector2($target->x, $target->z); $t = new Vector2($target->x, $target->z);
$s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z); $s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z);
if($t->distance($s) <= $distance){ //set it to cancelled so plugins can bypass this if(count($this->server->getOps()->getAll()) > 0 and $t->distance($s) <= $distance){ //set it to cancelled so plugins can bypass this
$ev->setCancelled(); $ev->setCancelled();
} }
} }
@ -1320,10 +1320,10 @@ class Level implements ChunkManager, Metadatable{
if($player instanceof Player){ if($player instanceof Player){
$ev = new PlayerInteractEvent($player, $item, $target, $face); $ev = new PlayerInteractEvent($player, $item, $target, $face);
if(!$player->isOp() and ($distance = $this->server->getConfigInt("spawn-protection", 16)) > -1){ if(!$player->isOp() and ($distance = $this->server->getSpawnRadius()) > -1){
$t = new Vector2($target->x, $target->z); $t = new Vector2($target->x, $target->z);
$s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z); $s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z);
if($t->distance($s) <= $distance){ //set it to cancelled so plugins can bypass this if(count($this->server->getOps()->getAll()) > 0 and $t->distance($s) <= $distance){ //set it to cancelled so plugins can bypass this
$ev->setCancelled(); $ev->setCancelled();
} }
} }
@ -1385,10 +1385,10 @@ class Level implements ChunkManager, Metadatable{
if($player instanceof Player){ if($player instanceof Player){
$ev = new BlockPlaceEvent($player, $hand, $block, $target, $item); $ev = new BlockPlaceEvent($player, $hand, $block, $target, $item);
if(!$player->isOp() and ($distance = $this->server->getConfigInt("spawn-protection", 16)) > -1){ if(!$player->isOp() and ($distance = $this->server->getSpawnRadius()) > -1){
$t = new Vector2($target->x, $target->z); $t = new Vector2($target->x, $target->z);
$s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z); $s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z);
if($t->distance($s) <= $distance){ //set it to cancelled so plugins can bypass this if(count($this->server->getOps()->getAll()) > 0 and $t->distance($s) <= $distance){ //set it to cancelled so plugins can bypass this
$ev->setCancelled(); $ev->setCancelled();
} }
} }