Skip to content

Commit

Permalink
Update for API 3.0.0-ALPHA7 & improve wp player finding
Browse files Browse the repository at this point in the history
  • Loading branch information
@robske110
robske110 committed Jul 15, 2017
1 parent 132cf7f commit 094919f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 18 deletions.
4 changes: 2 additions & 2 deletions English/plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: BanWarn
api: [2.0.0, 2.1.0, 3.0.0-ALPHA1]
version: 1.2.1
api: [3.0.0-ALPHA7]
version: 1.2.2
load: POSTWORLD
main: robske_110\BanWarn\Main
author: robske_110
Expand Down
18 changes: 10 additions & 8 deletions English/src/robske_110/BanWarn/Main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ private function parseWPpromptMsg($msg, $playerName, $sender){
$this->sendMsgToSender($sender, TF::RED."Aborted the warnpardon prompt"); //TODO::Translate
}elseif($msg == "last"){
$remResult = $this->removeLastWarn($playerName);
var_dump($remResult);
if($remResult["warnsys"] && $remResult["clientBan"] && $remResult["ipBan"]){
$this->sendMsgToSender($sender, TF::GREEN."The last warn from '".TF::DARK_GRAY.$playerName.TF::GREEN."' has been removed! He/she has been unbanned. A server restart may be necassary."); //TODO::Translate TODO::FixServerRestartNeed
}elseif($remResult["warnsys"] && $remResult["clientBan"]){
Expand All @@ -95,7 +94,6 @@ private function parseWPpromptMsg($msg, $playerName, $sender){
}
}elseif($msg == "all"){
$wipeResult = $this->wipePlayer($playerName);
var_dump($wipeResult);
if($wipeResult["warnsys"] && $wipeResult["clientBan"] && $wipeResult["ipBan"]){
$this->sendMsgToSender($sender, TF::GREEN."All warns from '".TF::DARK_GRAY.$playerName.TF::GREEN."' have been removed! A server restart may be necassary."); //TODO::Translate TODO::FixServerRestartNeed
}elseif($wipeResult["warnsys"]){
Expand Down Expand Up @@ -136,7 +134,7 @@ public function onConsoleChat(ServerCommandEvent $event){
}
}

public function onCommand(CommandSender $sender, Command $command, $label, array $args){
public function onCommand(CommandSender $sender, Command $command, string $label, array $args): bool{
switch($command->getName()){
case "warn":
if(isset($args[2])){
Expand Down Expand Up @@ -186,12 +184,17 @@ public function onCommand(CommandSender $sender, Command $command, $label, array
break;
case "warnpardon":
if(isset($args[0])){
if($this->getServer()->getPlayer($args[0]) instanceof Player){
$playerName = strtolower($this->getServer()->getPlayer($args[0])->getName());
}else{
$playerName = strtolower($args[0]);
}
if($sender instanceof Player){
$this->tempWPusers[$sender->getName()] = strtolower($args[0]);
$this->tempWPusers[$sender->getName()] = $playerName;
}else{
$this->tempWPusers["C.O.N.S.O.L.E_moreThan16Characters"] = strtolower($args[0]); //So it won't conflict with player names
$this->tempWPusers["C.O.N.S.O.L.E_moreThan16Characters"] = $playerName; //So it won't conflict with player names
}
$this->sendMsgToSender($sender, TF::GREEN."You are going to remove one warn or wipe all warns from the Player '".TF::DARK_GRAY.strtolower($args[0]).TF::GREEN."'!");
$this->sendMsgToSender($sender, TF::GREEN."You are going to remove one warn or wipe all warns from the Player '".TF::DARK_GRAY.$playerName.TF::GREEN."'!");
$this->sendMsgToSender($sender, TF::GREEN."If you want to abort this simply type 'abort'");
$this->sendMsgToSender($sender, TF::GREEN."Type 'all' to remove all warns.");
$this->sendMsgToSender($sender, TF::GREEN."Type 'last' to remove the last warn.");
Expand Down Expand Up @@ -370,8 +373,7 @@ private function getTypeAsNameOfSender($sender){
}
private function getWarnPlayerByName($playerName){
$playerID = NULL;
$tempStuffArray = $this->warnsys->getAll();
if($tempStuffArray != NULL){
if(($tempStuffArray = $this->warnsys->getAll()) != NULL){
foreach($tempStuffArray as $warnObject){
if(isset($warnObject[0])){
if(isset($warnObject[0]['RealPlayerName'])){
Expand Down
4 changes: 2 additions & 2 deletions German/plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: BanWarn
api: [2.0.0, 2.1.0, 3.0.0-ALPHA1]
version: 1.2.1
api: [3.0.0-ALPHA7]
version: 1.2.2
load: POSTWORLD
main: robske_110\BanWarn\Main
author: robske_110
Expand Down
16 changes: 10 additions & 6 deletions German/src/robske_110/BanWarn/Main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public function onConsoleChat(ServerCommandEvent $event){
}
}

public function onCommand(CommandSender $sender, Command $command, $label, array $args){
public function onCommand(CommandSender $sender, Command $command, string $label, array $args): bool{
switch($command->getName()){
case "warn":
if(isset($args[2])){
Expand Down Expand Up @@ -184,12 +184,17 @@ public function onCommand(CommandSender $sender, Command $command, $label, array
break;
case "warnpardon":
if(isset($args[0])){
if($this->getServer()->getPlayer($args[0]) instanceof Player){
$playerName = strtolower($this->getServer()->getPlayer($args[0])->getName());
}else{
$playerName = strtolower($args[0]);
}
if($sender instanceof Player){
$this->tempWPusers[$sender->getName()] = strtolower($args[0]);
$this->tempWPusers[$sender->getName()] = $playerName;
}else{
$this->tempWPusers["C.O.N.S.O.L.E_moreThan16Characters"] = strtolower($args[0]); //So it won't conflict with player names
$this->tempWPusers["C.O.N.S.O.L.E_moreThan16Characters"] = $playerName; //So it won't conflict with player names
}
$this->sendMsgToSender($sender, TF::GREEN."Du bist kurz davor eine Warnung oder alle Warnungen des Spielers '".TF::DARK_GRAY.strtolower($args[0]).TF::GREEN."' zu entfernen!");
$this->sendMsgToSender($sender, TF::GREEN."Du bist kurz davor eine Warnung oder alle Warnungen des Spielers '".TF::DARK_GRAY.$playerName.TF::GREEN."' zu entfernen!");
$this->sendMsgToSender($sender, TF::GREEN."Falls du dies abbrechen möchtest, gebe 'abort' ein");
$this->sendMsgToSender($sender, TF::GREEN."Gebe 'all' ein, um alle Warnungen zu entfernen.");
$this->sendMsgToSender($sender, TF::GREEN."Gebe 'last' ein, um die letzte Warnung zu entfernen.");
Expand Down Expand Up @@ -369,8 +374,7 @@ private function getTypeAsNameOfSender($sender){
}
private function getWarnPlayerByName($playerName){
$playerID = NULL;
$tempStuffArray = $this->warnsys->getAll();
if($tempStuffArray != NULL){
if(($tempStuffArray = $this->warnsys->getAll()) != NULL){
foreach($tempStuffArray as $warnObject){
if(isset($warnObject[0])){
if(isset($warnObject[0]['RealPlayerName'])){
Expand Down

0 comments on commit 094919f

Please sign in to comment.