Skip to content
This repository was archived by the owner on Oct 29, 2022. It is now read-only.

Remove non-vanilla * from helper and denial systems #336

Draft
jasonw4331 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Remove non-vanilla * from helper and denial systems #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a859e8a
Remove * from helper and denial systems
jasonw4331 Sep 16, 2020
9956663
Merge branch 'master' into remove-all
jasonw4331 Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MyPlot
main: MyPlot\MyPlot
version: 1.8.0
version: 1.9.0
api:
- 3.4.0
authors:
Expand Down
6 changes: 3 additions & 3 deletions src/MyPlot/EventListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
/*
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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();
Expand Down
16 changes: 3 additions & 13 deletions src/MyPlot/subcommand/DenyPlayerSubCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand All @@ -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;
Expand All @@ -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"));
Expand Down