diff --git a/plugin.yml b/plugin.yml index e9a5bd6c..2b8cd54a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: MyPlot main: MyPlot\MyPlot -version: 1.8.0 +version: 1.9.0 api: - 3.4.0 authors: diff --git a/src/MyPlot/EventListener.php b/src/MyPlot/EventListener.php index 19852b18..e1546d23 100644 --- a/src/MyPlot/EventListener.php +++ b/src/MyPlot/EventListener.php @@ -147,7 +147,7 @@ private function onEventOnBlock($event) : void { $ev->call(); $event->setCancelled($ev->isCancelled()); $username = $event->getPlayer()->getName(); - if($plot->owner == $username or $plot->isHelper($username) or $plot->isHelper("*") or $event->getPlayer()->hasPermission("myplot.admin.build.plot")) { + if($plot->owner == $username or $plot->isHelper($username) or $event->getPlayer()->hasPermission("myplot.admin.build.plot")) { if(!($event instanceof PlayerInteractEvent and $event->getBlock() instanceof Sapling)) return; /* @@ -179,7 +179,7 @@ private function onEventOnBlock($event) : void { $ev->call(); $event->setCancelled($ev->isCancelled()); $username = $event->getPlayer()->getName(); - if($plot->owner == $username or $plot->isHelper($username) or $plot->isHelper("*") or $event->getPlayer()->hasPermission("myplot.admin.build.plot")) + if($plot->owner == $username or $plot->isHelper($username) or $event->getPlayer()->hasPermission("myplot.admin.build.plot")) if(!($event instanceof PlayerInteractEvent and $event->getBlock() instanceof Sapling)) return; } @@ -302,7 +302,7 @@ private function onEventOnMove(Player $player, $event) : void { $ev = new MyPlotPlayerEnterPlotEvent($plot, $player); $ev->setCancelled($event->isCancelled()); $username = $ev->getPlayer()->getName(); - if($plot->owner !== $username and ($plot->isDenied($username) or $plot->isDenied("*")) and !$ev->getPlayer()->hasPermission("myplot.admin.denyplayer.bypass")) { + if($plot->owner !== $username and $plot->isDenied($username) and !$ev->getPlayer()->hasPermission("myplot.admin.denyplayer.bypass")) { $ev->setCancelled(); } $ev->call(); diff --git a/src/MyPlot/subcommand/DenyPlayerSubCommand.php b/src/MyPlot/subcommand/DenyPlayerSubCommand.php index c49c4f89..de434c4d 100644 --- a/src/MyPlot/subcommand/DenyPlayerSubCommand.php +++ b/src/MyPlot/subcommand/DenyPlayerSubCommand.php @@ -32,7 +32,7 @@ public function execute(CommandSender $sender, array $args) : bool { if(empty($args)) { return false; } - $dplayer = $args[0]; + $dplayerName = $args[0]; $plot = $this->getPlugin()->getPlotByPosition($sender); if($plot === null) { $sender->sendMessage(TextFormat::RED . $this->translateString("notinplot")); @@ -42,11 +42,7 @@ public function execute(CommandSender $sender, array $args) : bool { $sender->sendMessage(TextFormat::RED . $this->translateString("notowner")); return true; } - if($dplayer === "*") { - $dplayer = new OfflinePlayer(Server::getInstance(), "*"); - GOTO STAR; - } - $dplayer = $this->getPlugin()->getServer()->getPlayer($dplayer); + $dplayer = $this->getPlugin()->getServer()->getPlayer($dplayerName); if(!$dplayer instanceof Player) { $sender->sendMessage($this->translateString("denyplayer.notaplayer")); return true; @@ -57,18 +53,12 @@ public function execute(CommandSender $sender, array $args) : bool { $dplayer->sendMessage($this->translateString("denyplayer.attempteddeny", [$sender->getName()])); return true; } - STAR: if($this->getPlugin()->addPlotDenied($plot, $dplayer->getName())) { $sender->sendMessage($this->translateString("denyplayer.success1", [$dplayer->getName()])); if($dplayer instanceof Player) { $dplayer->sendMessage($this->translateString("denyplayer.success2", [$plot->X, $plot->Z, $sender->getName()])); } - if($dplayer->getName() === "*") { - foreach($this->getPlugin()->getServer()->getOnlinePlayers() as $player) { - if($this->getPlugin()->getPlotBB($plot)->isVectorInside($player) and !($player->getName() === $plot->owner) and !$plot->isHelper($player->getName())) - $this->getPlugin()->teleportPlayerToPlot($player, $plot); - } - }elseif($this->getPlugin()->getPlotBB($plot)->isVectorInside($dplayer)) + if($this->getPlugin()->getPlotBB($plot)->isVectorInside($dplayer)) $this->getPlugin()->teleportPlayerToPlot($dplayer, $plot); }else{ $sender->sendMessage(TextFormat::RED . $this->translateString("error"));