From 0306bef458e5b86ffdd46ca12300c9b0e8d4e544 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 17:09:29 -0400 Subject: [PATCH 01/78] Update config.yml --- resources/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/config.yml b/resources/config.yml index e786389..35e4194 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -1,4 +1,6 @@ -# Config file for iProtector by LDX; +# Config file for iProtector v4.0 by Kevin Andrews; +# Forked from the original LDX-MCPE/iProtector repository, now implementing new features +# and support for the PocketMine-MP API 3.0.0 # Settings for unprotected areas in worlds without specific settings: Default: From d1f26082c155e319015969c6799e870dc674217d Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 17:21:11 -0400 Subject: [PATCH 02/78] Update config.yml --- resources/config.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/resources/config.yml b/resources/config.yml index 35e4194..834d6be 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -1,7 +1,19 @@ # Config file for iProtector v4.0 by Kevin Andrews; -# Forked from the original LDX-MCPE/iProtector repository, now implementing new features -# and support for the PocketMine-MP API 3.0.0 - +# Forked from the original LDX-MCPE/iProtector repository, implementing messages support +# and PocketMine-MP API 3.0.0 compatiblity + +# Messages for protected areas: +Messages: + + # No permission to place that block + Place: 'You do not have permission to place your {block}!' + + # No permission to break that block + Break: 'You do not have permission to break my {block}! + + # No permission to touch that block or activate things like chests + Touch: 'You do not have permission to touch my {block}!' + # Settings for unprotected areas in worlds without specific settings: Default: From ce14735948ac4c89a0a003ebf6a05e94507395c8 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 17:31:19 -0400 Subject: [PATCH 03/78] Update plugin.yml --- plugin.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin.yml b/plugin.yml index 3d8e5bc..861da8d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,10 +1,10 @@ name: iProtector -author: LDX -version: 3.1b +authors: ["LDX", "kenygamer"] +version: 4.0#3.1b main: LDX\iProtector\Main load: POSTWORLD -api: [1.9.0, 2.0.0] -website: "https://github.com/LDX-MCPE/iProtector" +api: 3.0.0 +website: "https://github.com/kenygamer/iProtector" commands: area: description: "Allows you to manage areas." From ff1931fd20c20b394e02bbbd87dd36561dc63d6d Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 17:34:06 -0400 Subject: [PATCH 04/78] Typo --- resources/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/config.yml b/resources/config.yml index 834d6be..92cfaa0 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -9,7 +9,7 @@ Messages: Place: 'You do not have permission to place your {block}!' # No permission to break that block - Break: 'You do not have permission to break my {block}! + Break: 'You do not have permission to break my {block}!' # No permission to touch that block or activate things like chests Touch: 'You do not have permission to touch my {block}!' From 02ca325de749a477c92420363effdf2959ae3bbc Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 17:40:22 -0400 Subject: [PATCH 05/78] Update config.yml --- resources/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/config.yml b/resources/config.yml index 92cfaa0..2134331 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -6,14 +6,21 @@ Messages: # No permission to place that block + Enable: true Place: 'You do not have permission to place your {block}!' # No permission to break that block + Enable: true Break: 'You do not have permission to break my {block}!' # No permission to touch that block or activate things like chests + Enable: false Touch: 'You do not have permission to touch my {block}!' + # No permission to hurt other players + Enable: false + Hurt: 'You do not have permission to hurt {player}!' + # Settings for unprotected areas in worlds without specific settings: Default: From f6ab087b9cab293be5ba5d08d07c07cd44789955 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 17:54:37 -0400 Subject: [PATCH 06/78] Update Main.php --- src/LDX/iProtector/Main.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index 89828a6..f8bd34c 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -16,6 +16,8 @@ use pocketmine\event\block\BlockBreakEvent; class Main extends PluginBase implements Listener { + + public $c; public function onEnable() { $this->getServer()->getPluginManager()->registerEvents($this,$this); @@ -229,6 +231,9 @@ public function onHurt(EntityDamageEvent $event) { $p = $event->getEntity(); $x = false; if(!$this->canGetHurt($p)) { + if($c["Messages"]["Hurt"]["Enable"] === true) { + $p->sendMessage(str_replace('{player}', $p->getName(), $c["Messages"]["Hurt"]["Message"])); + } $event->setCancelled(); } } @@ -250,6 +255,9 @@ public function onBlockBreak(BlockBreakEvent $event) { $event->setCancelled(); } else { if(!$this->canEdit($p,$b)) { + if($c["Messages"]["Break"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Break"]["Message"])); + } $event->setCancelled(); } } @@ -271,6 +279,9 @@ public function onBlockPlace(BlockPlaceEvent $event) { $event->setCancelled(); } else { if(!$this->canEdit($p,$b)) { + if($c["Messages"]["Place"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Place"]["Message"])); + } $event->setCancelled(); } } @@ -280,6 +291,9 @@ public function onBlockTouch(PlayerInteractEvent $event) { $b = $event->getBlock(); $p = $event->getPlayer(); if(!$this->canTouch($p,$b)) { + if($c["Messages"]["Touch"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Touch"]["Message"])); + } $event->setCancelled(); } } @@ -289,7 +303,8 @@ public function saveAreas() { foreach($this->areas as $area) { $areas[] = array("name" => $area->getName(),"flags" => $area->getFlags(),"pos1" => $area->getPos1(),"pos2" => $area->getPos2(),"level" => $area->getLevel(),"whitelist" => $area->getWhitelist()); } - file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas)); + /* JSON_PRETTY_PRINT parameter added */ + file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas, JSON_PRETTY_PRINT)); } public function canEdit($p,$t) { From 2343240250637fd022748653707d930dede64167 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 17:56:58 -0400 Subject: [PATCH 07/78] Update config.yml --- resources/config.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/resources/config.yml b/resources/config.yml index 2134331..eef34e0 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -6,20 +6,24 @@ Messages: # No permission to place that block - Enable: true - Place: 'You do not have permission to place your {block}!' + Place: + Enable: true + Message: 'You do not have permission to place your {block}!' # No permission to break that block - Enable: true - Break: 'You do not have permission to break my {block}!' + Break: + Enable: true + Message: 'You do not have permission to break my {block}!' # No permission to touch that block or activate things like chests - Enable: false - Touch: 'You do not have permission to touch my {block}!' + Touch: + Enable: false + Message: 'You do not have permission to touch my {block}!' # No permission to hurt other players - Enable: false - Hurt: 'You do not have permission to hurt {player}!' + Hurt: + Enable: false + Message: 'You do not have permission to hurt {player}!' # Settings for unprotected areas in worlds without specific settings: Default: From dcef81b0e920f9abe0e05b41f504e8b1608b0d00 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 18:03:52 -0400 Subject: [PATCH 08/78] Update config.yml --- resources/config.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/config.yml b/resources/config.yml index eef34e0..c495943 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -1,6 +1,15 @@ # Config file for iProtector v4.0 by Kevin Andrews; -# Forked from the original LDX-MCPE/iProtector repository, implementing messages support -# and PocketMine-MP API 3.0.0 compatiblity +# Forked from the original LDX-MCPE/iProtector repository, implementing new features +# and PocketMine-MP API 3.0.0 compatibility + +# Settings +Settings: + + # Choose whether enable or disable this plugin + Enable: true + + # Choose whether enable or disable the JSON pretty print area saving setting + JPP: true # Messages for protected areas: Messages: From 1d7b0b86d52d1017da76a9f0234ac4951871c008 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 18:07:48 -0400 Subject: [PATCH 09/78] Update Main.php --- src/LDX/iProtector/Main.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index f8bd34c..12da250 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -303,8 +303,17 @@ public function saveAreas() { foreach($this->areas as $area) { $areas[] = array("name" => $area->getName(),"flags" => $area->getFlags(),"pos1" => $area->getPos1(),"pos2" => $area->getPos2(),"level" => $area->getLevel(),"whitelist" => $area->getWhitelist()); } - /* JSON_PRETTY_PRINT parameter added */ - file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas, JSON_PRETTY_PRINT)); + /* JSON_PRETTY_PRINT setting added */ + if($c["Settings"]["JPP"] === true) { + file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas, JSON_PRETTY_PRINT)); + return; + } elseif($c["Settings"]["JPP"] === false) { + file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas)); + return; + } else { + file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas)); + return; + } } public function canEdit($p,$t) { From 77e2381e8599dca7da1937133e9d65a141341b92 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 18:23:57 -0400 Subject: [PATCH 10/78] Update Main.php --- src/LDX/iProtector/Main.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index 12da250..ab18dc2 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -21,6 +21,7 @@ class Main extends PluginBase implements Listener { public function onEnable() { $this->getServer()->getPluginManager()->registerEvents($this,$this); + $this->getLogger()->info("§aEnabling " . $this->getDescription()->getFullName() . "..."); if(!is_dir($this->getDataFolder())) { mkdir($this->getDataFolder()); } @@ -39,6 +40,13 @@ public function onEnable() { $area = new Area($datum["name"],$datum["flags"],$datum["pos1"],$datum["pos2"],$datum["level"],$datum["whitelist"],$this); } $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if($c["Settings"]["Enable"] === false) { + $this->getPluginLoader()->disablePlugin($this); + return true; + } elseif($c["Settings"]["Enable"] !== true) { + $this->getPluginLoader()->disablePlugin($this); + return true; + } else { $this->god = $c["Default"]["God"]; $this->edit = $c["Default"]["Edit"]; $this->touch = $c["Default"]["Touch"]; @@ -46,6 +54,12 @@ public function onEnable() { foreach($c["Worlds"] as $level => $flags) { $this->levels[$level] = $flags; } + return true; + } + } + + public function onDisable() { + $this->getLogger()->info("§cDisabling " . $this->getDescription()->getFullName() . "..."); } public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { From 1106521d5e9559eb17324520e38805150840ef13 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 18:48:07 -0400 Subject: [PATCH 11/78] Create README.md --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..05e788b --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +# iProtector v4.0 + +## About +**iProtector** is the original plugin that allows you to protect areas with different settings in each one. This *fork*, implementing support for the new *PocketMine-MP API 3.0.0*, provides new features to fully enjoy the artwork created by [*LDX-MCPE*](https://github.com/LDX-MCPE). + +This plugin will continue receiving updates and be open to *suggestions* from the public. + +## What's new +- You can enable and disable the plugin from the *config*. +- You can choose whether enable or disable the area pretty saving feature. +- You can use a new flag! **TNT**. Protects against TNT and Creeper explosions. +- You can set custom messages for **each** event, and also disable the ones you want; place; break; touch and hurt. + +## Command + +``` +/area +``` From dbfa41873451608fb7e867d08ca1b2879b5408cc Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 18:55:03 -0400 Subject: [PATCH 12/78] Update Main.php --- src/LDX/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index ab18dc2..467ed74 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -102,7 +102,7 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { if(isset($args[1])) { if(isset($this->pos1[$n]) && isset($this->pos2[$n])) { if(!isset($this->areas[strtolower($args[1])])) { - $area = new Area(strtolower($args[1]),array("edit" => true,"god" => false,"touch" => true),array($this->pos1[$n]->getX(),$this->pos1[$n]->getY(),$this->pos1[$n]->getZ()),array($this->pos2[$n]->getX(),$this->pos2[$n]->getY(),$this->pos2[$n]->getZ()),$p->getLevel()->getName(),array($n),$this); + $area = new Area(strtolower($args[1]),array("edit" => true,"god" => false,"tnt" => false,"touch" => true),array($this->pos1[$n]->getX(),$this->pos1[$n]->getY(),$this->pos1[$n]->getZ()),array($this->pos2[$n]->getX(),$this->pos2[$n]->getY(),$this->pos2[$n]->getZ()),$p->getLevel()->getName(),array($n),$this); $this->saveAreas(); unset($this->pos1[$n]); unset($this->pos2[$n]); From 45e33aabf1544a99c47fd5d105be93ed60a9809a Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 19:15:33 -0400 Subject: [PATCH 13/78] Update Main.php --- src/LDX/iProtector/Main.php | 76 ++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index 467ed74..44f2159 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -17,11 +17,12 @@ class Main extends PluginBase implements Listener { + const PREFIX = TextFormat::GREEN . "[" . TextFormat::YELLOW . $this->getDescription()->getFullName() . ":kenygamer" . TextFormat::GREEN . "]" . TextFormat::RESET; public $c; public function onEnable() { $this->getServer()->getPluginManager()->registerEvents($this,$this); - $this->getLogger()->info("§aEnabling " . $this->getDescription()->getFullName() . "..."); + $this->getLogger()->info(TextFormat::GREEN . "Enabling " . $this->getDescription()->getFullName() . "..."); if(!is_dir($this->getDataFolder())) { mkdir($this->getDataFolder()); } @@ -59,12 +60,12 @@ public function onEnable() { } public function onDisable() { - $this->getLogger()->info("§cDisabling " . $this->getDescription()->getFullName() . "..."); + $this->getLogger()->info(TextFormat::RED . "Disabling " . $this->getDescription()->getFullName() . "..."); } public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { if(!($p instanceof Player)) { - $p->sendMessage(TextFormat::RED . "Command must be used in-game."); + $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); return true; } if(!isset($args[0])) { @@ -76,25 +77,25 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { case "pos1": if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos1")) { if(isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = "You're already selecting a position!"; + $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; } else { $this->sel1[$n] = true; - $o = "Please place or break the first position."; + $o = self::PREFIX . TextFormat::RED . "Please place or break the first position."; } } else { - $o = "You do not have permission to use this subcommand."; + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; } break; case "pos2": if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos2")) { if(isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = "You're already selecting a position!"; + $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; } else { $this->sel2[$n] = true; - $o = "Please place or break the second position."; + $o = self::PREFIX . TextFormat::RED . "Please place or break the second position."; } } else { - $o = "You do not have permission to use this subcommand."; + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; } break; case "create": @@ -106,18 +107,18 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { $this->saveAreas(); unset($this->pos1[$n]); unset($this->pos2[$n]); - $o = "Area created!"; + $o = self::PREFIX . TextFormat::GREEN . "Area created!"; } else { - $o = "An area with that name already exists."; + $o = self::PREFIX . TextFormat::RED . "An area with that name already exists."; } } else { - $o = "Please select both positions first."; + $o = self::PREFIX . TextFormat::RED . "Please select both positions first."; } } else { - $o = "Please specify a name for this area."; + $o = self::PREFIX . TextFormat::RED . "Please specify a name for this area."; } } else { - $o = "You do not have permission to use this subcommand."; + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; } break; case "list": @@ -152,21 +153,21 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { } else { $status = "off"; } - $o = "Flag " . $flag . " set to " . $status . " for area " . $area->getName() . "!"; + $o = self::PREFIX . TextFormat::GREEN . "Flag " . $flag . " set to " . $status . " for area " . $area->getName() . "!"; } else { - $o = "Flag not found. (Flags: edit, god, touch)"; + $o = self::PREFIX . TextFormat::RED . "Flag not found. (Flags: edit, god, tnt, touch)"; } } else { - $o = "Please specify a flag. (Flags: edit, god, touch)"; + $o = self::PREFIX . TextFormat::RED . "Please specify a flag. (Flags: edit, god, touch)"; } } else { - $o = "Area doesn't exist."; + $o = self::PREFIX . TextFormat::RED . "Area doesn't exist."; } } else { - $o = "Please specify the area you would like to flag."; + $o = self::PREFIX . TextFormat::RED . "Please specify the area you would like to flag."; } } else { - $o = "You do not have permission to use this subcommand."; + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; } break; case "delete": @@ -175,15 +176,15 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { if(isset($this->areas[strtolower($args[1])])) { $area = $this->areas[strtolower($args[1])]; $area->delete(); - $o = "Area deleted!"; + $o = self::PREFIX . TextFormat::GREEN . "Area deleted!"; } else { - $o = "Area does not exist."; + $o = self::PREFIX . TextFormat::RED . "Area does not exist."; } } else { - $o = "Please specify an area to delete."; + $o = self::PREFIX . TextFormat::RED . "Please specify an area to delete."; } } else { - $o = "You do not have permission to use this subcommand."; + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; } break; case "whitelist": @@ -197,13 +198,13 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); if(!$area->isWhitelisted($w)) { $area->setWhitelisted($w); - $o = "Player $w has been whitelisted in area " . $area->getName() . "."; + $o = self::PREFIX . TextFormat::GREEN . "Player $w has been whitelisted in area " . $area->getName() . "."; } else { - $o = "Player $w is already whitelisted in area " . $area->getName() . "."; + $o = self::PREFIX . TextFormat::RED . "Player $w is already whitelisted in area " . $area->getName() . "."; } break; case "list": - $o = "Area " . $area->getName() . "'s whitelist:"; + $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:"; foreach($area->getWhitelist() as $w) { $o .= " $w;"; } @@ -213,23 +214,23 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); if($area->isWhitelisted($w)) { $area->setWhitelisted($w,false); - $o = "Player $w has been unwhitelisted in area " . $area->getName() . "."; + $o = self::PREFIX . TextFormat::GREEN . "Player $w has been unwhitelisted in area " . $area->getName() . "."; } else { - $o = "Player $w is already unwhitelisted in area " . $area->getName() . "."; + $o = self::PREFIX . TextFormat::RED . "$w is already unwhitelisted in area " . $area->getName() . "."; } break; default: - $o = "Please specify a valid action. Usage: /area whitelist " . $area->getName() . " [player]"; + $o = self::PREFIX . TextFormat::RED . "Please specify a valid action. Usage: /area whitelist " . $area->getName() . " [player]"; break; } } else { - $o = "Please specify an action. Usage: /area whitelist " . $area->getName() . " [player]"; + $o = self::PREFIX . TextFormat::RED . "Please specify an action. Usage: /area whitelist " . $area->getName() . " [player]"; } } else { - $o = "Area doesn't exist. Usage: /area whitelist [player]"; + $o = self::PREFIX . TextFormat::RED . "Area doesn't exist. Usage: /area whitelist [player]"; } } else { - $o = "You do not have permission to use this subcommand."; + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; } break; default: @@ -260,12 +261,12 @@ public function onBlockBreak(BlockBreakEvent $event) { if(isset($this->sel1[$n])) { unset($this->sel1[$n]); $this->pos1[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage("Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); $event->setCancelled(); } else if(isset($this->sel2[$n])) { unset($this->sel2[$n]); $this->pos2[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage("Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); $event->setCancelled(); } else { if(!$this->canEdit($p,$b)) { @@ -284,12 +285,12 @@ public function onBlockPlace(BlockPlaceEvent $event) { if(isset($this->sel1[$n])) { unset($this->sel1[$n]); $this->pos1[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage("Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); $event->setCancelled(); } else if(isset($this->sel2[$n])) { unset($this->sel2[$n]); $this->pos2[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage("Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); $event->setCancelled(); } else { if(!$this->canEdit($p,$b)) { @@ -317,7 +318,6 @@ public function saveAreas() { foreach($this->areas as $area) { $areas[] = array("name" => $area->getName(),"flags" => $area->getFlags(),"pos1" => $area->getPos1(),"pos2" => $area->getPos2(),"level" => $area->getLevel(),"whitelist" => $area->getWhitelist()); } - /* JSON_PRETTY_PRINT setting added */ if($c["Settings"]["JPP"] === true) { file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas, JSON_PRETTY_PRINT)); return; From 4eec846b5cc53fd6cf0bea25a8126cf78d72c5fd Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 19:16:15 -0400 Subject: [PATCH 14/78] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 861da8d..ed9eed6 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: iProtector authors: ["LDX", "kenygamer"] -version: 4.0#3.1b +version: v4.0#3.1b main: LDX\iProtector\Main load: POSTWORLD api: 3.0.0 From d4e459a93fafbf79fd00d08772b7e871117ff299 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 19:44:03 -0400 Subject: [PATCH 15/78] Update Main.php --- src/LDX/iProtector/Main.php | 50 ++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index 44f2159..6db5386 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -11,6 +11,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\utils\TextFormat; use pocketmine\event\entity\EntityDamageEvent; +use pocketmine\event\entity\EntityExplodeEvent; use pocketmine\event\player\PlayerInteractEvent; use pocketmine\event\block\BlockPlaceEvent; use pocketmine\event\block\BlockBreakEvent; @@ -50,6 +51,7 @@ public function onEnable() { } else { $this->god = $c["Default"]["God"]; $this->edit = $c["Default"]["Edit"]; + $this->tnt = $c["Default"]["TNT"]; $this->touch = $c["Default"]["Touch"]; $this->levels = array(); foreach($c["Worlds"] as $level => $flags) { @@ -301,10 +303,19 @@ public function onBlockPlace(BlockPlaceEvent $event) { } } } - + public function onBlockTouch(PlayerInteractEvent $event) { $b = $event->getBlock(); $p = $event->getPlayer(); + if($event->getAction() === PlayerInteractEvent::RIGHT_CLICK_BLOCK) { + if($event->getItem() === \pocketmine\item\Item::get(259, 0)) { + if($event->getBlock() === \pocketmine\block\Block::get(46, 0)) { + if(!$this->canExplode($p->getX(), $p->getY(), $p->getZ(), $p->getLevel())) { + $event->setCancelled(); + } + } + } + } if(!$this->canTouch($p,$b)) { if($c["Messages"]["Touch"]["Enable"] === true) { $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Touch"]["Message"])); @@ -312,6 +323,16 @@ public function onBlockTouch(PlayerInteractEvent $event) { $event->setCancelled(); } } + + /* Handles entity explode + * event (\pocketmine\event\entity\EntityExplodeEvent) + */ + + public function onEntityExplode(EntityExplodeEvent $event) { + if(!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity()->getLevel())) { + $event->setCancelled(); + } + } public function saveAreas() { $areas = array(); @@ -403,5 +424,32 @@ public function canGetHurt($p) { } return $o; } + + public function canExplode($x, $y, $z, $level) { + if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { + return true; + } + $o = true; + $g = (isset($this->levels[$level->getName()]) ? $this->levels[$level->getName()]["TNT"] : $this->tnt); + if($g) { + $o = false; + } + foreach($this->areas as $area) { + if($area->contains(new Vector3($x,$y,$z,$level->getName())) { + if($area->getFlag("tnt")) { + $o = false; + } + if($area->isWhitelisted(strtolower($p->getName()))) { + $o = true; + break; + } + if(!$area->getFlag("tnt") && $g) { + $o = true; + break; + } + } + } + return $o; + } } From 08b00f2fade3adea09c97e4b8554d7575fdbb5c7 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 19:45:17 -0400 Subject: [PATCH 16/78] Update Main.php --- src/LDX/iProtector/Main.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index 6db5386..3c4b53b 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -312,6 +312,7 @@ public function onBlockTouch(PlayerInteractEvent $event) { if($event->getBlock() === \pocketmine\block\Block::get(46, 0)) { if(!$this->canExplode($p->getX(), $p->getY(), $p->getZ(), $p->getLevel())) { $event->setCancelled(); + return; } } } From 52f787863f1d1db0ed2afa9e346e235fd251a0f5 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 19:47:36 -0400 Subject: [PATCH 17/78] Update config.yml --- resources/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/config.yml b/resources/config.yml index c495943..ae565fd 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -42,6 +42,9 @@ Default: # Keep players from editing the world? Edit: false + + # Protect against TNT and Creeper explosions? + TNT: false # Keep players from touching blocks and activating things like chests? Touch: false @@ -56,6 +59,9 @@ Worlds: # Keep players from editing the world? Edit: false + + # Protect against TNT and Creeper explosions? + TNT: false # Keep players from touching blocks and activating things like chests? Touch: false From 132cf0db17e4504b114b49137100231cbaabc815 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 20:00:02 -0400 Subject: [PATCH 18/78] Update Main.php --- src/LDX/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index 3c4b53b..fa3fd58 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -436,7 +436,7 @@ public function canExplode($x, $y, $z, $level) { $o = false; } foreach($this->areas as $area) { - if($area->contains(new Vector3($x,$y,$z,$level->getName())) { + if($area->contains(new Vector3($x,$y,$z,$level->getName()))) { if($area->getFlag("tnt")) { $o = false; } From c0cd7159b44b4c6e9d9309457a1c3c474b60c23d Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 20:14:14 -0400 Subject: [PATCH 19/78] Update Main.php --- src/LDX/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index fa3fd58..f086951 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -18,7 +18,7 @@ class Main extends PluginBase implements Listener { - const PREFIX = TextFormat::GREEN . "[" . TextFormat::YELLOW . $this->getDescription()->getFullName() . ":kenygamer" . TextFormat::GREEN . "]" . TextFormat::RESET; + const PREFIX = TextFormat::GREEN . "[" . TextFormat::YELLOW . "iProtector v4.0#3.1b" . ":kenygamer" . TextFormat::GREEN . "]" . TextFormat::RESET; public $c; public function onEnable() { From cf3869ff4fac48300dc267b9e087c0a72761a870 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 20:17:18 -0400 Subject: [PATCH 20/78] Update Main.php --- src/LDX/iProtector/Main.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index f086951..f9e8775 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -82,7 +82,7 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; } else { $this->sel1[$n] = true; - $o = self::PREFIX . TextFormat::RED . "Please place or break the first position."; + $o = self::PREFIX . TextFormat::AQUA . "Please place or break the first position."; } } else { $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; @@ -94,7 +94,7 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; } else { $this->sel2[$n] = true; - $o = self::PREFIX . TextFormat::RED . "Please place or break the second position."; + $o = self::PREFIX . TextFormat::AQUA . "Please place or break the second position."; } } else { $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; @@ -105,7 +105,7 @@ public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { if(isset($args[1])) { if(isset($this->pos1[$n]) && isset($this->pos2[$n])) { if(!isset($this->areas[strtolower($args[1])])) { - $area = new Area(strtolower($args[1]),array("edit" => true,"god" => false,"tnt" => false,"touch" => true),array($this->pos1[$n]->getX(),$this->pos1[$n]->getY(),$this->pos1[$n]->getZ()),array($this->pos2[$n]->getX(),$this->pos2[$n]->getY(),$this->pos2[$n]->getZ()),$p->getLevel()->getName(),array($n),$this); + $area = new Area(strtolower($args[1]),array("edit" => true,"god" => false,"tnt" => true,"touch" => true),array($this->pos1[$n]->getX(),$this->pos1[$n]->getY(),$this->pos1[$n]->getZ()),array($this->pos2[$n]->getX(),$this->pos2[$n]->getY(),$this->pos2[$n]->getZ()),$p->getLevel()->getName(),array($n),$this); $this->saveAreas(); unset($this->pos1[$n]); unset($this->pos2[$n]); From 4674a7da633efdfbfbea1172ca3ffe16db4b87d9 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 20:49:34 -0400 Subject: [PATCH 21/78] Update Main.php --- src/LDX/iProtector/Main.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php index f9e8775..e73aa82 100644 --- a/src/LDX/iProtector/Main.php +++ b/src/LDX/iProtector/Main.php @@ -310,7 +310,7 @@ public function onBlockTouch(PlayerInteractEvent $event) { if($event->getAction() === PlayerInteractEvent::RIGHT_CLICK_BLOCK) { if($event->getItem() === \pocketmine\item\Item::get(259, 0)) { if($event->getBlock() === \pocketmine\block\Block::get(46, 0)) { - if(!$this->canExplode($p->getX(), $p->getY(), $p->getZ(), $p->getLevel())) { + if(!$this->canExplode($p->getX(), $p->getY(), $p->getZ(), $p, $p->getLevel())) { $event->setCancelled(); return; } @@ -330,7 +330,7 @@ public function onBlockTouch(PlayerInteractEvent $event) { */ public function onEntityExplode(EntityExplodeEvent $event) { - if(!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity()->getLevel())) { + if(!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity(), $event->getEntity()->getLevel())) { $event->setCancelled(); } } @@ -426,7 +426,7 @@ public function canGetHurt($p) { return $o; } - public function canExplode($x, $y, $z, $level) { + public function canExplode($x, $y, $z, $p, $level) { if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { return true; } @@ -444,7 +444,7 @@ public function canExplode($x, $y, $z, $level) { $o = true; break; } - if(!$area->getFlag("tnt") && $g) { + if($area->getFlag("tnt") && $g) { $o = true; break; } From 5f233d6cb2d24d0bd38c63e5debebb8c96b24930 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 22:41:46 -0400 Subject: [PATCH 22/78] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 05e788b..0225927 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,9 @@ This plugin will continue receiving updates and be open to *suggestions* from th - You can use a new flag! **TNT**. Protects against TNT and Creeper explosions. - You can set custom messages for **each** event, and also disable the ones you want; place; break; touch and hurt. +So what are you waiting for? +Check the **[installation tutorial](https://github.com/kenygamer/iProtector-v4.0/wiki)**. + ## Command ``` From 68a3e18d62bc32c12fc2897ec6a840067ff242ba Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:18:11 -0400 Subject: [PATCH 23/78] Delete Main.php --- src/LDX/iProtector/Main.php | 456 ------------------------------------ 1 file changed, 456 deletions(-) delete mode 100644 src/LDX/iProtector/Main.php diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php deleted file mode 100644 index e73aa82..0000000 --- a/src/LDX/iProtector/Main.php +++ /dev/null @@ -1,456 +0,0 @@ -getServer()->getPluginManager()->registerEvents($this,$this); - $this->getLogger()->info(TextFormat::GREEN . "Enabling " . $this->getDescription()->getFullName() . "..."); - if(!is_dir($this->getDataFolder())) { - mkdir($this->getDataFolder()); - } - if(!file_exists($this->getDataFolder() . "areas.json")) { - file_put_contents($this->getDataFolder() . "areas.json","[]"); - } - if(!file_exists($this->getDataFolder() . "config.yml")) { - $c = $this->getResource("config.yml"); - $o = stream_get_contents($c); - fclose($c); - file_put_contents($this->getDataFolder() . "config.yml",str_replace("DEFAULT",$this->getServer()->getDefaultLevel()->getName(),$o)); - } - $this->areas = array(); - $data = json_decode(file_get_contents($this->getDataFolder() . "areas.json"),true); - foreach($data as $datum) { - $area = new Area($datum["name"],$datum["flags"],$datum["pos1"],$datum["pos2"],$datum["level"],$datum["whitelist"],$this); - } - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if($c["Settings"]["Enable"] === false) { - $this->getPluginLoader()->disablePlugin($this); - return true; - } elseif($c["Settings"]["Enable"] !== true) { - $this->getPluginLoader()->disablePlugin($this); - return true; - } else { - $this->god = $c["Default"]["God"]; - $this->edit = $c["Default"]["Edit"]; - $this->tnt = $c["Default"]["TNT"]; - $this->touch = $c["Default"]["Touch"]; - $this->levels = array(); - foreach($c["Worlds"] as $level => $flags) { - $this->levels[$level] = $flags; - } - return true; - } - } - - public function onDisable() { - $this->getLogger()->info(TextFormat::RED . "Disabling " . $this->getDescription()->getFullName() . "..."); - } - - public function onCommand(CommandSender $p,Command $cmd,$label,array $args) { - if(!($p instanceof Player)) { - $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); - return true; - } - if(!isset($args[0])) { - return false; - } - $n = strtolower($p->getName()); - $action = strtolower($args[0]); - switch($action) { - case "pos1": - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos1")) { - if(isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; - } else { - $this->sel1[$n] = true; - $o = self::PREFIX . TextFormat::AQUA . "Please place or break the first position."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "pos2": - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos2")) { - if(isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; - } else { - $this->sel2[$n] = true; - $o = self::PREFIX . TextFormat::AQUA . "Please place or break the second position."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "create": - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.create")) { - if(isset($args[1])) { - if(isset($this->pos1[$n]) && isset($this->pos2[$n])) { - if(!isset($this->areas[strtolower($args[1])])) { - $area = new Area(strtolower($args[1]),array("edit" => true,"god" => false,"tnt" => true,"touch" => true),array($this->pos1[$n]->getX(),$this->pos1[$n]->getY(),$this->pos1[$n]->getZ()),array($this->pos2[$n]->getX(),$this->pos2[$n]->getY(),$this->pos2[$n]->getZ()),$p->getLevel()->getName(),array($n),$this); - $this->saveAreas(); - unset($this->pos1[$n]); - unset($this->pos2[$n]); - $o = self::PREFIX . TextFormat::GREEN . "Area created!"; - } else { - $o = self::PREFIX . TextFormat::RED . "An area with that name already exists."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please select both positions first."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify a name for this area."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "list": - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { - $o = "Areas:"; - foreach($this->areas as $area) { - $o = $o . " " . $area->getName() . ";"; - } - } - break; - case "flag": - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.flag")) { - if(isset($args[1])) { - if(isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - if(isset($args[2])) { - if(isset($area->flags[strtolower($args[2])])) { - $flag = strtolower($args[2]); - if(isset($args[3])) { - $mode = strtolower($args[3]); - if($mode == "true" || $mode == "on") { - $mode = true; - } else { - $mode = false; - } - $area->setFlag($flag,$mode); - } else { - $area->toggleFlag($flag); - } - if($area->getFlag($flag)) { - $status = "on"; - } else { - $status = "off"; - } - $o = self::PREFIX . TextFormat::GREEN . "Flag " . $flag . " set to " . $status . " for area " . $area->getName() . "!"; - } else { - $o = self::PREFIX . TextFormat::RED . "Flag not found. (Flags: edit, god, tnt, touch)"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify a flag. (Flags: edit, god, touch)"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Area doesn't exist."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify the area you would like to flag."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "delete": - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { - if(isset($args[1])) { - if(isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - $area->delete(); - $o = self::PREFIX . TextFormat::GREEN . "Area deleted!"; - } else { - $o = self::PREFIX . TextFormat::RED . "Area does not exist."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify an area to delete."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "whitelist": - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { - if(isset($args[1]) && isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - if(isset($args[2])) { - $action = strtolower($args[2]); - switch($action) { - case "add": - $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); - if(!$area->isWhitelisted($w)) { - $area->setWhitelisted($w); - $o = self::PREFIX . TextFormat::GREEN . "Player $w has been whitelisted in area " . $area->getName() . "."; - } else { - $o = self::PREFIX . TextFormat::RED . "Player $w is already whitelisted in area " . $area->getName() . "."; - } - break; - case "list": - $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:"; - foreach($area->getWhitelist() as $w) { - $o .= " $w;"; - } - break; - case "delete": - case "remove": - $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); - if($area->isWhitelisted($w)) { - $area->setWhitelisted($w,false); - $o = self::PREFIX . TextFormat::GREEN . "Player $w has been unwhitelisted in area " . $area->getName() . "."; - } else { - $o = self::PREFIX . TextFormat::RED . "$w is already unwhitelisted in area " . $area->getName() . "."; - } - break; - default: - $o = self::PREFIX . TextFormat::RED . "Please specify a valid action. Usage: /area whitelist " . $area->getName() . " [player]"; - break; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify an action. Usage: /area whitelist " . $area->getName() . " [player]"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Area doesn't exist. Usage: /area whitelist [player]"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - default: - return false; - break; - } - $p->sendMessage($o); - return true; - } - - public function onHurt(EntityDamageEvent $event) { - if($event->getEntity() instanceof Player) { - $p = $event->getEntity(); - $x = false; - if(!$this->canGetHurt($p)) { - if($c["Messages"]["Hurt"]["Enable"] === true) { - $p->sendMessage(str_replace('{player}', $p->getName(), $c["Messages"]["Hurt"]["Message"])); - } - $event->setCancelled(); - } - } - } - - public function onBlockBreak(BlockBreakEvent $event) { - $b = $event->getBlock(); - $p = $event->getPlayer(); - $n = strtolower($p->getName()); - if(isset($this->sel1[$n])) { - unset($this->sel1[$n]); - $this->pos1[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); - $event->setCancelled(); - } else if(isset($this->sel2[$n])) { - unset($this->sel2[$n]); - $this->pos2[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); - $event->setCancelled(); - } else { - if(!$this->canEdit($p,$b)) { - if($c["Messages"]["Break"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Break"]["Message"])); - } - $event->setCancelled(); - } - } - } - - public function onBlockPlace(BlockPlaceEvent $event) { - $b = $event->getBlock(); - $p = $event->getPlayer(); - $n = strtolower($p->getName()); - if(isset($this->sel1[$n])) { - unset($this->sel1[$n]); - $this->pos1[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); - $event->setCancelled(); - } else if(isset($this->sel2[$n])) { - unset($this->sel2[$n]); - $this->pos2[$n] = new Vector3($b->getX(),$b->getY(),$b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); - $event->setCancelled(); - } else { - if(!$this->canEdit($p,$b)) { - if($c["Messages"]["Place"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Place"]["Message"])); - } - $event->setCancelled(); - } - } - } - - public function onBlockTouch(PlayerInteractEvent $event) { - $b = $event->getBlock(); - $p = $event->getPlayer(); - if($event->getAction() === PlayerInteractEvent::RIGHT_CLICK_BLOCK) { - if($event->getItem() === \pocketmine\item\Item::get(259, 0)) { - if($event->getBlock() === \pocketmine\block\Block::get(46, 0)) { - if(!$this->canExplode($p->getX(), $p->getY(), $p->getZ(), $p, $p->getLevel())) { - $event->setCancelled(); - return; - } - } - } - } - if(!$this->canTouch($p,$b)) { - if($c["Messages"]["Touch"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Touch"]["Message"])); - } - $event->setCancelled(); - } - } - - /* Handles entity explode - * event (\pocketmine\event\entity\EntityExplodeEvent) - */ - - public function onEntityExplode(EntityExplodeEvent $event) { - if(!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity(), $event->getEntity()->getLevel())) { - $event->setCancelled(); - } - } - - public function saveAreas() { - $areas = array(); - foreach($this->areas as $area) { - $areas[] = array("name" => $area->getName(),"flags" => $area->getFlags(),"pos1" => $area->getPos1(),"pos2" => $area->getPos2(),"level" => $area->getLevel(),"whitelist" => $area->getWhitelist()); - } - if($c["Settings"]["JPP"] === true) { - file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas, JSON_PRETTY_PRINT)); - return; - } elseif($c["Settings"]["JPP"] === false) { - file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas)); - return; - } else { - file_put_contents($this->getDataFolder() . "areas.json",json_encode($areas)); - return; - } - } - - public function canEdit($p,$t) { - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { - return true; - } - $o = true; - $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Edit"] : $this->edit); - if($g) { - $o = false; - } - foreach($this->areas as $area) { - if($area->contains(new Vector3($t->getX(),$t->getY(),$t->getZ()),$t->getLevel()->getName())) { - if($area->getFlag("edit")) { - $o = false; - } - if($area->isWhitelisted(strtolower($p->getName()))) { - $o = true; - break; - } - if(!$area->getFlag("edit") && $g) { - $o = true; - break; - } - } - } - return $o; - } - - public function canTouch($p,$t) { - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { - return true; - } - $o = true; - $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Touch"] : $this->touch); - if($g) { - $o = false; - } - foreach($this->areas as $area) { - if($area->contains(new Vector3($t->getX(),$t->getY(),$t->getZ()),$t->getLevel()->getName())) { - if($area->getFlag("touch")) { - $o = false; - } - if($area->isWhitelisted(strtolower($p->getName()))) { - $o = true; - break; - } - if(!$area->getFlag("touch") && $g) { - $o = true; - break; - } - } - } - return $o; - } - - public function canGetHurt($p) { - $o = true; - $g = (isset($this->levels[$p->getLevel()->getName()]) ? $this->levels[$p->getLevel()->getName()]["God"] : $this->god); - if($g) { - $o = false; - } - foreach($this->areas as $area) { - if($area->contains(new Vector3($p->getX(),$p->getY(),$p->getZ()),$p->getLevel()->getName())) { - if(!$area->getFlag("god") && $g) { - $o = true; - break; - } - if($area->getFlag("god")) { - $o = false; - } - } - } - return $o; - } - - public function canExplode($x, $y, $z, $p, $level) { - if($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { - return true; - } - $o = true; - $g = (isset($this->levels[$level->getName()]) ? $this->levels[$level->getName()]["TNT"] : $this->tnt); - if($g) { - $o = false; - } - foreach($this->areas as $area) { - if($area->contains(new Vector3($x,$y,$z,$level->getName()))) { - if($area->getFlag("tnt")) { - $o = false; - } - if($area->isWhitelisted(strtolower($p->getName()))) { - $o = true; - break; - } - if($area->getFlag("tnt") && $g) { - $o = true; - break; - } - } - } - return $o; - } - -} From 2fd803b05f5a1336d6e08bf8b0b67cc64fe358dc Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:18:27 -0400 Subject: [PATCH 24/78] Create Main.php --- src/LDX/iProtector/Main.php | 481 ++++++++++++++++++++++++++++++++++++ 1 file changed, 481 insertions(+) create mode 100644 src/LDX/iProtector/Main.php diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php new file mode 100644 index 0000000..ff6a5f1 --- /dev/null +++ b/src/LDX/iProtector/Main.php @@ -0,0 +1,481 @@ +getServer()->getPluginManager()->registerEvents($this, $this); + $this->getLogger()->info(TextFormat::GREEN . "Enabling " . $this->getDescription()->getFullName() . "..."); + if (!is_dir($this->getDataFolder())) { + mkdir($this->getDataFolder()); + } + if (!file_exists($this->getDataFolder() . "areas.json")) { + file_put_contents($this->getDataFolder() . "areas.json", "[]"); + } + if (!file_exists($this->getDataFolder() . "config.yml")) { + $c = $this->getResource("config.yml"); + $o = stream_get_contents($c); + fclose($c); + file_put_contents($this->getDataFolder() . "config.yml", str_replace("DEFAULT", $this->getServer()->getDefaultLevel()->getName(), $o)); + } + $this->areas = array(); + $data = json_decode(file_get_contents($this->getDataFolder() . "areas.json"), true); + foreach ($data as $datum) { + $area = new Area($datum["name"], $datum["flags"], $datum["pos1"], $datum["pos2"], $datum["level"], $datum["whitelist"], $this); + } + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Settings"]["Enable"] === false) { + $this->getPluginLoader()->disablePlugin($this); + return true; + } elseif ($c["Settings"]["Enable"] !== true) { + $this->getPluginLoader()->disablePlugin($this); + return true; + } else { + + $this->god = $c["Default"]["God"]; + $this->edit = $c["Default"]["Edit"]; + $this->tnt = $c["Default"]["TNT"]; + $this->touch = $c["Default"]["Touch"]; + $this->levels = array(); + foreach ($c["Worlds"] as $level => $flags) { + $this->levels[$level] = $flags; + } + return true; + } + } + + public function onDisable() + { + $this->getLogger()->info(TextFormat::RED . "Disabling " . $this->getDescription()->getFullName() . "..."); + } + + public function onCommand(CommandSender $p, Command $cmd, $label, array $args) + { + if (!($p instanceof Player)) { + $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); + return true; + } + if (!isset($args[0])) { + return false; + } + $n = strtolower($p->getName()); + $action = strtolower($args[0]); + switch ($action) { + case "pos1": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos1")) { + if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { + $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; + } else { + $this->sel1[$n] = true; + $o = self::PREFIX . TextFormat::AQUA . "Please place or break the first position."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "pos2": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos2")) { + if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { + $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; + } else { + $this->sel2[$n] = true; + $o = self::PREFIX . TextFormat::AQUA . "Please place or break the second position."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "create": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.create")) { + if (isset($args[1])) { + if (isset($this->pos1[$n]) && isset($this->pos2[$n])) { + if (!isset($this->areas[strtolower($args[1])])) { + $area = new Area(strtolower($args[1]), array( + "edit" => true, + "god" => false, + "tnt" => false, + "touch" => true + ), array( + $this->pos1[$n]->getX(), + $this->pos1[$n]->getY(), + $this->pos1[$n]->getZ() + ), array( + $this->pos2[$n]->getX(), + $this->pos2[$n]->getY(), + $this->pos2[$n]->getZ() + ), $p->getLevel()->getName(), array( + $n + ), $this); + $this->saveAreas(); + unset($this->pos1[$n]); + unset($this->pos2[$n]); + $o = self::PREFIX . TextFormat::GREEN . "Area created!"; + } else { + $o = self::PREFIX . TextFormat::RED . "An area with that name already exists."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please select both positions first."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify a name for this area."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "list": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { + $o = self::PREFIX . PHP_EOL . TextFormat::AQUA . "Areas:"; + foreach ($this->areas as $area) { + $o = $o . " " . $area->getName() . ";"; + } + } + break; + case "flag": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.flag")) { + if (isset($args[1])) { + if (isset($this->areas[strtolower($args[1])])) { + $area = $this->areas[strtolower($args[1])]; + if (isset($args[2])) { + if (isset($area->flags[strtolower($args[2])])) { + $flag = strtolower($args[2]); + if (isset($args[3])) { + $mode = strtolower($args[3]); + if ($mode == "true" || $mode == "on") { + $mode = true; + } else { + $mode = false; + } + $area->setFlag($flag, $mode); + } else { + $area->toggleFlag($flag); + } + if ($area->getFlag($flag)) { + $status = "on"; + } else { + $status = "off"; + } + $o = self::PREFIX . TextFormat::GREEN . "Flag " . $flag . " set to " . $status . " for area " . $area->getName() . "!"; + } else { + $o = self::PREFIX . TextFormat::RED . "Flag not found. (Flags: edit, god, tnt, touch)"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify a flag. (Flags: edit, god, tnt, touch)"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Area doesn't exist."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify the area you would like to flag."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "delete": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { + if (isset($args[1])) { + if (isset($this->areas[strtolower($args[1])])) { + $area = $this->areas[strtolower($args[1])]; + $area->delete(); + $o = self::PREFIX . TextFormat::GREEN . "Area deleted!"; + } else { + $o = self::PREFIX . TextFormat::RED . "Area does not exist."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify an area to delete."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "whitelist": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { + if (isset($args[1]) && isset($this->areas[strtolower($args[1])])) { + $area = $this->areas[strtolower($args[1])]; + if (isset($args[2])) { + $action = strtolower($args[2]); + switch ($action) { + case "add": + $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); + if (!$area->isWhitelisted($w)) { + $area->setWhitelisted($w); + $o = self::PREFIX . TextFormat::GREEN . "Player $w has been whitelisted in area " . $area->getName() . "."; + } else { + $o = self::PREFIX . TextFormat::RED . "Player $w is already whitelisted in area " . $area->getName() . "."; + } + break; + case "list": + $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:"; + foreach ($area->getWhitelist() as $w) { + $o .= " $w;"; + } + break; + case "delete": + case "remove": + $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); + if ($area->isWhitelisted($w)) { + $area->setWhitelisted($w, false); + $o = self::PREFIX . TextFormat::GREEN . "Player $w has been unwhitelisted in area " . $area->getName() . "."; + } else { + $o = self::PREFIX . TextFormat::RED . "$w is already unwhitelisted in area " . $area->getName() . "."; + } + break; + default: + $o = self::PREFIX . TextFormat::RED . "Please specify a valid action. Usage: /area whitelist " . $area->getName() . " [player]"; + break; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify an action. Usage: /area whitelist " . $area->getName() . " [player]"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Area doesn't exist. Usage: /area whitelist [player]"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + default: + return false; + break; + } + $p->sendMessage($o); + return true; + } + + public function onHurt(EntityDamageEvent $event) + { + if ($event->getEntity() instanceof Player) { + $p = $event->getEntity(); + $x = false; + if (!$this->canGetHurt($p)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Hurt"]["Enable"] === true) { + $p->sendMessage(str_replace('{player}', $p->getName(), $c["Messages"]["Hurt"]["Message"])); + } + $event->setCancelled(); + } + } + } + + public function onBlockBreak(BlockBreakEvent $event) + { + $b = $event->getBlock(); + $p = $event->getPlayer(); + $n = strtolower($p->getName()); + if (isset($this->sel1[$n])) { + unset($this->sel1[$n]); + $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); + $event->setCancelled(); + } else if (isset($this->sel2[$n])) { + unset($this->sel2[$n]); + $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); + $event->setCancelled(); + } else { + if (!$this->canEdit($p, $b)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Break"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Break"]["Message"])); + } + $event->setCancelled(); + } + } + } + + public function onBlockPlace(BlockPlaceEvent $event) + { + $b = $event->getBlock(); + $p = $event->getPlayer(); + $n = strtolower($p->getName()); + if (isset($this->sel1[$n])) { + unset($this->sel1[$n]); + $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); + $event->setCancelled(); + } else if (isset($this->sel2[$n])) { + unset($this->sel2[$n]); + $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); + $event->setCancelled(); + } else { + if (!$this->canEdit($p, $b)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Place"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Place"]["Message"])); + } + $event->setCancelled(); + } + } + } + + public function onBlockTouch(PlayerInteractEvent $event) + { + $b = $event->getBlock(); + $p = $event->getPlayer(); + if (!$this->canTouch($p, $b)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Touch"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Touch"]["Message"])); + } + $event->setCancelled(); + } + } + + /* Handles entity explode + * event (\pocketmine\event\entity\EntityExplodeEvent) + */ + + public function onEntityExplode(EntityExplodeEvent $event) + { + if (!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity(), $event->getEntity()->getLevel())) { + $event->setCancelled(); + } + } + + public function saveAreas() + { + $areas = array(); + foreach ($this->areas as $area) { + $areas[] = array( + "name" => $area->getName(), + "flags" => $area->getFlags(), + "pos1" => $area->getPos1(), + "pos2" => $area->getPos2(), + "level" => $area->getLevel(), + "whitelist" => $area->getWhitelist() + ); + } + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Settings"]["JPP"] === true) { + file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas, JSON_PRETTY_PRINT)); + return; + } elseif ($c["Settings"]["JPP"] === false) { + file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); + return; + } else { + file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); + return; + } + } + + public function canEdit($p, $t) + { + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { + return true; + } + $o = true; + $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Edit"] : $this->edit); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { + if ($area->getFlag("edit")) { + $o = false; + } + if ($area->isWhitelisted(strtolower($p->getName()))) { + $o = true; + break; + } + if (!$area->getFlag("edit") && $g) { + $o = true; + break; + } + } + } + return $o; + } + + public function canTouch($p, $t) + { + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { + return true; + } + $o = true; + $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Touch"] : $this->touch); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { + if ($area->getFlag("touch")) { + $o = false; + } + if ($area->isWhitelisted(strtolower($p->getName()))) { + $o = true; + break; + } + if (!$area->getFlag("touch") && $g) { + $o = true; + break; + } + } + } + return $o; + } + + public function canGetHurt($p) + { + $o = true; + $g = (isset($this->levels[$p->getLevel()->getName()]) ? $this->levels[$p->getLevel()->getName()]["God"] : $this->god); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { + if (!$area->getFlag("god") && $g) { + $o = true; + break; + } + if ($area->getFlag("god")) { + $o = false; + } + } + } + return $o; + } + + public function canExplode($x, $y, $z, $p, $level) + { + $o = true; + $g = (isset($this->levels[$level->getName()]) ? $this->levels[$level->getName()]["TNT"] : $this->tnt); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($x, $y, $z), $level->getName())) { + if ($area->getFlag("tnt")) { + $o = false; + break; + } + if ($area->getFlag("tnt") && $g) { + $o = true; + break; + } + } + } + return $o; + } + +} From 909b87e6ca740587a187b1b45a70dba48c7e1ac5 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:18:54 -0400 Subject: [PATCH 25/78] Delete Area.php --- src/LDX/iProtector/Area.php | 120 ------------------------------------ 1 file changed, 120 deletions(-) delete mode 100644 src/LDX/iProtector/Area.php diff --git a/src/LDX/iProtector/Area.php b/src/LDX/iProtector/Area.php deleted file mode 100644 index 8756e8a..0000000 --- a/src/LDX/iProtector/Area.php +++ /dev/null @@ -1,120 +0,0 @@ -name = strtolower($name); - $this->flags = $flags; - $this->pos1 = new Vector3($pos1[0],$pos1[1],$pos1[2]); - $this->pos2 = new Vector3($pos2[0],$pos2[1],$pos2[2]); - $this->level = $level; - $this->whitelist = $whitelist; - $this->plugin = $plugin; - $this->save(); - } - - public function getName() { - return $this->name; - } - - public function getPos1() { - return array($this->pos1->getX(),$this->pos1->getY(),$this->pos1->getZ()); - } - - public function getPos2() { - return array($this->pos2->getX(),$this->pos2->getY(),$this->pos2->getZ()); - } - - public function getFlags() { - return $this->flags; - } - - public function getFlag($flag) { - if(isset($this->flags[$flag])) { - return $this->flags[$flag]; - } - return false; - } - - public function setFlag($flag,$value) { - if(isset($this->flags[$flag])) { - $this->flags[$flag] = $value; - $this->plugin->saveAreas(); - return true; - } - return false; - } - - public function contains($pos,$level) { - if((min($this->pos1->getX(),$this->pos2->getX()) <= $pos->getX()) && (max($this->pos1->getX(),$this->pos2->getX()) >= $pos->getX()) && (min($this->pos1->getY(),$this->pos2->getY()) <= $pos->getY()) && (max($this->pos1->getY(),$this->pos2->getY()) >= $pos->getY()) && (min($this->pos1->getZ(),$this->pos2->getZ()) <= $pos->getZ()) && (max($this->pos1->getZ(),$this->pos2->getZ()) >= $pos->getZ()) && ($this->level == $level)) { - return true; - } - return false; - } - - public function toggleFlag($flag) { - if(isset($this->flags[$flag])) { - $this->flags[$flag] = !$this->flags[$flag]; - $this->plugin->saveAreas(); - return $this->flags[$flag]; - } - return false; - } - - public function getLevel() { - return $this->level; - } - - public function isWhitelisted($n) { - if(in_array($n,$this->whitelist)) { - return true; - } - return false; - } - - public function setWhitelisted($n,$v = true) { - if($v) { - if(!in_array($n,$this->whitelist)) { - array_push($this->whitelist,$n); - $this->plugin->saveAreas(); - return true; - } - } else { - if(in_array($n,$this->whitelist)) { - $key = array_search($n,$this->whitelist); - array_splice($this->whitelist,$key,1); - $this->plugin->saveAreas(); - return true; - } - } - return false; - } - - public function getWhitelist() { - return $this->whitelist; - } - - public function save() { - $this->plugin->areas[$this->name] = $this; - return true; - } - - public function delete() { - unset($this->plugin->areas[$this->getName()]); - $this->plugin->saveAreas(); - return true; - } - -} From 8e55ce96728b85119f17699e930c0d1291a0cacb Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:19:13 -0400 Subject: [PATCH 26/78] Create Area.php --- src/LDX/iProtector/Area.php | 144 ++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 src/LDX/iProtector/Area.php diff --git a/src/LDX/iProtector/Area.php b/src/LDX/iProtector/Area.php new file mode 100644 index 0000000..4a7e30c --- /dev/null +++ b/src/LDX/iProtector/Area.php @@ -0,0 +1,144 @@ +name = strtolower($name); + $this->flags = $flags; + $this->pos1 = new Vector3($pos1[0], $pos1[1], $pos1[2]); + $this->pos2 = new Vector3($pos2[0], $pos2[1], $pos2[2]); + $this->level = $level; + $this->whitelist = $whitelist; + $this->plugin = $plugin; + $this->save(); + } + + public function getName() + { + return $this->name; + } + + public function getPos1() + { + return array( + $this->pos1->getX(), + $this->pos1->getY(), + $this->pos1->getZ() + ); + } + + public function getPos2() + { + return array( + $this->pos2->getX(), + $this->pos2->getY(), + $this->pos2->getZ() + ); + } + + public function getFlags() + { + return $this->flags; + } + + public function getFlag($flag) + { + if (isset($this->flags[$flag])) { + return $this->flags[$flag]; + } + return false; + } + + public function setFlag($flag, $value) + { + if (isset($this->flags[$flag])) { + $this->flags[$flag] = $value; + $this->plugin->saveAreas(); + return true; + } + return false; + } + + public function contains($pos, $level) + { + if ((min($this->pos1->getX(), $this->pos2->getX()) <= $pos->getX()) && (max($this->pos1->getX(), $this->pos2->getX()) >= $pos->getX()) && (min($this->pos1->getY(), $this->pos2->getY()) <= $pos->getY()) && (max($this->pos1->getY(), $this->pos2->getY()) >= $pos->getY()) && (min($this->pos1->getZ(), $this->pos2->getZ()) <= $pos->getZ()) && (max($this->pos1->getZ(), $this->pos2->getZ()) >= $pos->getZ()) && ($this->level == $level)) { + return true; + } + return false; + } + + public function toggleFlag($flag) + { + if (isset($this->flags[$flag])) { + $this->flags[$flag] = !$this->flags[$flag]; + $this->plugin->saveAreas(); + return $this->flags[$flag]; + } + return false; + } + + public function getLevel() + { + return $this->level; + } + + public function isWhitelisted($n) + { + if (in_array($n, $this->whitelist)) { + return true; + } + return false; + } + + public function setWhitelisted($n, $v = true) + { + if ($v) { + if (!in_array($n, $this->whitelist)) { + array_push($this->whitelist, $n); + $this->plugin->saveAreas(); + return true; + } + } else { + if (in_array($n, $this->whitelist)) { + $key = array_search($n, $this->whitelist); + array_splice($this->whitelist, $key, 1); + $this->plugin->saveAreas(); + return true; + } + } + return false; + } + + public function getWhitelist() + { + return $this->whitelist; + } + + public function save() + { + $this->plugin->areas[$this->name] = $this; + return true; + } + + public function delete() + { + unset($this->plugin->areas[$this->getName()]); + $this->plugin->saveAreas(); + return true; + } + +} From 44e4541bce546f91830b5873dfd9abb3b8738b3b Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:20:33 -0400 Subject: [PATCH 27/78] Create Main.php --- src/kenygamer/iProtector/Main.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/kenygamer/iProtector/Main.php diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/kenygamer/iProtector/Main.php @@ -0,0 +1 @@ + From a7d5bc8f9494e320659a4315034fd2ef49349959 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:20:54 -0400 Subject: [PATCH 28/78] Create Area.php --- src/kenygamer/iProtector/Area.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/kenygamer/iProtector/Area.php diff --git a/src/kenygamer/iProtector/Area.php b/src/kenygamer/iProtector/Area.php new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/kenygamer/iProtector/Area.php @@ -0,0 +1 @@ + From 5f677947ad3dc91557303f6eeaac11b14c8a2cf5 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:21:34 -0400 Subject: [PATCH 29/78] Update Area.php --- src/kenygamer/iProtector/Area.php | 143 ++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/src/kenygamer/iProtector/Area.php b/src/kenygamer/iProtector/Area.php index 8b13789..4a7e30c 100644 --- a/src/kenygamer/iProtector/Area.php +++ b/src/kenygamer/iProtector/Area.php @@ -1 +1,144 @@ +name = strtolower($name); + $this->flags = $flags; + $this->pos1 = new Vector3($pos1[0], $pos1[1], $pos1[2]); + $this->pos2 = new Vector3($pos2[0], $pos2[1], $pos2[2]); + $this->level = $level; + $this->whitelist = $whitelist; + $this->plugin = $plugin; + $this->save(); + } + + public function getName() + { + return $this->name; + } + + public function getPos1() + { + return array( + $this->pos1->getX(), + $this->pos1->getY(), + $this->pos1->getZ() + ); + } + + public function getPos2() + { + return array( + $this->pos2->getX(), + $this->pos2->getY(), + $this->pos2->getZ() + ); + } + + public function getFlags() + { + return $this->flags; + } + + public function getFlag($flag) + { + if (isset($this->flags[$flag])) { + return $this->flags[$flag]; + } + return false; + } + + public function setFlag($flag, $value) + { + if (isset($this->flags[$flag])) { + $this->flags[$flag] = $value; + $this->plugin->saveAreas(); + return true; + } + return false; + } + + public function contains($pos, $level) + { + if ((min($this->pos1->getX(), $this->pos2->getX()) <= $pos->getX()) && (max($this->pos1->getX(), $this->pos2->getX()) >= $pos->getX()) && (min($this->pos1->getY(), $this->pos2->getY()) <= $pos->getY()) && (max($this->pos1->getY(), $this->pos2->getY()) >= $pos->getY()) && (min($this->pos1->getZ(), $this->pos2->getZ()) <= $pos->getZ()) && (max($this->pos1->getZ(), $this->pos2->getZ()) >= $pos->getZ()) && ($this->level == $level)) { + return true; + } + return false; + } + + public function toggleFlag($flag) + { + if (isset($this->flags[$flag])) { + $this->flags[$flag] = !$this->flags[$flag]; + $this->plugin->saveAreas(); + return $this->flags[$flag]; + } + return false; + } + + public function getLevel() + { + return $this->level; + } + + public function isWhitelisted($n) + { + if (in_array($n, $this->whitelist)) { + return true; + } + return false; + } + + public function setWhitelisted($n, $v = true) + { + if ($v) { + if (!in_array($n, $this->whitelist)) { + array_push($this->whitelist, $n); + $this->plugin->saveAreas(); + return true; + } + } else { + if (in_array($n, $this->whitelist)) { + $key = array_search($n, $this->whitelist); + array_splice($this->whitelist, $key, 1); + $this->plugin->saveAreas(); + return true; + } + } + return false; + } + + public function getWhitelist() + { + return $this->whitelist; + } + + public function save() + { + $this->plugin->areas[$this->name] = $this; + return true; + } + + public function delete() + { + unset($this->plugin->areas[$this->getName()]); + $this->plugin->saveAreas(); + return true; + } + +} From f171e5a508d8b4cb5ed431fbb825f2c369b96a12 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:22:02 -0400 Subject: [PATCH 30/78] Update Main.php --- src/kenygamer/iProtector/Main.php | 480 ++++++++++++++++++++++++++++++ 1 file changed, 480 insertions(+) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index 8b13789..ff6a5f1 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -1 +1,481 @@ +getServer()->getPluginManager()->registerEvents($this, $this); + $this->getLogger()->info(TextFormat::GREEN . "Enabling " . $this->getDescription()->getFullName() . "..."); + if (!is_dir($this->getDataFolder())) { + mkdir($this->getDataFolder()); + } + if (!file_exists($this->getDataFolder() . "areas.json")) { + file_put_contents($this->getDataFolder() . "areas.json", "[]"); + } + if (!file_exists($this->getDataFolder() . "config.yml")) { + $c = $this->getResource("config.yml"); + $o = stream_get_contents($c); + fclose($c); + file_put_contents($this->getDataFolder() . "config.yml", str_replace("DEFAULT", $this->getServer()->getDefaultLevel()->getName(), $o)); + } + $this->areas = array(); + $data = json_decode(file_get_contents($this->getDataFolder() . "areas.json"), true); + foreach ($data as $datum) { + $area = new Area($datum["name"], $datum["flags"], $datum["pos1"], $datum["pos2"], $datum["level"], $datum["whitelist"], $this); + } + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Settings"]["Enable"] === false) { + $this->getPluginLoader()->disablePlugin($this); + return true; + } elseif ($c["Settings"]["Enable"] !== true) { + $this->getPluginLoader()->disablePlugin($this); + return true; + } else { + + $this->god = $c["Default"]["God"]; + $this->edit = $c["Default"]["Edit"]; + $this->tnt = $c["Default"]["TNT"]; + $this->touch = $c["Default"]["Touch"]; + $this->levels = array(); + foreach ($c["Worlds"] as $level => $flags) { + $this->levels[$level] = $flags; + } + return true; + } + } + + public function onDisable() + { + $this->getLogger()->info(TextFormat::RED . "Disabling " . $this->getDescription()->getFullName() . "..."); + } + + public function onCommand(CommandSender $p, Command $cmd, $label, array $args) + { + if (!($p instanceof Player)) { + $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); + return true; + } + if (!isset($args[0])) { + return false; + } + $n = strtolower($p->getName()); + $action = strtolower($args[0]); + switch ($action) { + case "pos1": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos1")) { + if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { + $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; + } else { + $this->sel1[$n] = true; + $o = self::PREFIX . TextFormat::AQUA . "Please place or break the first position."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "pos2": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos2")) { + if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { + $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; + } else { + $this->sel2[$n] = true; + $o = self::PREFIX . TextFormat::AQUA . "Please place or break the second position."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "create": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.create")) { + if (isset($args[1])) { + if (isset($this->pos1[$n]) && isset($this->pos2[$n])) { + if (!isset($this->areas[strtolower($args[1])])) { + $area = new Area(strtolower($args[1]), array( + "edit" => true, + "god" => false, + "tnt" => false, + "touch" => true + ), array( + $this->pos1[$n]->getX(), + $this->pos1[$n]->getY(), + $this->pos1[$n]->getZ() + ), array( + $this->pos2[$n]->getX(), + $this->pos2[$n]->getY(), + $this->pos2[$n]->getZ() + ), $p->getLevel()->getName(), array( + $n + ), $this); + $this->saveAreas(); + unset($this->pos1[$n]); + unset($this->pos2[$n]); + $o = self::PREFIX . TextFormat::GREEN . "Area created!"; + } else { + $o = self::PREFIX . TextFormat::RED . "An area with that name already exists."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please select both positions first."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify a name for this area."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "list": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { + $o = self::PREFIX . PHP_EOL . TextFormat::AQUA . "Areas:"; + foreach ($this->areas as $area) { + $o = $o . " " . $area->getName() . ";"; + } + } + break; + case "flag": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.flag")) { + if (isset($args[1])) { + if (isset($this->areas[strtolower($args[1])])) { + $area = $this->areas[strtolower($args[1])]; + if (isset($args[2])) { + if (isset($area->flags[strtolower($args[2])])) { + $flag = strtolower($args[2]); + if (isset($args[3])) { + $mode = strtolower($args[3]); + if ($mode == "true" || $mode == "on") { + $mode = true; + } else { + $mode = false; + } + $area->setFlag($flag, $mode); + } else { + $area->toggleFlag($flag); + } + if ($area->getFlag($flag)) { + $status = "on"; + } else { + $status = "off"; + } + $o = self::PREFIX . TextFormat::GREEN . "Flag " . $flag . " set to " . $status . " for area " . $area->getName() . "!"; + } else { + $o = self::PREFIX . TextFormat::RED . "Flag not found. (Flags: edit, god, tnt, touch)"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify a flag. (Flags: edit, god, tnt, touch)"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Area doesn't exist."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify the area you would like to flag."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "delete": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { + if (isset($args[1])) { + if (isset($this->areas[strtolower($args[1])])) { + $area = $this->areas[strtolower($args[1])]; + $area->delete(); + $o = self::PREFIX . TextFormat::GREEN . "Area deleted!"; + } else { + $o = self::PREFIX . TextFormat::RED . "Area does not exist."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify an area to delete."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + case "whitelist": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { + if (isset($args[1]) && isset($this->areas[strtolower($args[1])])) { + $area = $this->areas[strtolower($args[1])]; + if (isset($args[2])) { + $action = strtolower($args[2]); + switch ($action) { + case "add": + $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); + if (!$area->isWhitelisted($w)) { + $area->setWhitelisted($w); + $o = self::PREFIX . TextFormat::GREEN . "Player $w has been whitelisted in area " . $area->getName() . "."; + } else { + $o = self::PREFIX . TextFormat::RED . "Player $w is already whitelisted in area " . $area->getName() . "."; + } + break; + case "list": + $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:"; + foreach ($area->getWhitelist() as $w) { + $o .= " $w;"; + } + break; + case "delete": + case "remove": + $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); + if ($area->isWhitelisted($w)) { + $area->setWhitelisted($w, false); + $o = self::PREFIX . TextFormat::GREEN . "Player $w has been unwhitelisted in area " . $area->getName() . "."; + } else { + $o = self::PREFIX . TextFormat::RED . "$w is already unwhitelisted in area " . $area->getName() . "."; + } + break; + default: + $o = self::PREFIX . TextFormat::RED . "Please specify a valid action. Usage: /area whitelist " . $area->getName() . " [player]"; + break; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Please specify an action. Usage: /area whitelist " . $area->getName() . " [player]"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "Area doesn't exist. Usage: /area whitelist [player]"; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; + default: + return false; + break; + } + $p->sendMessage($o); + return true; + } + + public function onHurt(EntityDamageEvent $event) + { + if ($event->getEntity() instanceof Player) { + $p = $event->getEntity(); + $x = false; + if (!$this->canGetHurt($p)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Hurt"]["Enable"] === true) { + $p->sendMessage(str_replace('{player}', $p->getName(), $c["Messages"]["Hurt"]["Message"])); + } + $event->setCancelled(); + } + } + } + + public function onBlockBreak(BlockBreakEvent $event) + { + $b = $event->getBlock(); + $p = $event->getPlayer(); + $n = strtolower($p->getName()); + if (isset($this->sel1[$n])) { + unset($this->sel1[$n]); + $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); + $event->setCancelled(); + } else if (isset($this->sel2[$n])) { + unset($this->sel2[$n]); + $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); + $event->setCancelled(); + } else { + if (!$this->canEdit($p, $b)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Break"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Break"]["Message"])); + } + $event->setCancelled(); + } + } + } + + public function onBlockPlace(BlockPlaceEvent $event) + { + $b = $event->getBlock(); + $p = $event->getPlayer(); + $n = strtolower($p->getName()); + if (isset($this->sel1[$n])) { + unset($this->sel1[$n]); + $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); + $event->setCancelled(); + } else if (isset($this->sel2[$n])) { + unset($this->sel2[$n]); + $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); + $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); + $event->setCancelled(); + } else { + if (!$this->canEdit($p, $b)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Place"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Place"]["Message"])); + } + $event->setCancelled(); + } + } + } + + public function onBlockTouch(PlayerInteractEvent $event) + { + $b = $event->getBlock(); + $p = $event->getPlayer(); + if (!$this->canTouch($p, $b)) { + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Messages"]["Touch"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Touch"]["Message"])); + } + $event->setCancelled(); + } + } + + /* Handles entity explode + * event (\pocketmine\event\entity\EntityExplodeEvent) + */ + + public function onEntityExplode(EntityExplodeEvent $event) + { + if (!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity(), $event->getEntity()->getLevel())) { + $event->setCancelled(); + } + } + + public function saveAreas() + { + $areas = array(); + foreach ($this->areas as $area) { + $areas[] = array( + "name" => $area->getName(), + "flags" => $area->getFlags(), + "pos1" => $area->getPos1(), + "pos2" => $area->getPos2(), + "level" => $area->getLevel(), + "whitelist" => $area->getWhitelist() + ); + } + $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($c["Settings"]["JPP"] === true) { + file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas, JSON_PRETTY_PRINT)); + return; + } elseif ($c["Settings"]["JPP"] === false) { + file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); + return; + } else { + file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); + return; + } + } + + public function canEdit($p, $t) + { + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { + return true; + } + $o = true; + $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Edit"] : $this->edit); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { + if ($area->getFlag("edit")) { + $o = false; + } + if ($area->isWhitelisted(strtolower($p->getName()))) { + $o = true; + break; + } + if (!$area->getFlag("edit") && $g) { + $o = true; + break; + } + } + } + return $o; + } + + public function canTouch($p, $t) + { + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { + return true; + } + $o = true; + $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Touch"] : $this->touch); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { + if ($area->getFlag("touch")) { + $o = false; + } + if ($area->isWhitelisted(strtolower($p->getName()))) { + $o = true; + break; + } + if (!$area->getFlag("touch") && $g) { + $o = true; + break; + } + } + } + return $o; + } + + public function canGetHurt($p) + { + $o = true; + $g = (isset($this->levels[$p->getLevel()->getName()]) ? $this->levels[$p->getLevel()->getName()]["God"] : $this->god); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { + if (!$area->getFlag("god") && $g) { + $o = true; + break; + } + if ($area->getFlag("god")) { + $o = false; + } + } + } + return $o; + } + + public function canExplode($x, $y, $z, $p, $level) + { + $o = true; + $g = (isset($this->levels[$level->getName()]) ? $this->levels[$level->getName()]["TNT"] : $this->tnt); + if ($g) { + $o = false; + } + foreach ($this->areas as $area) { + if ($area->contains(new Vector3($x, $y, $z), $level->getName())) { + if ($area->getFlag("tnt")) { + $o = false; + break; + } + if ($area->getFlag("tnt") && $g) { + $o = true; + break; + } + } + } + return $o; + } + +} From 172e7ff544fdc145a2a39560675bbe4aeda661ee Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:22:23 -0400 Subject: [PATCH 31/78] Delete Main.php --- src/LDX/iProtector/Main.php | 481 ------------------------------------ 1 file changed, 481 deletions(-) delete mode 100644 src/LDX/iProtector/Main.php diff --git a/src/LDX/iProtector/Main.php b/src/LDX/iProtector/Main.php deleted file mode 100644 index ff6a5f1..0000000 --- a/src/LDX/iProtector/Main.php +++ /dev/null @@ -1,481 +0,0 @@ -getServer()->getPluginManager()->registerEvents($this, $this); - $this->getLogger()->info(TextFormat::GREEN . "Enabling " . $this->getDescription()->getFullName() . "..."); - if (!is_dir($this->getDataFolder())) { - mkdir($this->getDataFolder()); - } - if (!file_exists($this->getDataFolder() . "areas.json")) { - file_put_contents($this->getDataFolder() . "areas.json", "[]"); - } - if (!file_exists($this->getDataFolder() . "config.yml")) { - $c = $this->getResource("config.yml"); - $o = stream_get_contents($c); - fclose($c); - file_put_contents($this->getDataFolder() . "config.yml", str_replace("DEFAULT", $this->getServer()->getDefaultLevel()->getName(), $o)); - } - $this->areas = array(); - $data = json_decode(file_get_contents($this->getDataFolder() . "areas.json"), true); - foreach ($data as $datum) { - $area = new Area($datum["name"], $datum["flags"], $datum["pos1"], $datum["pos2"], $datum["level"], $datum["whitelist"], $this); - } - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Settings"]["Enable"] === false) { - $this->getPluginLoader()->disablePlugin($this); - return true; - } elseif ($c["Settings"]["Enable"] !== true) { - $this->getPluginLoader()->disablePlugin($this); - return true; - } else { - - $this->god = $c["Default"]["God"]; - $this->edit = $c["Default"]["Edit"]; - $this->tnt = $c["Default"]["TNT"]; - $this->touch = $c["Default"]["Touch"]; - $this->levels = array(); - foreach ($c["Worlds"] as $level => $flags) { - $this->levels[$level] = $flags; - } - return true; - } - } - - public function onDisable() - { - $this->getLogger()->info(TextFormat::RED . "Disabling " . $this->getDescription()->getFullName() . "..."); - } - - public function onCommand(CommandSender $p, Command $cmd, $label, array $args) - { - if (!($p instanceof Player)) { - $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); - return true; - } - if (!isset($args[0])) { - return false; - } - $n = strtolower($p->getName()); - $action = strtolower($args[0]); - switch ($action) { - case "pos1": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos1")) { - if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; - } else { - $this->sel1[$n] = true; - $o = self::PREFIX . TextFormat::AQUA . "Please place or break the first position."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "pos2": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos2")) { - if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; - } else { - $this->sel2[$n] = true; - $o = self::PREFIX . TextFormat::AQUA . "Please place or break the second position."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "create": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.create")) { - if (isset($args[1])) { - if (isset($this->pos1[$n]) && isset($this->pos2[$n])) { - if (!isset($this->areas[strtolower($args[1])])) { - $area = new Area(strtolower($args[1]), array( - "edit" => true, - "god" => false, - "tnt" => false, - "touch" => true - ), array( - $this->pos1[$n]->getX(), - $this->pos1[$n]->getY(), - $this->pos1[$n]->getZ() - ), array( - $this->pos2[$n]->getX(), - $this->pos2[$n]->getY(), - $this->pos2[$n]->getZ() - ), $p->getLevel()->getName(), array( - $n - ), $this); - $this->saveAreas(); - unset($this->pos1[$n]); - unset($this->pos2[$n]); - $o = self::PREFIX . TextFormat::GREEN . "Area created!"; - } else { - $o = self::PREFIX . TextFormat::RED . "An area with that name already exists."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please select both positions first."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify a name for this area."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "list": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { - $o = self::PREFIX . PHP_EOL . TextFormat::AQUA . "Areas:"; - foreach ($this->areas as $area) { - $o = $o . " " . $area->getName() . ";"; - } - } - break; - case "flag": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.flag")) { - if (isset($args[1])) { - if (isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - if (isset($args[2])) { - if (isset($area->flags[strtolower($args[2])])) { - $flag = strtolower($args[2]); - if (isset($args[3])) { - $mode = strtolower($args[3]); - if ($mode == "true" || $mode == "on") { - $mode = true; - } else { - $mode = false; - } - $area->setFlag($flag, $mode); - } else { - $area->toggleFlag($flag); - } - if ($area->getFlag($flag)) { - $status = "on"; - } else { - $status = "off"; - } - $o = self::PREFIX . TextFormat::GREEN . "Flag " . $flag . " set to " . $status . " for area " . $area->getName() . "!"; - } else { - $o = self::PREFIX . TextFormat::RED . "Flag not found. (Flags: edit, god, tnt, touch)"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify a flag. (Flags: edit, god, tnt, touch)"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Area doesn't exist."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify the area you would like to flag."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "delete": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { - if (isset($args[1])) { - if (isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - $area->delete(); - $o = self::PREFIX . TextFormat::GREEN . "Area deleted!"; - } else { - $o = self::PREFIX . TextFormat::RED . "Area does not exist."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify an area to delete."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "whitelist": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { - if (isset($args[1]) && isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - if (isset($args[2])) { - $action = strtolower($args[2]); - switch ($action) { - case "add": - $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); - if (!$area->isWhitelisted($w)) { - $area->setWhitelisted($w); - $o = self::PREFIX . TextFormat::GREEN . "Player $w has been whitelisted in area " . $area->getName() . "."; - } else { - $o = self::PREFIX . TextFormat::RED . "Player $w is already whitelisted in area " . $area->getName() . "."; - } - break; - case "list": - $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:"; - foreach ($area->getWhitelist() as $w) { - $o .= " $w;"; - } - break; - case "delete": - case "remove": - $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); - if ($area->isWhitelisted($w)) { - $area->setWhitelisted($w, false); - $o = self::PREFIX . TextFormat::GREEN . "Player $w has been unwhitelisted in area " . $area->getName() . "."; - } else { - $o = self::PREFIX . TextFormat::RED . "$w is already unwhitelisted in area " . $area->getName() . "."; - } - break; - default: - $o = self::PREFIX . TextFormat::RED . "Please specify a valid action. Usage: /area whitelist " . $area->getName() . " [player]"; - break; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify an action. Usage: /area whitelist " . $area->getName() . " [player]"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Area doesn't exist. Usage: /area whitelist [player]"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - default: - return false; - break; - } - $p->sendMessage($o); - return true; - } - - public function onHurt(EntityDamageEvent $event) - { - if ($event->getEntity() instanceof Player) { - $p = $event->getEntity(); - $x = false; - if (!$this->canGetHurt($p)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Hurt"]["Enable"] === true) { - $p->sendMessage(str_replace('{player}', $p->getName(), $c["Messages"]["Hurt"]["Message"])); - } - $event->setCancelled(); - } - } - } - - public function onBlockBreak(BlockBreakEvent $event) - { - $b = $event->getBlock(); - $p = $event->getPlayer(); - $n = strtolower($p->getName()); - if (isset($this->sel1[$n])) { - unset($this->sel1[$n]); - $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); - $event->setCancelled(); - } else if (isset($this->sel2[$n])) { - unset($this->sel2[$n]); - $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); - $event->setCancelled(); - } else { - if (!$this->canEdit($p, $b)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Break"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Break"]["Message"])); - } - $event->setCancelled(); - } - } - } - - public function onBlockPlace(BlockPlaceEvent $event) - { - $b = $event->getBlock(); - $p = $event->getPlayer(); - $n = strtolower($p->getName()); - if (isset($this->sel1[$n])) { - unset($this->sel1[$n]); - $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); - $event->setCancelled(); - } else if (isset($this->sel2[$n])) { - unset($this->sel2[$n]); - $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); - $event->setCancelled(); - } else { - if (!$this->canEdit($p, $b)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Place"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Place"]["Message"])); - } - $event->setCancelled(); - } - } - } - - public function onBlockTouch(PlayerInteractEvent $event) - { - $b = $event->getBlock(); - $p = $event->getPlayer(); - if (!$this->canTouch($p, $b)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Touch"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Touch"]["Message"])); - } - $event->setCancelled(); - } - } - - /* Handles entity explode - * event (\pocketmine\event\entity\EntityExplodeEvent) - */ - - public function onEntityExplode(EntityExplodeEvent $event) - { - if (!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity(), $event->getEntity()->getLevel())) { - $event->setCancelled(); - } - } - - public function saveAreas() - { - $areas = array(); - foreach ($this->areas as $area) { - $areas[] = array( - "name" => $area->getName(), - "flags" => $area->getFlags(), - "pos1" => $area->getPos1(), - "pos2" => $area->getPos2(), - "level" => $area->getLevel(), - "whitelist" => $area->getWhitelist() - ); - } - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Settings"]["JPP"] === true) { - file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas, JSON_PRETTY_PRINT)); - return; - } elseif ($c["Settings"]["JPP"] === false) { - file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); - return; - } else { - file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); - return; - } - } - - public function canEdit($p, $t) - { - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { - return true; - } - $o = true; - $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Edit"] : $this->edit); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { - if ($area->getFlag("edit")) { - $o = false; - } - if ($area->isWhitelisted(strtolower($p->getName()))) { - $o = true; - break; - } - if (!$area->getFlag("edit") && $g) { - $o = true; - break; - } - } - } - return $o; - } - - public function canTouch($p, $t) - { - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { - return true; - } - $o = true; - $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Touch"] : $this->touch); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { - if ($area->getFlag("touch")) { - $o = false; - } - if ($area->isWhitelisted(strtolower($p->getName()))) { - $o = true; - break; - } - if (!$area->getFlag("touch") && $g) { - $o = true; - break; - } - } - } - return $o; - } - - public function canGetHurt($p) - { - $o = true; - $g = (isset($this->levels[$p->getLevel()->getName()]) ? $this->levels[$p->getLevel()->getName()]["God"] : $this->god); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { - if (!$area->getFlag("god") && $g) { - $o = true; - break; - } - if ($area->getFlag("god")) { - $o = false; - } - } - } - return $o; - } - - public function canExplode($x, $y, $z, $p, $level) - { - $o = true; - $g = (isset($this->levels[$level->getName()]) ? $this->levels[$level->getName()]["TNT"] : $this->tnt); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($x, $y, $z), $level->getName())) { - if ($area->getFlag("tnt")) { - $o = false; - break; - } - if ($area->getFlag("tnt") && $g) { - $o = true; - break; - } - } - } - return $o; - } - -} From b1474fc4e54a570c68b5e0484e2b9bb696d852d4 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:22:33 -0400 Subject: [PATCH 32/78] Delete Area.php --- src/LDX/iProtector/Area.php | 144 ------------------------------------ 1 file changed, 144 deletions(-) delete mode 100644 src/LDX/iProtector/Area.php diff --git a/src/LDX/iProtector/Area.php b/src/LDX/iProtector/Area.php deleted file mode 100644 index 4a7e30c..0000000 --- a/src/LDX/iProtector/Area.php +++ /dev/null @@ -1,144 +0,0 @@ -name = strtolower($name); - $this->flags = $flags; - $this->pos1 = new Vector3($pos1[0], $pos1[1], $pos1[2]); - $this->pos2 = new Vector3($pos2[0], $pos2[1], $pos2[2]); - $this->level = $level; - $this->whitelist = $whitelist; - $this->plugin = $plugin; - $this->save(); - } - - public function getName() - { - return $this->name; - } - - public function getPos1() - { - return array( - $this->pos1->getX(), - $this->pos1->getY(), - $this->pos1->getZ() - ); - } - - public function getPos2() - { - return array( - $this->pos2->getX(), - $this->pos2->getY(), - $this->pos2->getZ() - ); - } - - public function getFlags() - { - return $this->flags; - } - - public function getFlag($flag) - { - if (isset($this->flags[$flag])) { - return $this->flags[$flag]; - } - return false; - } - - public function setFlag($flag, $value) - { - if (isset($this->flags[$flag])) { - $this->flags[$flag] = $value; - $this->plugin->saveAreas(); - return true; - } - return false; - } - - public function contains($pos, $level) - { - if ((min($this->pos1->getX(), $this->pos2->getX()) <= $pos->getX()) && (max($this->pos1->getX(), $this->pos2->getX()) >= $pos->getX()) && (min($this->pos1->getY(), $this->pos2->getY()) <= $pos->getY()) && (max($this->pos1->getY(), $this->pos2->getY()) >= $pos->getY()) && (min($this->pos1->getZ(), $this->pos2->getZ()) <= $pos->getZ()) && (max($this->pos1->getZ(), $this->pos2->getZ()) >= $pos->getZ()) && ($this->level == $level)) { - return true; - } - return false; - } - - public function toggleFlag($flag) - { - if (isset($this->flags[$flag])) { - $this->flags[$flag] = !$this->flags[$flag]; - $this->plugin->saveAreas(); - return $this->flags[$flag]; - } - return false; - } - - public function getLevel() - { - return $this->level; - } - - public function isWhitelisted($n) - { - if (in_array($n, $this->whitelist)) { - return true; - } - return false; - } - - public function setWhitelisted($n, $v = true) - { - if ($v) { - if (!in_array($n, $this->whitelist)) { - array_push($this->whitelist, $n); - $this->plugin->saveAreas(); - return true; - } - } else { - if (in_array($n, $this->whitelist)) { - $key = array_search($n, $this->whitelist); - array_splice($this->whitelist, $key, 1); - $this->plugin->saveAreas(); - return true; - } - } - return false; - } - - public function getWhitelist() - { - return $this->whitelist; - } - - public function save() - { - $this->plugin->areas[$this->name] = $this; - return true; - } - - public function delete() - { - unset($this->plugin->areas[$this->getName()]); - $this->plugin->saveAreas(); - return true; - } - -} From 8cf9f2f5db34483424a6c140f8ffe5b83fae608d Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 23 Jun 2017 23:22:51 -0400 Subject: [PATCH 33/78] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index ed9eed6..89d834d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,7 +1,7 @@ name: iProtector authors: ["LDX", "kenygamer"] version: v4.0#3.1b -main: LDX\iProtector\Main +main: kenygamer\iProtector\Main load: POSTWORLD api: 3.0.0 website: "https://github.com/kenygamer/iProtector" From 6ecb7aadd30d1fc5414b40dc4a4e6bdb29ffe683 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 09:37:08 -0400 Subject: [PATCH 34/78] Create LICENCE --- LICENCE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENCE diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/LICENCE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 35377f6144daa698c398ace69b6bd31a68890b35 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 09:39:22 -0400 Subject: [PATCH 35/78] Update Main.php --- src/kenygamer/iProtector/Main.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index ff6a5f1..b9c6794 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -1,5 +1,20 @@ + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. +*/ + namespace kenygamer\iProtector; use pocketmine\math\Vector3; From cd444a0681196e735b3cee643705c65b18c9208d Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 09:40:23 -0400 Subject: [PATCH 36/78] Update Area.php --- src/kenygamer/iProtector/Area.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/kenygamer/iProtector/Area.php b/src/kenygamer/iProtector/Area.php index 4a7e30c..8136ee1 100644 --- a/src/kenygamer/iProtector/Area.php +++ b/src/kenygamer/iProtector/Area.php @@ -1,5 +1,20 @@ + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. +*/ + namespace kenygamer\iProtector; use pocketmine\math\Vector3; From a583543fcf6f7fa8bd3f77ae6816d3f000b57beb Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 09:41:30 -0400 Subject: [PATCH 37/78] Even more specific --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0225927..b15a07d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This plugin will continue receiving updates and be open to *suggestions* from th - You can set custom messages for **each** event, and also disable the ones you want; place; break; touch and hurt. So what are you waiting for? -Check the **[installation tutorial](https://github.com/kenygamer/iProtector-v4.0/wiki)**. +Check the **[installation tutorial](https://github.com/kenygamer/iProtector-v4.0/wiki/Installation-tutorial)**. ## Command From a96268fe79068e28337c892ef2d7b39e3700e277 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 10:33:26 -0400 Subject: [PATCH 38/78] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 89d834d..fde622c 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: iProtector -authors: ["LDX", "kenygamer"] +authors: ["LDX, kenygamer"] version: v4.0#3.1b main: kenygamer\iProtector\Main load: POSTWORLD From e7cbce7ecdd9206247cd97a740b401661c0c7f86 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 10:37:00 -0400 Subject: [PATCH 39/78] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index fde622c..80aee25 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: iProtector -authors: ["LDX, kenygamer"] +author: ["LDX, kenygamer"] version: v4.0#3.1b main: kenygamer\iProtector\Main load: POSTWORLD From 0e2d9b568528e442f75dae0fed001b72a61fbe4a Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 10:37:21 -0400 Subject: [PATCH 40/78] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 80aee25..7d7810a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: iProtector -author: ["LDX, kenygamer"] +author: ["LDX", "kenygamer"] version: v4.0#3.1b main: kenygamer\iProtector\Main load: POSTWORLD From aa46d95f25bb17562f2adbff1fb2bfa5129ca099 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 13:55:55 -0400 Subject: [PATCH 41/78] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 7d7810a..4e3bf17 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: iProtector author: ["LDX", "kenygamer"] -version: v4.0#3.1b +version: v4.0.1#3.1b main: kenygamer\iProtector\Main load: POSTWORLD api: 3.0.0 From 70dddb1351b71f171a1481105279a20a83a1c8e9 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 13:58:41 -0400 Subject: [PATCH 42/78] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b15a07d..dd07148 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ This plugin will continue receiving updates and be open to *suggestions* from th ## What's new - You can enable and disable the plugin from the *config*. - You can choose whether enable or disable the area pretty saving feature. -- You can use a new flag! **TNT**. Protects against TNT and Creeper explosions. +- You can use a new flag! **TNT**. Protects against TNT and Creeper explosions? +- You can use a new command! **/area here**. It allows you to see what area you are standing on. - You can set custom messages for **each** event, and also disable the ones you want; place; break; touch and hurt. So what are you waiting for? @@ -17,5 +18,5 @@ Check the **[installation tutorial](https://github.com/kenygamer/iProtector-v4.0 ## Command ``` -/area +/area ``` From cf577e3cf7029b64003c9e18e046025b2448d927 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 13:58:59 -0400 Subject: [PATCH 43/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd07148..61ea599 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iProtector v4.0 +# iProtector v4.0.1 ## About **iProtector** is the original plugin that allows you to protect areas with different settings in each one. This *fork*, implementing support for the new *PocketMine-MP API 3.0.0*, provides new features to fully enjoy the artwork created by [*LDX-MCPE*](https://github.com/LDX-MCPE). From f9c2362a79173322c2b1a46c1703714ce7bf1e65 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 13:59:14 -0400 Subject: [PATCH 44/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 61ea599..dd07148 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iProtector v4.0.1 +# iProtector v4.0 ## About **iProtector** is the original plugin that allows you to protect areas with different settings in each one. This *fork*, implementing support for the new *PocketMine-MP API 3.0.0*, provides new features to fully enjoy the artwork created by [*LDX-MCPE*](https://github.com/LDX-MCPE). From 71f78172134e4170113257bcb1e867394d04c7dd Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 14:00:27 -0400 Subject: [PATCH 45/78] Update plugin.yml --- plugin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin.yml b/plugin.yml index 4e3bf17..ab0e9bf 100644 --- a/plugin.yml +++ b/plugin.yml @@ -35,6 +35,9 @@ permissions: iprotector.command.area.create: description: "Allows access to the iProtector create subcommand." default: op + iprotector.command.area.here: + description: "Allows access to the iProtector here subcommand." + default: op iprotector.command.area.list: description: "Allows access to the iProtector list subcommand." default: op From 7cd7c4ea5e41fb8009b1ae4537d49caef5e056c3 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 14:17:52 -0400 Subject: [PATCH 46/78] Not don. --- src/kenygamer/iProtector/Main.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index b9c6794..4e2124f 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -157,9 +157,20 @@ public function onCommand(CommandSender $p, Command $cmd, $label, array $args) $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; } break; + case "here": + if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.here") || $p->hasPermission("iprotector.command.area.here")) { + foreach($this->areas as $area) { + if($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { + $o = self::PREFIX . TextFormat::AQUA . "You are standing on area " . TextFormat::GREEN . $area["name"] . TextFormat::AQUA . "."; + $o = TextFormat::GRAY . "pos1:"; + $o = TextFormat::GOLD . "X: " . TextFormat::BLUE . $area["pos1"][0]; + $o = TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area["pos1"][1]; + $o = TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area["pos1"][2]; + } else { + $o = self::PREFIX . TextFormat::RED . " case "list": if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { - $o = self::PREFIX . PHP_EOL . TextFormat::AQUA . "Areas:"; + $o = self::PREFIX . TextFormat::AQUA . "Areas:"; foreach ($this->areas as $area) { $o = $o . " " . $area->getName() . ";"; } From 96127c48385550801c51f1e7b02715cd29724f5f Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 14:24:45 -0400 Subject: [PATCH 47/78] Added here subcmd (not tested) --- src/kenygamer/iProtector/Main.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index 4e2124f..7f08d3e 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -159,15 +159,28 @@ public function onCommand(CommandSender $p, Command $cmd, $label, array $args) break; case "here": if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.here") || $p->hasPermission("iprotector.command.area.here")) { + $contains = false; foreach($this->areas as $area) { if($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { + $contains = true; $o = self::PREFIX . TextFormat::AQUA . "You are standing on area " . TextFormat::GREEN . $area["name"] . TextFormat::AQUA . "."; $o = TextFormat::GRAY . "pos1:"; $o = TextFormat::GOLD . "X: " . TextFormat::BLUE . $area["pos1"][0]; $o = TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area["pos1"][1]; $o = TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area["pos1"][2]; - } else { - $o = self::PREFIX . TextFormat::RED . " + $o = TextFormat::GRAY . "pos2:"; + $o = TextFormat::GOLD . "X: " . TextFormat::BLUE . $area["pos2"][0]; + $o = TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area["pos2"][1]; + $o = TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area["pos2"][2]; + } + } + if($contains === false) { + $o = self::PREFIX . TextFormat::RED . "You are not standing in any area."; + } + } else { + $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; + } + break; case "list": if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { $o = self::PREFIX . TextFormat::AQUA . "Areas:"; From d746df9980a7a7feba8898e149a2650972d931cd Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 15:10:03 -0400 Subject: [PATCH 48/78] Never treat an object as an array - Using API functions to get areas info. - $o is not an array, so I had to put all the area info in one variable - Fixed /area here, now works and tested --- src/kenygamer/iProtector/Main.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index 7f08d3e..fe8b805 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -34,7 +34,7 @@ class Main extends PluginBase implements Listener { - const PREFIX = TextFormat::GREEN . "[" . TextFormat::YELLOW . "iProtector v4.0#3.1b" . ":kenygamer" . TextFormat::GREEN . "]" . TextFormat::RESET . " "; + const PREFIX = TextFormat::GREEN . "[" . "iProtector" . ":kenygamer" . "]" . TextFormat::RESET . " "; public function onEnable() { @@ -163,15 +163,7 @@ public function onCommand(CommandSender $p, Command $cmd, $label, array $args) foreach($this->areas as $area) { if($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { $contains = true; - $o = self::PREFIX . TextFormat::AQUA . "You are standing on area " . TextFormat::GREEN . $area["name"] . TextFormat::AQUA . "."; - $o = TextFormat::GRAY . "pos1:"; - $o = TextFormat::GOLD . "X: " . TextFormat::BLUE . $area["pos1"][0]; - $o = TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area["pos1"][1]; - $o = TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area["pos1"][2]; - $o = TextFormat::GRAY . "pos2:"; - $o = TextFormat::GOLD . "X: " . TextFormat::BLUE . $area["pos2"][0]; - $o = TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area["pos2"][1]; - $o = TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area["pos2"][2]; + $o = self::PREFIX . TextFormat::GREEN . "You are standing on area " . $area->getName() . "." . PHP_EOL . TextFormat::GRAY . "pos1:" . PHP_EOL . TextFormat::GOLD . "X: " . TextFormat::BLUE . $area->getPos1()[0] . PHP_EOL . TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area->getPos1()[1] . PHP_EOL . TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area->getPos1()[2] . PHP_EOL . TextFormat::GRAY . "pos2:" . PHP_EOL . TextFormat::GOLD . "X: " . TextFormat::BLUE . $area->getPos2()[0] . PHP_EOL . TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area->getPos2()[1] . PHP_EOL . TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area->getPos2()[2]; } } if($contains === false) { From 28bd9b95f01963d315b14bc5bb10bed26549c1eb Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 15:20:58 -0400 Subject: [PATCH 49/78] Update Main.php --- src/kenygamer/iProtector/Main.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index fe8b805..15bd1c8 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -40,6 +40,25 @@ public function onEnable() { $this->getServer()->getPluginManager()->registerEvents($this, $this); $this->getLogger()->info(TextFormat::GREEN . "Enabling " . $this->getDescription()->getFullName() . "..."); + $this->getServer()->getLogger()->info(PHP_EOL . " + ______ _ _ _ _ ___ + (_) __ \ | | | | | || | / _ \ + _| |__) |_ __ ___ | |_ ___ ___| |_ ___ _ __ __ __| || |_| | | | + | | ___/| '__/ _ \| __|/ _ \/ __| __|/ _ \| '__| \ \ / /|__ _| | | | + | | | | | | (_) | |_| __/ (__| |_| (_) | | \ V / | |_| |_| | + |_|_| |_| \___/ \__|\___|\___|\__|\___/|_| \_/ |_(_)\___/ + + + + _ _ __ _ _ + | | | |/ / (_) /\ | | + | |__ _ _ | ' / _____ ___ _ __ / \ _ __ __| |_ __ _____ _____ + | '_ \| | | | | < / _ \ \ / / | '_ \ / /\ \ | '_ \ / _` | '__/ _ \ \ /\ / / __| + | |_) | |_| | | . \ __/\ V /| | | | | / ____ \| | | | (_| | | | __/\ V V /\__ \ + |_.__/ \__, | |_|\_\___| \_/ |_|_| |_| /_/ \_\_| |_|\__,_|_| \___| \_/\_/ |___/ + __/ | + |___/ "); + if (!is_dir($this->getDataFolder())) { mkdir($this->getDataFolder()); } From 5613f339b02d76b815010fa54ce5e2166791f3e3 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 15:44:38 -0400 Subject: [PATCH 50/78] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index ab0e9bf..f31fd4a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -8,7 +8,7 @@ website: "https://github.com/kenygamer/iProtector" commands: area: description: "Allows you to manage areas." - usage: "/area " + usage: "/area " permission: iprotector.command.area permissions: iprotector: From 82ed92066aaa1cc907712937322eef3ac9f3108f Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 16:03:47 -0400 Subject: [PATCH 51/78] Fix: Plugin name appears as "iProtector vv4.0.1#3.1b", expecting "iProtector v4.0.1#3.1b, when calling $this->getDescription()->getFullName() --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index f31fd4a..9cffcd1 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: iProtector author: ["LDX", "kenygamer"] -version: v4.0.1#3.1b +version: 4.0.1#3.1b main: kenygamer\iProtector\Main load: POSTWORLD api: 3.0.0 From 5deb75f83481bf88cc078ebc47d7ae6a55aa8327 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 16:06:48 -0400 Subject: [PATCH 52/78] Added line break for whitelist of an area --- src/kenygamer/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index 15bd1c8..afd4195 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -275,7 +275,7 @@ public function onCommand(CommandSender $p, Command $cmd, $label, array $args) } break; case "list": - $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:"; + $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:" . PHP_EOL; foreach ($area->getWhitelist() as $w) { $o .= " $w;"; } From 463f4a53121496ce9b0f8bcf85b2bd6a9520b63b Mon Sep 17 00:00:00 2001 From: poggit-bot Date: Sat, 24 Jun 2017 19:57:44 -0400 Subject: [PATCH 53/78] Create .poggit.yml Poggit-CI is enabled for this repo by @kenygamer Visit the Poggit-CI page for this repo at https://poggit.pmmp.io/ci/kenygamer/iProtector-v4.0 From 0d990e288c034ac51cdb064193e2179c7890c52b Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 19:59:54 -0400 Subject: [PATCH 54/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd07148..fa956f8 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This plugin will continue receiving updates and be open to *suggestions* from th ## What's new - You can enable and disable the plugin from the *config*. - You can choose whether enable or disable the area pretty saving feature. -- You can use a new flag! **TNT**. Protects against TNT and Creeper explosions? +- You can use a new flag! **TNT**. Protects against TNT and Creeper explosions - You can use a new command! **/area here**. It allows you to see what area you are standing on. - You can set custom messages for **each** event, and also disable the ones you want; place; break; touch and hurt. From a04f5990c8887c184cc2b08a32dc56f16f0bd0b6 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 22:04:15 -0400 Subject: [PATCH 55/78] Added private property $c --- src/kenygamer/iProtector/Main.php | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index afd4195..e21b485 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -33,7 +33,7 @@ class Main extends PluginBase implements Listener { - + protected $c; const PREFIX = TextFormat::GREEN . "[" . "iProtector" . ":kenygamer" . "]" . TextFormat::RESET . " "; public function onEnable() @@ -76,21 +76,21 @@ public function onEnable() foreach ($data as $datum) { $area = new Area($datum["name"], $datum["flags"], $datum["pos1"], $datum["pos2"], $datum["level"], $datum["whitelist"], $this); } - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Settings"]["Enable"] === false) { + $this->c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($this->c["Settings"]["Enable"] === false) { $this->getPluginLoader()->disablePlugin($this); return true; - } elseif ($c["Settings"]["Enable"] !== true) { + } elseif ($this->c["Settings"]["Enable"] !== true) { $this->getPluginLoader()->disablePlugin($this); return true; } else { - $this->god = $c["Default"]["God"]; - $this->edit = $c["Default"]["Edit"]; - $this->tnt = $c["Default"]["TNT"]; - $this->touch = $c["Default"]["Touch"]; + $this->god = $this->c["Default"]["God"]; + $this->edit = $this->c["Default"]["Edit"]; + $this->tnt = $this->c["Default"]["TNT"]; + $this->touch = $this->c["Default"]["Touch"]; $this->levels = array(); - foreach ($c["Worlds"] as $level => $flags) { + foreach ($this->c["Worlds"] as $level => $flags) { $this->levels[$level] = $flags; } return true; @@ -318,9 +318,9 @@ public function onHurt(EntityDamageEvent $event) $p = $event->getEntity(); $x = false; if (!$this->canGetHurt($p)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Hurt"]["Enable"] === true) { - $p->sendMessage(str_replace('{player}', $p->getName(), $c["Messages"]["Hurt"]["Message"])); + //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($this->c["Messages"]["Hurt"]["Enable"] === true) { + $p->sendMessage(str_replace('{player}', $p->getName(), $this->c["Messages"]["Hurt"]["Message"])); } $event->setCancelled(); } @@ -344,9 +344,9 @@ public function onBlockBreak(BlockBreakEvent $event) $event->setCancelled(); } else { if (!$this->canEdit($p, $b)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Break"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Break"]["Message"])); + //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($this->c["Messages"]["Break"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $this->c["Messages"]["Break"]["Message"])); } $event->setCancelled(); } @@ -371,7 +371,7 @@ public function onBlockPlace(BlockPlaceEvent $event) } else { if (!$this->canEdit($p, $b)) { $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Place"]["Enable"] === true) { + if ($this->c["Messages"]["Place"]["Enable"] === true) { $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Place"]["Message"])); } $event->setCancelled(); @@ -384,9 +384,9 @@ public function onBlockTouch(PlayerInteractEvent $event) $b = $event->getBlock(); $p = $event->getPlayer(); if (!$this->canTouch($p, $b)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Messages"]["Touch"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Touch"]["Message"])); + //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($this->c["Messages"]["Touch"]["Enable"] === true) { + $p->sendMessage(str_replace('{block}', $b->getName(), $this->c["Messages"]["Touch"]["Message"])); } $event->setCancelled(); } @@ -416,11 +416,11 @@ public function saveAreas() "whitelist" => $area->getWhitelist() ); } - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($c["Settings"]["JPP"] === true) { + //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); + if ($this->c["Settings"]["JPP"] === true) { file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas, JSON_PRETTY_PRINT)); return; - } elseif ($c["Settings"]["JPP"] === false) { + } elseif ($this->c["Settings"]["JPP"] === false) { file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); return; } else { From fc390d61026e29340aff70c234f6a5841fa28efc Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 24 Jun 2017 23:21:50 -0400 Subject: [PATCH 56/78] Areas listing will have gold color now. --- src/kenygamer/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index e21b485..82bcd9c 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -194,7 +194,7 @@ public function onCommand(CommandSender $p, Command $cmd, $label, array $args) break; case "list": if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { - $o = self::PREFIX . TextFormat::AQUA . "Areas:"; + $o = self::PREFIX . TextFormat::AQUA . "Areas:" . TextFormat::GOLD; foreach ($this->areas as $area) { $o = $o . " " . $area->getName() . ";"; } From 8b093ed1ed8006703289d6e9450ea97ec3457a2e Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sun, 25 Jun 2017 15:27:39 -0400 Subject: [PATCH 57/78] Download from poggit.pmmp.io if non-API compatible --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 9cffcd1..ae23795 100644 --- a/plugin.yml +++ b/plugin.yml @@ -3,7 +3,7 @@ author: ["LDX", "kenygamer"] version: 4.0.1#3.1b main: kenygamer\iProtector\Main load: POSTWORLD -api: 3.0.0 +api: [3.0.0, 3.0.0-ALPHA1, 3.0.0-ALPHA2, 3.0.0-ALPHA3, 3.0.0-ALPHA4, 3.0.0-ALPHA5, 3.0.0-ALPHA6] website: "https://github.com/kenygamer/iProtector" commands: area: From 44c1ab90f2c06e003c12af474a98cab71bd170ef Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Fri, 7 Jul 2017 21:56:20 -0400 Subject: [PATCH 58/78] Update Main.php --- src/kenygamer/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index 82bcd9c..fb848fe 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -2,7 +2,7 @@ /* * iProtector-v4.0 plugin for PocketMine-MP - * Copyright (C) 2017 Kevin Andrews + * Copyright (C) 2014 LDX-MCPE * * 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 From b2bb10c0d6b83085ce596ac2576962724aca4c35 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 12 Jul 2017 16:10:27 -0400 Subject: [PATCH 59/78] Delete README.md --- README.md | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index fa956f8..0000000 --- a/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# iProtector v4.0 - -## About -**iProtector** is the original plugin that allows you to protect areas with different settings in each one. This *fork*, implementing support for the new *PocketMine-MP API 3.0.0*, provides new features to fully enjoy the artwork created by [*LDX-MCPE*](https://github.com/LDX-MCPE). - -This plugin will continue receiving updates and be open to *suggestions* from the public. - -## What's new -- You can enable and disable the plugin from the *config*. -- You can choose whether enable or disable the area pretty saving feature. -- You can use a new flag! **TNT**. Protects against TNT and Creeper explosions -- You can use a new command! **/area here**. It allows you to see what area you are standing on. -- You can set custom messages for **each** event, and also disable the ones you want; place; break; touch and hurt. - -So what are you waiting for? -Check the **[installation tutorial](https://github.com/kenygamer/iProtector-v4.0/wiki/Installation-tutorial)**. - -## Command - -``` -/area -``` From a63153be260b9bea66f7de23c6ba741b10dca1d1 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 12 Jul 2017 16:17:55 -0400 Subject: [PATCH 60/78] Create README --- README | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..1e2adee --- /dev/null +++ b/README @@ -0,0 +1,34 @@ + _ _____ _ _ _ _ ___ + (_) __ \ | | | | | || | / _ \ + _| |__) | __ ___ | |_ ___ ___| |_ ___ _ __ __ _| || |_| | | | + | | ___/ '__/ _ \| __/ _ \/ __| __/ _ \| '__| \ \ / /__ _| | | | + | | | | | | (_) | || __/ (__| || (_) | | \ V / | |_| |_| | + |_|_| |_| \___/ \__\___|\___|\__\___/|_| \_/ |_(_)\___/ + +______ ______ ______ ______ ______ ______ ______ ______ ______ ______ + +iProtector is a PocketMine-MP plugin that allows you to create areas to protect your spawn and warps from being griefed by your players. This version implements new features to enjoy more @LDX-MCPE's plugin. + +What's new: +- You can enable and disable the plugin from the config. +- You can choose whether enable or disable the area pretty saving feature. +- You can use a new flag! TNT. Protects against TNT and Creeper explosions +- You can use a new command! /area here. It allows you to see what area you are standing on. +- You can set custom messages for each event, and also disable the ones you want; place; break; touch and hurt. + +Installation: +For current iProtector users, you must delete the PHAR file of the plugins/ folder (it is not going to delete the areas, they are stored in the iProtector/ folder) and follow the same steps: + +To install this plugin on your server, be sure to follow these steps: + +[!] Since the releases zone does not guarantee the up-to-date plugin updates, and many of them may not be compatible with your server software due to the API version, use the download method for developers. + +1. Download the repository (using the Download button or cloning it with git clone). +2. Visit pmt.mcpe.fun, on the upper left side open the menu and tap on "Create phar". +3. Tap the clip icon next to "No zip file choosen..." and upload the previously downloaded ZIP file. +4. Tap the "Create phar" button. +5. After the PHAR file has been created, it should automatically download on your browser. +6. Upload the PHAR to the plugins/ folder on your server. +7. Restart the server. You're ready! + +Be sure to make monthly updates of the plugin by removing the PHAR file of the plugins/ folder and repeating the previous steps to stay up to date with the new features and bug fixes. From a2a3b4989d0e6ffe984b7dd6eb300538735242c1 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 12 Jul 2017 16:18:48 -0400 Subject: [PATCH 61/78] Update README --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 1e2adee..75b1372 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ iProtector is a PocketMine-MP plugin that allows you to create areas to protect What's new: - You can enable and disable the plugin from the config. - You can choose whether enable or disable the area pretty saving feature. -- You can use a new flag! TNT. Protects against TNT and Creeper explosions +- You can use a new flag! TNT. Protects against TNT and Creeper explosions. - You can use a new command! /area here. It allows you to see what area you are standing on. - You can set custom messages for each event, and also disable the ones you want; place; break; touch and hurt. From cb58293d11e1d5a3ff54a2fe8082bdaee90b6975 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Thu, 13 Jul 2017 15:33:56 -0400 Subject: [PATCH 62/78] Updated canExplode() method, documented --- src/kenygamer/iProtector/Main.php | 144 +++++++++++++++++++++++++++--- 1 file changed, 134 insertions(+), 10 deletions(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index fb848fe..f2e5777 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -33,9 +33,18 @@ class Main extends PluginBase implements Listener { + /** @var array */ protected $c; + /** Command prefix */ const PREFIX = TextFormat::GREEN . "[" . "iProtector" . ":kenygamer" . "]" . TextFormat::RESET . " "; + /** + * onEnable() + * + * Plugin enable + * + * @return void + */ public function onEnable() { $this->getServer()->getPluginManager()->registerEvents($this, $this); @@ -97,11 +106,30 @@ public function onEnable() } } + /** + * onDisable() + * + * Plugin disable + * + * @return void + */ public function onDisable() { $this->getLogger()->info(TextFormat::RED . "Disabling " . $this->getDescription()->getFullName() . "..."); } + /** + * onCommand() + * + * Plugin commands + * + * @param CommandSender $p + * @param Commmand $cmd + * @param string $label + * @param array $args + * + * @return bool + */ public function onCommand(CommandSender $p, Command $cmd, $label, array $args) { if (!($p instanceof Player)) { @@ -312,6 +340,15 @@ public function onCommand(CommandSender $p, Command $cmd, $label, array $args) return true; } + /** + * onHurt() + * + * EntityDamageEvent + * + * @param EntityDamageEvent $event + * + * @return void + */ public function onHurt(EntityDamageEvent $event) { if ($event->getEntity() instanceof Player) { @@ -327,6 +364,15 @@ public function onHurt(EntityDamageEvent $event) } } + /** + * onBlockBreak() + * + * BlockBreakEvent + * + * @param BlockBreakEvent $event + * + * @return void + */ public function onBlockBreak(BlockBreakEvent $event) { $b = $event->getBlock(); @@ -353,6 +399,15 @@ public function onBlockBreak(BlockBreakEvent $event) } } + /** + * onBlockPlace() + * + * BlockPlaceEvent + * + * @param BlockPlaceEvent $event + * + * @return void + */ public function onBlockPlace(BlockPlaceEvent $event) { $b = $event->getBlock(); @@ -379,6 +434,15 @@ public function onBlockPlace(BlockPlaceEvent $event) } } + /** + * onBlockTouch() + * + * PlayerInteractEvent + * + * @param PlayerInteractEvent $event + * + * @return void + */ public function onBlockTouch(PlayerInteractEvent $event) { $b = $event->getBlock(); @@ -392,17 +456,33 @@ public function onBlockTouch(PlayerInteractEvent $event) } } - /* Handles entity explode - * event (\pocketmine\event\entity\EntityExplodeEvent) - */ + /* Handles TNT flag */ + /** + * OnEntityExplode() + * + * EntityExplodeEvent + * + * @param EntityExplodeEvent $event + * + * @return void + */ public function onEntityExplode(EntityExplodeEvent $event) { - if (!$this->canExplode($event->getPosition()->getX(), $event->getPosition()->getY(), $event->getPosition()->getZ(), $event->getEntity(), $event->getEntity()->getLevel())) { + if (!$this->canExplode($event->getPosition(), $event->getEntity()->getLevel())) { $event->setCancelled(); } } + /** + * saveAreas() + * + * @api + * + * Saves plugin areas and any changes made previously + * + * @return void + */ public function saveAreas() { $areas = array(); @@ -419,16 +499,25 @@ public function saveAreas() //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); if ($this->c["Settings"]["JPP"] === true) { file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas, JSON_PRETTY_PRINT)); - return; - } elseif ($this->c["Settings"]["JPP"] === false) { + } elseif($this->c["Settings"]["JPP"] === false) { file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); - return; } else { file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); - return; } } + /** + * canEdit() + * + * @api + * + * Checks if player can edit the given position + * + * @param Player $p + * @param Block $t + * + * @return bool + */ public function canEdit($p, $t) { if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { @@ -457,6 +546,18 @@ public function canEdit($p, $t) return $o; } + /** + * canTouch() + * + * @api + * + * Checks if player can touch the given position + * + * @param Player $p + * @param Block $t + * + * @return bool + */ public function canTouch($p, $t) { if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { @@ -485,6 +586,17 @@ public function canTouch($p, $t) return $o; } + /** + * canGetHurt() + * + * @api + * + * Checks if player can get hurt on given position + * + * @param Player $p + * + * @return bool + */ public function canGetHurt($p) { $o = true; @@ -506,7 +618,19 @@ public function canGetHurt($p) return $o; } - public function canExplode($x, $y, $z, $p, $level) + /** + * canExplode() + * + * @api + * + * Checks if entity can explode on given position + * + * @param pocketmine\level\Position $pos + * @param pocketmine\level\Level $level + * + * @return bool + */ + public function canExplode($pos, $level) { $o = true; $g = (isset($this->levels[$level->getName()]) ? $this->levels[$level->getName()]["TNT"] : $this->tnt); @@ -514,7 +638,7 @@ public function canExplode($x, $y, $z, $p, $level) $o = false; } foreach ($this->areas as $area) { - if ($area->contains(new Vector3($x, $y, $z), $level->getName())) { + if ($area->contains(new Vector3($pos->getX(), $pos->getY(), $pos->getZ()), $level->getName())) { if ($area->getFlag("tnt")) { $o = false; break; From dbfaf2c7c4520b1312e47715a0f25bf2a083ccfa Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Thu, 13 Jul 2017 16:00:49 -0400 Subject: [PATCH 63/78] Documentation... --- src/kenygamer/iProtector/Area.php | 141 +++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Area.php b/src/kenygamer/iProtector/Area.php index 8136ee1..95a03b6 100644 --- a/src/kenygamer/iProtector/Area.php +++ b/src/kenygamer/iProtector/Area.php @@ -21,13 +21,19 @@ class Area { - + /** @var string */ private $name; + /** @var array */ public $flags; + /** @var Vector3 */ private $pos1; + /** @var Vector3 */ private $pos2; + /** @var Level */ private $level; + /** @var array */ private $whitelist; + /** @var Plugin */ private $plugin; public function __construct($name, $flags, $pos1, $pos2, $level, $whitelist, $plugin) @@ -42,11 +48,29 @@ public function __construct($name, $flags, $pos1, $pos2, $level, $whitelist, $pl $this->save(); } + /** + * getName() + * + * @api + * + * Returns area name + * + * @return string + */ public function getName() { return $this->name; } + /** + * getPos1() + * + * @api + * + * Returns area position 1 + * + * @return array + */ public function getPos1() { return array( @@ -56,6 +80,15 @@ public function getPos1() ); } + /** + * getPos2() + * + * @api + * + * Returns area position 2 + * + * @return srray + */ public function getPos2() { return array( @@ -65,11 +98,31 @@ public function getPos2() ); } + /** + * getFlags() + * + * @api + * + * Return area flags + * + * @return array + */ public function getFlags() { return $this->flags; } + /** + * getFlag() + * + * @api + * + * Checks if area flag is set + * + * @param string $flag + * + * @return bool + */ public function getFlag($flag) { if (isset($this->flags[$flag])) { @@ -78,6 +131,18 @@ public function getFlag($flag) return false; } + /** + * setFlag() + * + * @api + * + * Sets area flag value + * + * @param string $flag + * @param bool $value + * + * @return bool + */ public function setFlag($flag, $value) { if (isset($this->flags[$flag])) { @@ -88,6 +153,18 @@ public function setFlag($flag, $value) return false; } + /** + * contains() + * + * @api + * + * Checks if given position is inside area + * + * @param pocketmine\level\Position $pos + * @param pocketmine\level\Level $level + * + * @return bool + */ public function contains($pos, $level) { if ((min($this->pos1->getX(), $this->pos2->getX()) <= $pos->getX()) && (max($this->pos1->getX(), $this->pos2->getX()) >= $pos->getX()) && (min($this->pos1->getY(), $this->pos2->getY()) <= $pos->getY()) && (max($this->pos1->getY(), $this->pos2->getY()) >= $pos->getY()) && (min($this->pos1->getZ(), $this->pos2->getZ()) <= $pos->getZ()) && (max($this->pos1->getZ(), $this->pos2->getZ()) >= $pos->getZ()) && ($this->level == $level)) { @@ -96,6 +173,17 @@ public function contains($pos, $level) return false; } + /* + * toggleFlag() + * + * @api + * + * Modifies area flag value + * + * @param string $flag + * + * @return bool + */ public function toggleFlag($flag) { if (isset($this->flags[$flag])) { @@ -106,11 +194,23 @@ public function toggleFlag($flag) return false; } + /* Pending getLevel() documentation */ public function getLevel() { return $this->level; } + /** + * isWhitelisted() + * + * @api + * + * Checks if player is inside area whitelist + * + * @param string $n Player name + * + * @return bool + */ public function isWhitelisted($n) { if (in_array($n, $this->whitelist)) { @@ -119,6 +219,18 @@ public function isWhitelisted($n) return false; } + /** + * setWhitelisted() + * + * @api + * + * Adds a player into area whitelist + * + * @param string $n Player name + * @param bool $v Add or remove from whitelist + * + * @return bool + */ public function setWhitelisted($n, $v = true) { if ($v) { @@ -138,17 +250,44 @@ public function setWhitelisted($n, $v = true) return false; } + /** + * getWhitelist() + * + * @api + * + * Returns area whitelist + * + * @return array + */ public function getWhitelist() { return $this->whitelist; } + /** + * save() + * + * @api + * + * Saves an area + * + * @return bool + */ public function save() { $this->plugin->areas[$this->name] = $this; return true; } + /** + * delete() + * + * @api + * + * Deletes an area + * + * @return bool + */ public function delete() { unset($this->plugin->areas[$this->getName()]); From cf29786b729642304cc1ca1fa7ef1aa16deac911 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Thu, 13 Jul 2017 16:01:29 -0400 Subject: [PATCH 64/78] Small documentation start typo --- src/kenygamer/iProtector/Area.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Area.php b/src/kenygamer/iProtector/Area.php index 95a03b6..9933698 100644 --- a/src/kenygamer/iProtector/Area.php +++ b/src/kenygamer/iProtector/Area.php @@ -173,7 +173,7 @@ public function contains($pos, $level) return false; } - /* + /** * toggleFlag() * * @api From d19b165466dfe0ce55dfac61dd4ffe6d4be65769 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Mon, 24 Jul 2017 21:33:35 -0400 Subject: [PATCH 65/78] Implement API 3.0.0-ALPHA7 support --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index ae23795..314dfb5 100644 --- a/plugin.yml +++ b/plugin.yml @@ -3,7 +3,7 @@ author: ["LDX", "kenygamer"] version: 4.0.1#3.1b main: kenygamer\iProtector\Main load: POSTWORLD -api: [3.0.0, 3.0.0-ALPHA1, 3.0.0-ALPHA2, 3.0.0-ALPHA3, 3.0.0-ALPHA4, 3.0.0-ALPHA5, 3.0.0-ALPHA6] +api: [3.0.0, 3.0.0-ALPHA1, 3.0.0-ALPHA2, 3.0.0-ALPHA3, 3.0.0-ALPHA4, 3.0.0-ALPHA5, 3.0.0-ALPHA6, 3.0.0-ALPHA7] website: "https://github.com/kenygamer/iProtector" commands: area: From 51e0e72f6efe2cfc4b9c946b506219f093a598c7 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Mon, 24 Jul 2017 21:34:02 -0400 Subject: [PATCH 66/78] Implement API 3.0.0-ALPHA7 support --- src/kenygamer/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index f2e5777..f4a675e 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -130,7 +130,7 @@ public function onDisable() * * @return bool */ - public function onCommand(CommandSender $p, Command $cmd, $label, array $args) + public function onCommand(CommandSender $p, Command $cmd, string $label, array $args) { if (!($p instanceof Player)) { $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); From d07bed601dada50a87f45a56dce95513e9c956ba Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sun, 30 Jul 2017 19:39:35 -0400 Subject: [PATCH 67/78] Alpha7 fix --- src/kenygamer/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index f4a675e..f64cdb2 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -130,7 +130,7 @@ public function onDisable() * * @return bool */ - public function onCommand(CommandSender $p, Command $cmd, string $label, array $args) + public function onCommand(CommandSender $p, Command $cmd, string $label, array $args): bool { if (!($p instanceof Player)) { $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); From 8dd729a82af37af7d2c0e68b070258e164ea5e30 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 12 Aug 2017 10:01:49 -0400 Subject: [PATCH 68/78] Possible fix for #1 --- src/kenygamer/iProtector/Main.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index f64cdb2..3250f5f 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -18,9 +18,7 @@ namespace kenygamer\iProtector; use pocketmine\math\Vector3; -use pocketmine\command\Command; -use pocketmine\command\CommandExecutor; -use pocketmine\command\CommandSender; +use pocketmine\command\{Command, CommandSender, CommandExecutor}; use pocketmine\event\Listener; use pocketmine\Player; use pocketmine\plugin\PluginBase; @@ -130,8 +128,7 @@ public function onDisable() * * @return bool */ - public function onCommand(CommandSender $p, Command $cmd, string $label, array $args): bool - { + public function onCommand(CommandSender $p, Command $cmd, string $label, array $args) : bool{ if (!($p instanceof Player)) { $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); return true; From a88847bf7afafd4c0481292e047e9b9822191d57 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 12 Aug 2017 15:16:06 -0400 Subject: [PATCH 69/78] Possible fix #1 --- src/kenygamer/iProtector/Main.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index 3250f5f..f2f6104 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -128,7 +128,8 @@ public function onDisable() * * @return bool */ - public function onCommand(CommandSender $p, Command $cmd, string $label, array $args) : bool{ + public function onCommand(CommandSender $sender, Command $cmd, string $commandLabel, array $args){ + $p = $sender; if (!($p instanceof Player)) { $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); return true; From 0fd90d34e7d8d4344520f06b312b112cabfa43a2 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sat, 12 Aug 2017 19:49:09 -0400 Subject: [PATCH 70/78] Fix. --- src/kenygamer/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index f2f6104..c175c27 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -128,7 +128,7 @@ public function onDisable() * * @return bool */ - public function onCommand(CommandSender $sender, Command $cmd, string $commandLabel, array $args){ + public function onCommand(CommandSender $sender, Command $cmd, $label, array $args){ $p = $sender; if (!($p instanceof Player)) { $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); From 48d4d107c99adb7847ebbb32fa380f704f2e58bc Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Sun, 13 Aug 2017 21:17:30 -0300 Subject: [PATCH 71/78] Mm --- src/kenygamer/iProtector/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php index c175c27..a9c7b4b 100644 --- a/src/kenygamer/iProtector/Main.php +++ b/src/kenygamer/iProtector/Main.php @@ -128,7 +128,7 @@ public function onDisable() * * @return bool */ - public function onCommand(CommandSender $sender, Command $cmd, $label, array $args){ + public function onCommand(CommandSender $sender, Command $cmd, string $label, array $args) : bool{ $p = $sender; if (!($p instanceof Player)) { $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); From 3eb547eb6e370c5fed3b33947355a5e9458d9750 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Mon, 4 Sep 2017 16:36:53 -0300 Subject: [PATCH 72/78] Delete README --- README | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index 75b1372..0000000 --- a/README +++ /dev/null @@ -1,34 +0,0 @@ - _ _____ _ _ _ _ ___ - (_) __ \ | | | | | || | / _ \ - _| |__) | __ ___ | |_ ___ ___| |_ ___ _ __ __ _| || |_| | | | - | | ___/ '__/ _ \| __/ _ \/ __| __/ _ \| '__| \ \ / /__ _| | | | - | | | | | | (_) | || __/ (__| || (_) | | \ V / | |_| |_| | - |_|_| |_| \___/ \__\___|\___|\__\___/|_| \_/ |_(_)\___/ - -______ ______ ______ ______ ______ ______ ______ ______ ______ ______ - -iProtector is a PocketMine-MP plugin that allows you to create areas to protect your spawn and warps from being griefed by your players. This version implements new features to enjoy more @LDX-MCPE's plugin. - -What's new: -- You can enable and disable the plugin from the config. -- You can choose whether enable or disable the area pretty saving feature. -- You can use a new flag! TNT. Protects against TNT and Creeper explosions. -- You can use a new command! /area here. It allows you to see what area you are standing on. -- You can set custom messages for each event, and also disable the ones you want; place; break; touch and hurt. - -Installation: -For current iProtector users, you must delete the PHAR file of the plugins/ folder (it is not going to delete the areas, they are stored in the iProtector/ folder) and follow the same steps: - -To install this plugin on your server, be sure to follow these steps: - -[!] Since the releases zone does not guarantee the up-to-date plugin updates, and many of them may not be compatible with your server software due to the API version, use the download method for developers. - -1. Download the repository (using the Download button or cloning it with git clone). -2. Visit pmt.mcpe.fun, on the upper left side open the menu and tap on "Create phar". -3. Tap the clip icon next to "No zip file choosen..." and upload the previously downloaded ZIP file. -4. Tap the "Create phar" button. -5. After the PHAR file has been created, it should automatically download on your browser. -6. Upload the PHAR to the plugins/ folder on your server. -7. Restart the server. You're ready! - -Be sure to make monthly updates of the plugin by removing the PHAR file of the plugins/ folder and repeating the previous steps to stay up to date with the new features and bug fixes. From 4f1697b6fe03a10db9a990ef1670fb15c9ac2928 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Mon, 4 Sep 2017 16:38:34 -0300 Subject: [PATCH 73/78] Create README.md --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..a4f1e4c --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# We’ve moved! Head over to [here](https://github.com/kenygamer/pmmp-plugins) to get some goodies! From 6b5bb66f6ce885ff7dd71f4714d33ec330f46b3e Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 6 Sep 2017 15:35:08 -0300 Subject: [PATCH 74/78] Delete plugin.yml --- plugin.yml | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 plugin.yml diff --git a/plugin.yml b/plugin.yml deleted file mode 100644 index 314dfb5..0000000 --- a/plugin.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: iProtector -author: ["LDX", "kenygamer"] -version: 4.0.1#3.1b -main: kenygamer\iProtector\Main -load: POSTWORLD -api: [3.0.0, 3.0.0-ALPHA1, 3.0.0-ALPHA2, 3.0.0-ALPHA3, 3.0.0-ALPHA4, 3.0.0-ALPHA5, 3.0.0-ALPHA6, 3.0.0-ALPHA7] -website: "https://github.com/kenygamer/iProtector" -commands: - area: - description: "Allows you to manage areas." - usage: "/area " - permission: iprotector.command.area -permissions: - iprotector: - description: "Allows access to all iProtector features." - default: false - children: - iprotector.access: - description: "Allows access to editing terrain in iProtector areas." - default: op - iprotector.command: - description: "Allows access to all iProtector commands." - default: false - children: - iprotector.command.area: - description: "Allows access to the area command." - default: op - children: - iprotector.command.area.pos1: - description: "Allows access to the iProtector pos1 subcommand." - default: op - iprotector.command.area.pos2: - description: "Allows access to the iProtector pos2 subcommand." - default: op - iprotector.command.area.create: - description: "Allows access to the iProtector create subcommand." - default: op - iprotector.command.area.here: - description: "Allows access to the iProtector here subcommand." - default: op - iprotector.command.area.list: - description: "Allows access to the iProtector list subcommand." - default: op - iprotector.command.area.flag: - description: "Allows access to the iProtector flag subcommand." - default: op - iprotector.command.area.delete: - description: "Allows access to the iProtector delete subcommand." - default: op - iprotector.command.area.whitelist: - description: "Allows access to the iProtector whitelist subcommand." - default: op From 0e3773eac07f48f6dd21054e3be450351bd9e819 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 6 Sep 2017 15:35:19 -0300 Subject: [PATCH 75/78] Delete .poggit.yml --- .poggit.yml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .poggit.yml diff --git a/.poggit.yml b/.poggit.yml deleted file mode 100644 index 4356f0b..0000000 --- a/.poggit.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- # Poggit-CI Manifest. Open the CI at https://poggit.pmmp.io/ci/LDX-MCPE/iProtector -branches: -- master -projects: - iProtector: - path: "" -... From 63434f706f78266254eebd1b223b886d738db512 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 6 Sep 2017 15:35:27 -0300 Subject: [PATCH 76/78] Delete config.yml --- resources/config.yml | 67 -------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 resources/config.yml diff --git a/resources/config.yml b/resources/config.yml deleted file mode 100644 index ae565fd..0000000 --- a/resources/config.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Config file for iProtector v4.0 by Kevin Andrews; -# Forked from the original LDX-MCPE/iProtector repository, implementing new features -# and PocketMine-MP API 3.0.0 compatibility - -# Settings -Settings: - - # Choose whether enable or disable this plugin - Enable: true - - # Choose whether enable or disable the JSON pretty print area saving setting - JPP: true - -# Messages for protected areas: -Messages: - - # No permission to place that block - Place: - Enable: true - Message: 'You do not have permission to place your {block}!' - - # No permission to break that block - Break: - Enable: true - Message: 'You do not have permission to break my {block}!' - - # No permission to touch that block or activate things like chests - Touch: - Enable: false - Message: 'You do not have permission to touch my {block}!' - - # No permission to hurt other players - Hurt: - Enable: false - Message: 'You do not have permission to hurt {player}!' - -# Settings for unprotected areas in worlds without specific settings: -Default: - - # Keep players from getting hurt? - God: false - - # Keep players from editing the world? - Edit: false - - # Protect against TNT and Creeper explosions? - TNT: false - - # Keep players from touching blocks and activating things like chests? - Touch: false - -# Settings for unprotected areas in individual worlds: -Worlds: - - DEFAULT: - - # Keep players from getting hurt? - God: false - - # Keep players from editing the world? - Edit: false - - # Protect against TNT and Creeper explosions? - TNT: false - - # Keep players from touching blocks and activating things like chests? - Touch: false From 3bb453926e5fb09888216e89e7707683afd474f9 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 6 Sep 2017 15:35:36 -0300 Subject: [PATCH 77/78] Delete Area.php --- src/kenygamer/iProtector/Area.php | 298 ------------------------------ 1 file changed, 298 deletions(-) delete mode 100644 src/kenygamer/iProtector/Area.php diff --git a/src/kenygamer/iProtector/Area.php b/src/kenygamer/iProtector/Area.php deleted file mode 100644 index 9933698..0000000 --- a/src/kenygamer/iProtector/Area.php +++ /dev/null @@ -1,298 +0,0 @@ - - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. -*/ - -namespace kenygamer\iProtector; - -use pocketmine\math\Vector3; - -class Area -{ - /** @var string */ - private $name; - /** @var array */ - public $flags; - /** @var Vector3 */ - private $pos1; - /** @var Vector3 */ - private $pos2; - /** @var Level */ - private $level; - /** @var array */ - private $whitelist; - /** @var Plugin */ - private $plugin; - - public function __construct($name, $flags, $pos1, $pos2, $level, $whitelist, $plugin) - { - $this->name = strtolower($name); - $this->flags = $flags; - $this->pos1 = new Vector3($pos1[0], $pos1[1], $pos1[2]); - $this->pos2 = new Vector3($pos2[0], $pos2[1], $pos2[2]); - $this->level = $level; - $this->whitelist = $whitelist; - $this->plugin = $plugin; - $this->save(); - } - - /** - * getName() - * - * @api - * - * Returns area name - * - * @return string - */ - public function getName() - { - return $this->name; - } - - /** - * getPos1() - * - * @api - * - * Returns area position 1 - * - * @return array - */ - public function getPos1() - { - return array( - $this->pos1->getX(), - $this->pos1->getY(), - $this->pos1->getZ() - ); - } - - /** - * getPos2() - * - * @api - * - * Returns area position 2 - * - * @return srray - */ - public function getPos2() - { - return array( - $this->pos2->getX(), - $this->pos2->getY(), - $this->pos2->getZ() - ); - } - - /** - * getFlags() - * - * @api - * - * Return area flags - * - * @return array - */ - public function getFlags() - { - return $this->flags; - } - - /** - * getFlag() - * - * @api - * - * Checks if area flag is set - * - * @param string $flag - * - * @return bool - */ - public function getFlag($flag) - { - if (isset($this->flags[$flag])) { - return $this->flags[$flag]; - } - return false; - } - - /** - * setFlag() - * - * @api - * - * Sets area flag value - * - * @param string $flag - * @param bool $value - * - * @return bool - */ - public function setFlag($flag, $value) - { - if (isset($this->flags[$flag])) { - $this->flags[$flag] = $value; - $this->plugin->saveAreas(); - return true; - } - return false; - } - - /** - * contains() - * - * @api - * - * Checks if given position is inside area - * - * @param pocketmine\level\Position $pos - * @param pocketmine\level\Level $level - * - * @return bool - */ - public function contains($pos, $level) - { - if ((min($this->pos1->getX(), $this->pos2->getX()) <= $pos->getX()) && (max($this->pos1->getX(), $this->pos2->getX()) >= $pos->getX()) && (min($this->pos1->getY(), $this->pos2->getY()) <= $pos->getY()) && (max($this->pos1->getY(), $this->pos2->getY()) >= $pos->getY()) && (min($this->pos1->getZ(), $this->pos2->getZ()) <= $pos->getZ()) && (max($this->pos1->getZ(), $this->pos2->getZ()) >= $pos->getZ()) && ($this->level == $level)) { - return true; - } - return false; - } - - /** - * toggleFlag() - * - * @api - * - * Modifies area flag value - * - * @param string $flag - * - * @return bool - */ - public function toggleFlag($flag) - { - if (isset($this->flags[$flag])) { - $this->flags[$flag] = !$this->flags[$flag]; - $this->plugin->saveAreas(); - return $this->flags[$flag]; - } - return false; - } - - /* Pending getLevel() documentation */ - public function getLevel() - { - return $this->level; - } - - /** - * isWhitelisted() - * - * @api - * - * Checks if player is inside area whitelist - * - * @param string $n Player name - * - * @return bool - */ - public function isWhitelisted($n) - { - if (in_array($n, $this->whitelist)) { - return true; - } - return false; - } - - /** - * setWhitelisted() - * - * @api - * - * Adds a player into area whitelist - * - * @param string $n Player name - * @param bool $v Add or remove from whitelist - * - * @return bool - */ - public function setWhitelisted($n, $v = true) - { - if ($v) { - if (!in_array($n, $this->whitelist)) { - array_push($this->whitelist, $n); - $this->plugin->saveAreas(); - return true; - } - } else { - if (in_array($n, $this->whitelist)) { - $key = array_search($n, $this->whitelist); - array_splice($this->whitelist, $key, 1); - $this->plugin->saveAreas(); - return true; - } - } - return false; - } - - /** - * getWhitelist() - * - * @api - * - * Returns area whitelist - * - * @return array - */ - public function getWhitelist() - { - return $this->whitelist; - } - - /** - * save() - * - * @api - * - * Saves an area - * - * @return bool - */ - public function save() - { - $this->plugin->areas[$this->name] = $this; - return true; - } - - /** - * delete() - * - * @api - * - * Deletes an area - * - * @return bool - */ - public function delete() - { - unset($this->plugin->areas[$this->getName()]); - $this->plugin->saveAreas(); - return true; - } - -} From 80a9f8f9d1707246516bb8163ca8eee46935b694 Mon Sep 17 00:00:00 2001 From: Kevin Andrews Date: Wed, 6 Sep 2017 15:35:45 -0300 Subject: [PATCH 78/78] Delete Main.php --- src/kenygamer/iProtector/Main.php | 653 ------------------------------ 1 file changed, 653 deletions(-) delete mode 100644 src/kenygamer/iProtector/Main.php diff --git a/src/kenygamer/iProtector/Main.php b/src/kenygamer/iProtector/Main.php deleted file mode 100644 index a9c7b4b..0000000 --- a/src/kenygamer/iProtector/Main.php +++ /dev/null @@ -1,653 +0,0 @@ - - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. -*/ - -namespace kenygamer\iProtector; - -use pocketmine\math\Vector3; -use pocketmine\command\{Command, CommandSender, CommandExecutor}; -use pocketmine\event\Listener; -use pocketmine\Player; -use pocketmine\plugin\PluginBase; -use pocketmine\utils\TextFormat; -use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\event\entity\EntityExplodeEvent; -use pocketmine\event\player\PlayerInteractEvent; -use pocketmine\event\block\BlockPlaceEvent; -use pocketmine\event\block\BlockBreakEvent; - -class Main extends PluginBase implements Listener -{ - /** @var array */ - protected $c; - /** Command prefix */ - const PREFIX = TextFormat::GREEN . "[" . "iProtector" . ":kenygamer" . "]" . TextFormat::RESET . " "; - - /** - * onEnable() - * - * Plugin enable - * - * @return void - */ - public function onEnable() - { - $this->getServer()->getPluginManager()->registerEvents($this, $this); - $this->getLogger()->info(TextFormat::GREEN . "Enabling " . $this->getDescription()->getFullName() . "..."); - $this->getServer()->getLogger()->info(PHP_EOL . " - ______ _ _ _ _ ___ - (_) __ \ | | | | | || | / _ \ - _| |__) |_ __ ___ | |_ ___ ___| |_ ___ _ __ __ __| || |_| | | | - | | ___/| '__/ _ \| __|/ _ \/ __| __|/ _ \| '__| \ \ / /|__ _| | | | - | | | | | | (_) | |_| __/ (__| |_| (_) | | \ V / | |_| |_| | - |_|_| |_| \___/ \__|\___|\___|\__|\___/|_| \_/ |_(_)\___/ - - - - _ _ __ _ _ - | | | |/ / (_) /\ | | - | |__ _ _ | ' / _____ ___ _ __ / \ _ __ __| |_ __ _____ _____ - | '_ \| | | | | < / _ \ \ / / | '_ \ / /\ \ | '_ \ / _` | '__/ _ \ \ /\ / / __| - | |_) | |_| | | . \ __/\ V /| | | | | / ____ \| | | | (_| | | | __/\ V V /\__ \ - |_.__/ \__, | |_|\_\___| \_/ |_|_| |_| /_/ \_\_| |_|\__,_|_| \___| \_/\_/ |___/ - __/ | - |___/ "); - - if (!is_dir($this->getDataFolder())) { - mkdir($this->getDataFolder()); - } - if (!file_exists($this->getDataFolder() . "areas.json")) { - file_put_contents($this->getDataFolder() . "areas.json", "[]"); - } - if (!file_exists($this->getDataFolder() . "config.yml")) { - $c = $this->getResource("config.yml"); - $o = stream_get_contents($c); - fclose($c); - file_put_contents($this->getDataFolder() . "config.yml", str_replace("DEFAULT", $this->getServer()->getDefaultLevel()->getName(), $o)); - } - $this->areas = array(); - $data = json_decode(file_get_contents($this->getDataFolder() . "areas.json"), true); - foreach ($data as $datum) { - $area = new Area($datum["name"], $datum["flags"], $datum["pos1"], $datum["pos2"], $datum["level"], $datum["whitelist"], $this); - } - $this->c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($this->c["Settings"]["Enable"] === false) { - $this->getPluginLoader()->disablePlugin($this); - return true; - } elseif ($this->c["Settings"]["Enable"] !== true) { - $this->getPluginLoader()->disablePlugin($this); - return true; - } else { - - $this->god = $this->c["Default"]["God"]; - $this->edit = $this->c["Default"]["Edit"]; - $this->tnt = $this->c["Default"]["TNT"]; - $this->touch = $this->c["Default"]["Touch"]; - $this->levels = array(); - foreach ($this->c["Worlds"] as $level => $flags) { - $this->levels[$level] = $flags; - } - return true; - } - } - - /** - * onDisable() - * - * Plugin disable - * - * @return void - */ - public function onDisable() - { - $this->getLogger()->info(TextFormat::RED . "Disabling " . $this->getDescription()->getFullName() . "..."); - } - - /** - * onCommand() - * - * Plugin commands - * - * @param CommandSender $p - * @param Commmand $cmd - * @param string $label - * @param array $args - * - * @return bool - */ - public function onCommand(CommandSender $sender, Command $cmd, string $label, array $args) : bool{ - $p = $sender; - if (!($p instanceof Player)) { - $p->sendMessage(self::PREFIX . TextFormat::RED . "Command must be used in-game."); - return true; - } - if (!isset($args[0])) { - return false; - } - $n = strtolower($p->getName()); - $action = strtolower($args[0]); - switch ($action) { - case "pos1": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos1")) { - if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; - } else { - $this->sel1[$n] = true; - $o = self::PREFIX . TextFormat::AQUA . "Please place or break the first position."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "pos2": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.pos2")) { - if (isset($this->sel1[$n]) || isset($this->sel2[$n])) { - $o = self::PREFIX . TextFormat::RED . "You're already selecting a position!"; - } else { - $this->sel2[$n] = true; - $o = self::PREFIX . TextFormat::AQUA . "Please place or break the second position."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "create": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.create")) { - if (isset($args[1])) { - if (isset($this->pos1[$n]) && isset($this->pos2[$n])) { - if (!isset($this->areas[strtolower($args[1])])) { - $area = new Area(strtolower($args[1]), array( - "edit" => true, - "god" => false, - "tnt" => false, - "touch" => true - ), array( - $this->pos1[$n]->getX(), - $this->pos1[$n]->getY(), - $this->pos1[$n]->getZ() - ), array( - $this->pos2[$n]->getX(), - $this->pos2[$n]->getY(), - $this->pos2[$n]->getZ() - ), $p->getLevel()->getName(), array( - $n - ), $this); - $this->saveAreas(); - unset($this->pos1[$n]); - unset($this->pos2[$n]); - $o = self::PREFIX . TextFormat::GREEN . "Area created!"; - } else { - $o = self::PREFIX . TextFormat::RED . "An area with that name already exists."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please select both positions first."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify a name for this area."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "here": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.here") || $p->hasPermission("iprotector.command.area.here")) { - $contains = false; - foreach($this->areas as $area) { - if($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { - $contains = true; - $o = self::PREFIX . TextFormat::GREEN . "You are standing on area " . $area->getName() . "." . PHP_EOL . TextFormat::GRAY . "pos1:" . PHP_EOL . TextFormat::GOLD . "X: " . TextFormat::BLUE . $area->getPos1()[0] . PHP_EOL . TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area->getPos1()[1] . PHP_EOL . TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area->getPos1()[2] . PHP_EOL . TextFormat::GRAY . "pos2:" . PHP_EOL . TextFormat::GOLD . "X: " . TextFormat::BLUE . $area->getPos2()[0] . PHP_EOL . TextFormat::GOLD . "Y: " . TextFormat::BLUE . $area->getPos2()[1] . PHP_EOL . TextFormat::GOLD . "Z: " . TextFormat::BLUE . $area->getPos2()[2]; - } - } - if($contains === false) { - $o = self::PREFIX . TextFormat::RED . "You are not standing in any area."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "list": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.list")) { - $o = self::PREFIX . TextFormat::AQUA . "Areas:" . TextFormat::GOLD; - foreach ($this->areas as $area) { - $o = $o . " " . $area->getName() . ";"; - } - } - break; - case "flag": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.flag")) { - if (isset($args[1])) { - if (isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - if (isset($args[2])) { - if (isset($area->flags[strtolower($args[2])])) { - $flag = strtolower($args[2]); - if (isset($args[3])) { - $mode = strtolower($args[3]); - if ($mode == "true" || $mode == "on") { - $mode = true; - } else { - $mode = false; - } - $area->setFlag($flag, $mode); - } else { - $area->toggleFlag($flag); - } - if ($area->getFlag($flag)) { - $status = "on"; - } else { - $status = "off"; - } - $o = self::PREFIX . TextFormat::GREEN . "Flag " . $flag . " set to " . $status . " for area " . $area->getName() . "!"; - } else { - $o = self::PREFIX . TextFormat::RED . "Flag not found. (Flags: edit, god, tnt, touch)"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify a flag. (Flags: edit, god, tnt, touch)"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Area doesn't exist."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify the area you would like to flag."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "delete": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { - if (isset($args[1])) { - if (isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - $area->delete(); - $o = self::PREFIX . TextFormat::GREEN . "Area deleted!"; - } else { - $o = self::PREFIX . TextFormat::RED . "Area does not exist."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify an area to delete."; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - case "whitelist": - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.command") || $p->hasPermission("iprotector.command.area") || $p->hasPermission("iprotector.command.area.delete")) { - if (isset($args[1]) && isset($this->areas[strtolower($args[1])])) { - $area = $this->areas[strtolower($args[1])]; - if (isset($args[2])) { - $action = strtolower($args[2]); - switch ($action) { - case "add": - $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); - if (!$area->isWhitelisted($w)) { - $area->setWhitelisted($w); - $o = self::PREFIX . TextFormat::GREEN . "Player $w has been whitelisted in area " . $area->getName() . "."; - } else { - $o = self::PREFIX . TextFormat::RED . "Player $w is already whitelisted in area " . $area->getName() . "."; - } - break; - case "list": - $o = self::PREFIX . TextFormat::AQUA . $area->getName() . "'s whitelist:" . PHP_EOL; - foreach ($area->getWhitelist() as $w) { - $o .= " $w;"; - } - break; - case "delete": - case "remove": - $w = ($this->getServer()->getPlayer($args[3]) instanceof Player ? strtolower($this->getServer()->getPlayer($args[3])->getName()) : strtolower($args[3])); - if ($area->isWhitelisted($w)) { - $area->setWhitelisted($w, false); - $o = self::PREFIX . TextFormat::GREEN . "Player $w has been unwhitelisted in area " . $area->getName() . "."; - } else { - $o = self::PREFIX . TextFormat::RED . "$w is already unwhitelisted in area " . $area->getName() . "."; - } - break; - default: - $o = self::PREFIX . TextFormat::RED . "Please specify a valid action. Usage: /area whitelist " . $area->getName() . " [player]"; - break; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Please specify an action. Usage: /area whitelist " . $area->getName() . " [player]"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "Area doesn't exist. Usage: /area whitelist [player]"; - } - } else { - $o = self::PREFIX . TextFormat::RED . "You do not have permission to use this subcommand."; - } - break; - default: - return false; - break; - } - $p->sendMessage($o); - return true; - } - - /** - * onHurt() - * - * EntityDamageEvent - * - * @param EntityDamageEvent $event - * - * @return void - */ - public function onHurt(EntityDamageEvent $event) - { - if ($event->getEntity() instanceof Player) { - $p = $event->getEntity(); - $x = false; - if (!$this->canGetHurt($p)) { - //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($this->c["Messages"]["Hurt"]["Enable"] === true) { - $p->sendMessage(str_replace('{player}', $p->getName(), $this->c["Messages"]["Hurt"]["Message"])); - } - $event->setCancelled(); - } - } - } - - /** - * onBlockBreak() - * - * BlockBreakEvent - * - * @param BlockBreakEvent $event - * - * @return void - */ - public function onBlockBreak(BlockBreakEvent $event) - { - $b = $event->getBlock(); - $p = $event->getPlayer(); - $n = strtolower($p->getName()); - if (isset($this->sel1[$n])) { - unset($this->sel1[$n]); - $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); - $event->setCancelled(); - } else if (isset($this->sel2[$n])) { - unset($this->sel2[$n]); - $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); - $event->setCancelled(); - } else { - if (!$this->canEdit($p, $b)) { - //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($this->c["Messages"]["Break"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $this->c["Messages"]["Break"]["Message"])); - } - $event->setCancelled(); - } - } - } - - /** - * onBlockPlace() - * - * BlockPlaceEvent - * - * @param BlockPlaceEvent $event - * - * @return void - */ - public function onBlockPlace(BlockPlaceEvent $event) - { - $b = $event->getBlock(); - $p = $event->getPlayer(); - $n = strtolower($p->getName()); - if (isset($this->sel1[$n])) { - unset($this->sel1[$n]); - $this->pos1[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 1 set to: (" . $this->pos1[$n]->getX() . ", " . $this->pos1[$n]->getY() . ", " . $this->pos1[$n]->getZ() . ")"); - $event->setCancelled(); - } else if (isset($this->sel2[$n])) { - unset($this->sel2[$n]); - $this->pos2[$n] = new Vector3($b->getX(), $b->getY(), $b->getZ()); - $p->sendMessage(self::PREFIX . TextFormat::GREEN . "Position 2 set to: (" . $this->pos2[$n]->getX() . ", " . $this->pos2[$n]->getY() . ", " . $this->pos2[$n]->getZ() . ")"); - $event->setCancelled(); - } else { - if (!$this->canEdit($p, $b)) { - $c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($this->c["Messages"]["Place"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $c["Messages"]["Place"]["Message"])); - } - $event->setCancelled(); - } - } - } - - /** - * onBlockTouch() - * - * PlayerInteractEvent - * - * @param PlayerInteractEvent $event - * - * @return void - */ - public function onBlockTouch(PlayerInteractEvent $event) - { - $b = $event->getBlock(); - $p = $event->getPlayer(); - if (!$this->canTouch($p, $b)) { - //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($this->c["Messages"]["Touch"]["Enable"] === true) { - $p->sendMessage(str_replace('{block}', $b->getName(), $this->c["Messages"]["Touch"]["Message"])); - } - $event->setCancelled(); - } - } - - /* Handles TNT flag */ - - /** - * OnEntityExplode() - * - * EntityExplodeEvent - * - * @param EntityExplodeEvent $event - * - * @return void - */ - public function onEntityExplode(EntityExplodeEvent $event) - { - if (!$this->canExplode($event->getPosition(), $event->getEntity()->getLevel())) { - $event->setCancelled(); - } - } - - /** - * saveAreas() - * - * @api - * - * Saves plugin areas and any changes made previously - * - * @return void - */ - public function saveAreas() - { - $areas = array(); - foreach ($this->areas as $area) { - $areas[] = array( - "name" => $area->getName(), - "flags" => $area->getFlags(), - "pos1" => $area->getPos1(), - "pos2" => $area->getPos2(), - "level" => $area->getLevel(), - "whitelist" => $area->getWhitelist() - ); - } - //$c = yaml_parse(file_get_contents($this->getDataFolder() . "config.yml")); - if ($this->c["Settings"]["JPP"] === true) { - file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas, JSON_PRETTY_PRINT)); - } elseif($this->c["Settings"]["JPP"] === false) { - file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); - } else { - file_put_contents($this->getDataFolder() . "areas.json", json_encode($areas)); - } - } - - /** - * canEdit() - * - * @api - * - * Checks if player can edit the given position - * - * @param Player $p - * @param Block $t - * - * @return bool - */ - public function canEdit($p, $t) - { - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { - return true; - } - $o = true; - $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Edit"] : $this->edit); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { - if ($area->getFlag("edit")) { - $o = false; - } - if ($area->isWhitelisted(strtolower($p->getName()))) { - $o = true; - break; - } - if (!$area->getFlag("edit") && $g) { - $o = true; - break; - } - } - } - return $o; - } - - /** - * canTouch() - * - * @api - * - * Checks if player can touch the given position - * - * @param Player $p - * @param Block $t - * - * @return bool - */ - public function canTouch($p, $t) - { - if ($p->hasPermission("iprotector") || $p->hasPermission("iprotector.access")) { - return true; - } - $o = true; - $g = (isset($this->levels[$t->getLevel()->getName()]) ? $this->levels[$t->getLevel()->getName()]["Touch"] : $this->touch); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($t->getX(), $t->getY(), $t->getZ()), $t->getLevel()->getName())) { - if ($area->getFlag("touch")) { - $o = false; - } - if ($area->isWhitelisted(strtolower($p->getName()))) { - $o = true; - break; - } - if (!$area->getFlag("touch") && $g) { - $o = true; - break; - } - } - } - return $o; - } - - /** - * canGetHurt() - * - * @api - * - * Checks if player can get hurt on given position - * - * @param Player $p - * - * @return bool - */ - public function canGetHurt($p) - { - $o = true; - $g = (isset($this->levels[$p->getLevel()->getName()]) ? $this->levels[$p->getLevel()->getName()]["God"] : $this->god); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($p->getX(), $p->getY(), $p->getZ()), $p->getLevel()->getName())) { - if (!$area->getFlag("god") && $g) { - $o = true; - break; - } - if ($area->getFlag("god")) { - $o = false; - } - } - } - return $o; - } - - /** - * canExplode() - * - * @api - * - * Checks if entity can explode on given position - * - * @param pocketmine\level\Position $pos - * @param pocketmine\level\Level $level - * - * @return bool - */ - public function canExplode($pos, $level) - { - $o = true; - $g = (isset($this->levels[$level->getName()]) ? $this->levels[$level->getName()]["TNT"] : $this->tnt); - if ($g) { - $o = false; - } - foreach ($this->areas as $area) { - if ($area->contains(new Vector3($pos->getX(), $pos->getY(), $pos->getZ()), $level->getName())) { - if ($area->getFlag("tnt")) { - $o = false; - break; - } - if ($area->getFlag("tnt") && $g) { - $o = true; - break; - } - } - } - return $o; - } - -}