mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
code style fix
This commit is contained in:
parent
fc5c5625cb
commit
5e8e9330e2
361 changed files with 4766 additions and 4650 deletions
|
|
@ -8,26 +8,25 @@ class EntityAPI{
|
|||
function __construct(){
|
||||
$this->entities = [];
|
||||
$this->server = ServerAPI::request();
|
||||
|
||||
|
||||
$this->serverSpawnAnimals = $this->server->api->getProperty("spawn-animals");
|
||||
$this->serverSpawnMobs = $this->server->api->getProperty("spawn-mobs");
|
||||
}
|
||||
|
||||
|
||||
public function init(){
|
||||
$this->server->api->console->register("summon", "<mob>", [$this, "commandHandler"]);
|
||||
$this->server->api->console->register("spawnmob", "<mob>", [$this, "commandHandler"]);
|
||||
$this->server->api->console->register("despawn", "", [$this, "CommandHandler"]);
|
||||
$this->server->api->console->register("entcnt", "", [$this, "CommandHandler"]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function commandHandler($cmd, $args, $issuer, $alias){
|
||||
$mob = [
|
||||
"chicken" => 10,
|
||||
"cow" => 11,
|
||||
"pig" => 12,
|
||||
"sheep" => 13,
|
||||
|
||||
|
||||
"zombie" => 32,
|
||||
"creeper" => 33,
|
||||
"skeleton" => 34,
|
||||
|
|
@ -37,7 +36,7 @@ class EntityAPI{
|
|||
$output = "";
|
||||
switch($cmd){
|
||||
case "entcnt":
|
||||
return "Total amount of entities: ". count($this->entities);
|
||||
return "Total amount of entities: " . count($this->entities);
|
||||
case "summon":
|
||||
case "spawnmob":
|
||||
if(!($issuer instanceof Player)){
|
||||
|
|
@ -46,24 +45,24 @@ class EntityAPI{
|
|||
if((count($args) < 1) or (count($args) > 3)){
|
||||
return "Usage: /$cmd <mob> [amount] [baby]";
|
||||
}
|
||||
|
||||
|
||||
if(is_int($args[0])) $type = $args[0];
|
||||
else $type = $mob[strtolower($args[0])] ?? 0;
|
||||
if($type < 10 || $type > 36){
|
||||
return "Unknown mob.";
|
||||
}
|
||||
$mobName = ucfirst(array_flip($mob)[$type]);
|
||||
|
||||
|
||||
if(((isset($args[1]) && strtolower($args[1]) === "baby") || (isset($args[2]) && strtolower($args[2]) === "baby")) && !Utils::in_range($type, 10, 13)){
|
||||
return "$mobName cannot be a baby!";
|
||||
}
|
||||
|
||||
|
||||
$x = round($issuer->entity->x, 2, PHP_ROUND_HALF_UP);
|
||||
$y = round($issuer->entity->y, 2, PHP_ROUND_HALF_UP);
|
||||
$z = round($issuer->entity->z, 2, PHP_ROUND_HALF_UP);
|
||||
$level = $issuer->entity->level;
|
||||
$pos = new Position($x, $y, $z, $level);
|
||||
|
||||
|
||||
if(count($args) === 1){//summon <mob>
|
||||
$this->summon($pos, ENTITY_MOB, $type);
|
||||
return "$mobName spawned in $x, $y, $z.";
|
||||
|
|
@ -77,12 +76,12 @@ class EntityAPI{
|
|||
if(isset($args[2]) and strtolower($args[2]) === 'baby'){//summon <mob> [amount] [baby]
|
||||
$isBaby = true;
|
||||
}
|
||||
|
||||
|
||||
for($cnt = $amount; $cnt > 0; --$cnt){
|
||||
$this->summon($pos, ENTITY_MOB, $type, ["IsBaby" => $isBaby]);
|
||||
}
|
||||
|
||||
return "$amount ".($isBaby ? "Baby " : "")."$mobName(s) spawned in $x, $y, $z.";
|
||||
|
||||
return "$amount " . ($isBaby ? "Baby " : "") . "$mobName(s) spawned in $x, $y, $z.";
|
||||
}
|
||||
elseif(strtolower($args[1]) == "baby"){//summon <mob> [baby]
|
||||
$this->summon($pos, ENTITY_MOB, $type, ["IsBaby" => 1]);
|
||||
|
|
@ -94,7 +93,7 @@ class EntityAPI{
|
|||
if(!isset($args[0])){
|
||||
return "/despawn <all|mobs|objects|items|fallings|minecarts>";
|
||||
}
|
||||
|
||||
|
||||
$despawnclass = 0;
|
||||
$despawntype = 0;
|
||||
switch($args[0]){
|
||||
|
|
@ -138,12 +137,12 @@ class EntityAPI{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return "$cnt entities have been despawned!";
|
||||
}
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
public function summon(Position $pos, $class, $type, array $data = []){
|
||||
$entity = $this->add($pos->level, $class, $type, [
|
||||
"x" => $pos->x,
|
||||
|
|
@ -152,16 +151,16 @@ class EntityAPI{
|
|||
] + $data);
|
||||
$this->spawnToAll($entity);
|
||||
}
|
||||
|
||||
|
||||
public function getNextEID(){
|
||||
return $this->eCnt++;
|
||||
}
|
||||
|
||||
|
||||
public function addRaw(Entity $e){
|
||||
$eid = $e->eid;
|
||||
$this->entities[$eid] = $e;
|
||||
$cX = (int)$this->entities[$eid]->x >> 4;
|
||||
$cZ = (int)$this->entities[$eid]->z >> 4;
|
||||
$cX = (int) $this->entities[$eid]->x >> 4;
|
||||
$cZ = (int) $this->entities[$eid]->z >> 4;
|
||||
$e->level->entityListPositioned["$cX $cZ"][$eid] = $eid;
|
||||
$e->level->entityList[$eid] = &$this->entities[$eid];
|
||||
$this->server->handle("entity.add", $this->entities[$eid]);
|
||||
|
|
@ -178,7 +177,7 @@ class EntityAPI{
|
|||
}
|
||||
return $this->addRaw($e);
|
||||
}
|
||||
|
||||
|
||||
public function spawnToAll(Entity $e){
|
||||
foreach($this->server->api->player->getAll($e->level) as $player){
|
||||
if($player->eid !== false and $player->eid !== $e->eid and $e->class !== ENTITY_PLAYER and $e instanceof Entity){
|
||||
|
|
@ -186,18 +185,18 @@ class EntityAPI{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function get($eid){
|
||||
return $this->entities[$eid] ?? false;
|
||||
}
|
||||
|
||||
|
||||
public function remove($eid){
|
||||
if(isset($this->entities[$eid])){
|
||||
$level = $this->entities[$eid]->level;
|
||||
$this->entities[$eid]->closed = true;
|
||||
if($level instanceof Level){
|
||||
$cX = (int)$this->entities[$eid]->x >> 4;
|
||||
$cZ = (int)$this->entities[$eid]->z >> 4;
|
||||
$cX = (int) $this->entities[$eid]->x >> 4;
|
||||
$cZ = (int) $this->entities[$eid]->z >> 4;
|
||||
$index = "$cX $cZ";
|
||||
unset($level->entityListPositioned[$index][$eid]);
|
||||
if(isset($level->mobSpawner->entityAffectedPlayers[$eid])){
|
||||
|
|
@ -221,12 +220,12 @@ class EntityAPI{
|
|||
unset($this->entities[$eid]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function getRadius(Position $center, $radius = 15, $class = false){
|
||||
$minChunkX = ((int)($center->x - $radius)) >> 4;
|
||||
$minChunkZ = ((int)($center->z - $radius)) >> 4;
|
||||
$maxChunkX = ((int)($center->x + $radius)) >> 4;
|
||||
$maxChunkZ = ((int)($center->z + $radius)) >> 4;
|
||||
$minChunkX = ((int) ($center->x - $radius)) >> 4;
|
||||
$minChunkZ = ((int) ($center->z - $radius)) >> 4;
|
||||
$maxChunkX = ((int) ($center->x + $radius)) >> 4;
|
||||
$maxChunkZ = ((int) ($center->z + $radius)) >> 4;
|
||||
$ents = [];
|
||||
//TODO also index by chunkY?
|
||||
for($chunkX = $minChunkX; $chunkX <= $maxChunkX; ++$chunkX){
|
||||
|
|
@ -244,11 +243,11 @@ class EntityAPI{
|
|||
}
|
||||
return $ents;
|
||||
}
|
||||
|
||||
|
||||
public function heal($eid, $heal, $cause){
|
||||
$this->harm($eid, -$heal, $cause);
|
||||
}
|
||||
|
||||
|
||||
public function harm($eid, $attack, $cause, $force = false){
|
||||
$e = $this->get($eid);
|
||||
if($e === false or $e->dead === true){
|
||||
|
|
@ -256,7 +255,7 @@ class EntityAPI{
|
|||
}
|
||||
$e->setHealth($e->getHealth() - $attack, $cause, $force);
|
||||
}
|
||||
|
||||
|
||||
public function dropRawPos(Level $level, $x, $y, $z, $item, $speedX, $speedY, $speedZ){
|
||||
if($item->getID() === AIR or $item->count <= 0){
|
||||
return;
|
||||
|
|
@ -272,7 +271,7 @@ class EntityAPI{
|
|||
"item" => $item,
|
||||
"itemID" => $item->getID()
|
||||
];
|
||||
|
||||
|
||||
if($this->server->api->handle("item.drop", $data) !== false){
|
||||
for($count = $item->count; $count > 0;){
|
||||
$item->count = min($item->getMaxStackSize(), $count);
|
||||
|
|
@ -283,7 +282,7 @@ class EntityAPI{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function drop(Position $pos, Item $item, $pickupDelay = 10){
|
||||
if($item->getID() === AIR or $item->count <= 0){
|
||||
return;
|
||||
|
|
@ -310,7 +309,7 @@ class EntityAPI{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function spawnAll(Player $player){
|
||||
foreach($player->level->entityList as $e){
|
||||
if($e->class !== ENTITY_PLAYER){
|
||||
|
|
@ -318,18 +317,18 @@ class EntityAPI{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function getAll($level = null){
|
||||
if($level instanceof Level){
|
||||
return $level->entityList;
|
||||
}
|
||||
return $this->entities;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated this function doesnt do anything
|
||||
*/
|
||||
public function updateRadius(Position $center, $radius = 15, $class = false){
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue