Added /op, /deop, /kick, OfflinePlayer, moved player list to Server instead of static Player

This commit is contained in:
Shoghi Cervantes
2014-04-01 19:46:48 +02:00
parent e60ea2eb15
commit b4cc3bbd43
16 changed files with 699 additions and 204 deletions

View File

@@ -54,7 +54,7 @@ class BanCommand extends VanillaCommand{
Server::getInstance()->getNameBans()->addBan($name, $reason, null, $sender->getName());
if(($player = Player::get($name, true)) instanceof Player){
if(($player = Server::getInstance()->getPlayerExact($name)) instanceof Player){
$player->kick("Banned by admin.");
}

View File

@@ -55,7 +55,7 @@ class BanIpCommand extends VanillaCommand{
if(preg_match("/^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$/", $value)){
$this->processIPBan($value, $sender, $reason);
}else{
if(($player = Player::get($value, true)) instanceof Player){
if(($player = Server::getInstance()->getPlayer($value)) instanceof Player){
$this->processIPBan($player->getAddress(), $sender, $reason);
}else{
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
@@ -70,7 +70,7 @@ class BanIpCommand extends VanillaCommand{
private function processIPBan($ip, CommandSender $sender, $reason){
Server::getInstance()->getIPBans()->addBan($ip, $reason, null, $sender->getName());
foreach(Player::getAll() as $player){
foreach(Server::getInstance()->getOnlinePlayers() as $player){
if($player->getAddress() === $ip){
$player->kick("You have been IP banned.");
}

View File

@@ -0,0 +1,63 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\Player;
use pocketmine\Server;
use pocketmine\utils\TextFormat;
class DeopCommand extends VanillaCommand{
public function __construct($name){
parent::__construct(
$name,
"Takes the specified player's operator status",
"/deop <player>"
);
$this->setPermission("pocketmine.command.op.take");
}
public function execute(CommandSender $sender, $currentAlias, array $args){
if(!$this->testPermission($sender)){
return true;
}
if(count($args) === 0){
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
return false;
}
$name = array_shift($args);
$player = Server::getInstance()->getOfflinePlayer($name);
$player->setOp(false);
if($player instanceof Player){
$player->sendMessage(TextFormat::YELLOW . "You are no longer op!");
}
Command::broadcastCommandMessage($sender, "De-opped " . $player->getName());
return true;
}
}

View File

@@ -0,0 +1,69 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\Player;
use pocketmine\Server;
use pocketmine\utils\TextFormat;
class KickCommand extends VanillaCommand{
public function __construct($name){
parent::__construct(
$name,
"Removes the specified player from the server",
"/kick <player> [reason...]"
);
$this->setPermission("pocketmine.command.kick");
}
public function execute(CommandSender $sender, $currentAlias, array $args){
if(!$this->testPermission($sender)){
return true;
}
if(count($args) === 0){
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
return false;
}
$name = array_shift($args);
$reason = trim(implode(" ", $args));
if($reason === ""){
$reason = "Kicked by an operator.";
}
if(($player = Server::getInstance()->getPlayer($name)) instanceof Player){
$player->kick("Banned by admin.");
}else{
$sender->sendMessage($name . " not found.");
}
Command::broadcastCommandMessage($sender, "Kicked player " . $name . ". With reason:\n" . $reason);
return true;
}
}

View File

@@ -45,13 +45,13 @@ class ListCommand extends VanillaCommand{
$online = "";
foreach(Player::getAll() as $player){
foreach(Server::getInstance()->getOnlinePlayers() as $player){
if($player->isOnline() and (!($sender instanceof Player) or $sender->canSee($player))){
$online .= $player->getDisplayName() . ", ";
}
}
$sender->sendMessage("There are ".count(Player::getAll())."/".Server::getInstance()->getMaxPlayers()." players online:\n" . substr($online, 0, -2));
$sender->sendMessage("There are ".count(Server::getInstance()->getOnlinePlayers())."/".Server::getInstance()->getMaxPlayers()." players online:\n" . substr($online, 0, -2));
return true;
}

View File

@@ -0,0 +1,63 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\Player;
use pocketmine\Server;
use pocketmine\utils\TextFormat;
class OpCommand extends VanillaCommand{
public function __construct($name){
parent::__construct(
$name,
"Gives the specified player operator status",
"/op <player>"
);
$this->setPermission("pocketmine.command.op.give");
}
public function execute(CommandSender $sender, $currentAlias, array $args){
if(!$this->testPermission($sender)){
return true;
}
if(count($args) === 0){
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
return false;
}
$name = array_shift($args);
$player = Server::getInstance()->getOfflinePlayer($name);
Command::broadcastCommandMessage($sender, "Opped " . $player->getName());
if($player instanceof Player){
$player->sendMessage("You are now op!");
}
$player->setOp(true);
return true;
}
}

View File

@@ -35,7 +35,7 @@ class SayCommand extends VanillaCommand{
"Broadcasts the given message as the sender",
"/say <message...>"
);
$this->setPermission("pocketmine.command.seed");
$this->setPermission("pocketmine.command.say");
}
public function execute(CommandSender $sender, $currentAlias, array $args){

View File

@@ -46,7 +46,7 @@ class StopCommand extends VanillaCommand{
$reason = implode(" ", $args);
if($reason !== ""){
foreach(Player::getAll() as $player){
foreach(Server::getInstance()->getOnlinePlayers() as $player){
$player->kick($reason);
}
}

View File

@@ -23,6 +23,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\Player;
use pocketmine\Server;
use pocketmine\utils\TextFormat;
class TellCommand extends VanillaCommand{
@@ -50,7 +51,7 @@ class TellCommand extends VanillaCommand{
$name = strtolower(array_shift($args));
$player = Player::get($name, true, false);
$player = Server::getInstance()->getPlayer($name);
if($player instanceof Player){
$sender->sendMessage("[me -> " . $player->getName() . "] " . implode($args));