Skip to content

Added support for PM4.0.0 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheDataLioness wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for PM4.0.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
main: awzaw\antispampro\AntiSpamPro
api: [3.0.0]
api: [4.0.0]
load: POSTWORLD
name: AntiSpamPro
description: "AntiSpamPro"
version: 1.4.1
version: 1.5.0
author: awzaw
commands:
asp:
permission: asp.command
description: "Change AntiSpamPro Settings"
usage: "/asp [help || kick || ban || set <cooldown in secs)>]"
permissions:
asp:
default: op
description: "Allows access to all ASP commands and bypass filter"
children:
asp.command:
default: op
description: "Allows access to all ASP commands"
asp.bypass:
default: op
description: "Allows user to bypass ASP filter"
asp.command:
default: op
description: "Allows access to all ASP commands"
asp.bypass:
default: op
description: "Allows user to bypass ASP filter"
61 changes: 32 additions & 29 deletions src/awzaw/antispampro/AntiSpamPro.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace awzaw\antispampro;

use pocketmine\Player;
use pocketmine\player\Player;
use pocketmine\plugin\PluginBase;
use pocketmine\event\player\PlayerChatEvent;
use pocketmine\event\Listener;
Expand All @@ -11,6 +11,7 @@
use pocketmine\command\CommandSender;
use pocketmine\command\Command;
use pocketmine\command\CommandExecutor;
use pocketmine\Server;
use pocketmine\utils\TextFormat;
use pocketmine\event\player\PlayerCommandPreprocessEvent;

Expand All @@ -19,7 +20,7 @@ class AntiSpamPro extends PluginBase implements CommandExecutor, Listener {
private $players = [];
public $profanityfilter;

public function onEnable()
public function onEnable(): void
{
$this->getServer()->getPluginManager()->registerEvents($this, $this);
$this->saveDefaultConfig();
Expand All @@ -38,27 +39,28 @@ public function onChat(PlayerChatEvent $e) {

if ($this->players[spl_object_hash($player)]["warnings"] === $this->getConfig()->get("warnings")) {
$player->sendMessage(TEXTFORMAT::RED . $this->getConfig()->get("lastwarning"));
$e->setCancelled();
$e->cancel();
return;
}
if ($this->players[spl_object_hash($player)]["warnings"] > $this->getConfig()->get("warnings")) {
$e->setCancelled();
$e->cancel();

switch (strtolower($this->getConfig()->get("action"))) {
case "kick":
$player->kick($this->getConfig()->get("kickmessage"));
break;

case "ban":
$player->setBanned(true);
Server::getInstance()->getNameBans()->addBan($player, $this->getConfig()->get("banmessage"));
$player->kick($this->getConfig()->get("banmessage"));
break;

case "banip":

$this->getServer()->getIPBans()->addBan($player->getAddress(), $this->getConfig()->get("banmessage"), null, $player->getName());
$this->getServer()->getNetwork()->blockAddress($player->getAddress(), -1);
$player->setBanned(true);

$this->getServer()->getIPBans()->addBan($player->getNetworkSession()->getIp(), $this->getConfig()->get("banmessage"), null, $player->getName());
$this->getServer()->getNetwork()->blockAddress($player->getNetworkSession()->getIp(), -1);
Server::getInstance()->getNameBans()->addBan($player, $this->getConfig()->get("banmessage"));
$player->kick($this->getConfig()->get("banmessage"));
break;

default:
Expand All @@ -69,20 +71,20 @@ public function onChat(PlayerChatEvent $e) {
}
$player->sendMessage(TEXTFORMAT::RED . $this->getConfig()->get("message1"));
$player->sendMessage(TEXTFORMAT::GREEN . $this->getConfig()->get("message2"));
$e->setCancelled();
$e->cancel();
} else {
$this->players[spl_object_hash($player)] = array("time" => time(), "warnings" => 0);
if ($this->getConfig()->get("antiswearwords") && $this->profanityfilter->hasProfanity($e->getMessage())) {
$player->sendMessage(TEXTFORMAT::RED . $this->getConfig()->get("swearmessage"));
$e->setCancelled(true);
$e->cancel();
}
}
}

public function onCommand(CommandSender $sender, Command $cmd, string $label, array $args) : bool{
if (!isset($args[0])) {
if ($sender instanceof Player) {
$sender->getPlayer()->sendMessage(TEXTFORMAT::GREEN . "Banmode: " . $this->getConfig()->get("action") . " " . "Delay: " . $this->getConfig()->get("delay") . " seconds");
$sender->sendMessage(TEXTFORMAT::GREEN . "Banmode: " . $this->getConfig()->get("action") . " " . "Delay: " . $this->getConfig()->get("delay") . " seconds");
} else {
$this->getLogger()->info("Banmode: " . $this->getConfig()->get("action") . " " . "Delay: " . $this->getConfig()->get("delay") . " seconds");
}
Expand All @@ -94,10 +96,10 @@ public function onCommand(CommandSender $sender, Command $cmd, string $label, ar
case "help":

if ($sender instanceof Player) {
$sender->getPlayer()->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help1"));
$sender->getPlayer()->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help2"));
$sender->getPlayer()->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help3"));
$sender->getPlayer()->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help4"));
$sender->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help1"));
$sender->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help2"));
$sender->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help3"));
$sender->sendMessage(TEXTFORMAT::YELLOW . $this->getConfig()->get("help4"));
} else {
$this->getLogger()->info($this->getConfig()->get("help1"));
$this->getLogger()->info($this->getConfig()->get("help2"));
Expand All @@ -114,7 +116,7 @@ public function onCommand(CommandSender $sender, Command $cmd, string $label, ar
$this->getConfig()->save();

if ($sender instanceof Player) {
$sender->getPlayer()->sendMessage(TEXTFORMAT::GREEN . $this->getConfig()->get("set" . strtolower($args[0]) . "kickmessage"));
$sender->sendMessage(TEXTFORMAT::GREEN . $this->getConfig()->get("set" . strtolower($args[0]) . "kickmessage"));
} else {
$this->getLogger()->info($this->getConfig()->get("set" . strtolower($args[0]) . "message"));
}
Expand All @@ -128,14 +130,14 @@ public function onCommand(CommandSender $sender, Command $cmd, string $label, ar
$this->getConfig()->save();

if ($sender instanceof Player) {
$sender->getPlayer()->sendMessage(TEXTFORMAT::GREEN . $this->getConfig()->get("setdelay"));
$sender->sendMessage(TEXTFORMAT::GREEN . $this->getConfig()->get("setdelay"));
} else {
$this->getLogger()->info($this->getConfig()->get("setdelay"));
}
} else {

if ($sender instanceof Player) {
$sender->getPlayer()->sendMessage(TEXTFORMAT::RED . $this->getConfig()->get("invaliddelay"));
$sender->sendMessage(TEXTFORMAT::RED . $this->getConfig()->get("invaliddelay"));
} else {
$this->getLogger()->info($this->getConfig()->get("invaliddelay"));
}
Expand All @@ -159,7 +161,7 @@ public function onPlayerCommand(PlayerCommandPreprocessEvent $event) {
if ($event->isCancelled() || $event->getPlayer()->isClosed()) return;
if (($sender = $event->getPlayer())->hasPermission("asp.bypass")) return;
$message = $event->getMessage();
if ($message{0} != "/") {
if ($message[0] != "/") {
return;
}
if (isset($this->players[spl_object_hash($sender)]) && (time() - $this->players[spl_object_hash($sender)]["time"] <= intval($this->getConfig()->get("delay")))) {
Expand All @@ -168,27 +170,28 @@ public function onPlayerCommand(PlayerCommandPreprocessEvent $event) {

if ($this->players[spl_object_hash($sender)]["warnings"] === $this->getConfig()->get("warnings")) {
$sender->sendMessage(TEXTFORMAT::RED . $this->getConfig()->get("lastwarning"));
$event->setCancelled(true);
$event->cancel();
return;
}
if ($this->players[spl_object_hash($sender)]["warnings"] > $this->getConfig()->get("warnings")) {
$event->setCancelled(true);
$event->cancel();

switch (strtolower($this->getConfig()->get("action"))) {
case "kick":
$sender->kick($this->getConfig()->get("kickmessage"));
break;

case "ban":
$sender->setBanned(true);
Server::getInstance()->getNameBans()->addBan($sender, $this->getConfig()->get("banmessage"));
$sender->kick($this->getConfig()->get("banmessage"));
break;

case "banip":

$this->getServer()->getIPBans()->addBan($sender->getAddress(), $this->getConfig()->get("banmessage"), null, $sender->getName());
$this->getServer()->getNetwork()->blockAddress($sender->getAddress(), -1);
$sender->setBanned(true);

$this->getServer()->getIPBans()->addBan($sender->getNetworkSession()->getIp(), $this->getConfig()->get("banmessage"), null, $sender->getName());
$this->getServer()->getNetwork()->blockAddress($sender->getNetworkSession()->getIp(), -1);
Server::getInstance()->getNameBans()->addBan($sender, $this->getConfig()->get("banmessage"));
$sender->kick($this->getConfig()->get("banmessage"));
break;

default:
Expand All @@ -198,7 +201,7 @@ public function onPlayerCommand(PlayerCommandPreprocessEvent $event) {
}
$sender->sendMessage(TEXTFORMAT::RED . $this->getConfig()->get("message1"));
$sender->sendMessage(TEXTFORMAT::GREEN . $this->getConfig()->get("message2"));
$event->setCancelled();
$event->cancel();
} else {
$this->players[spl_object_hash($sender)] = array("time" => time(), "warnings" => 0);
}
Expand All @@ -216,7 +219,7 @@ public function onLogin(PlayerLoginEvent $e)
if ($e->isCancelled() || $e->getPlayer()->isClosed()) return;
if ($this->getConfig()->get("antirudenames") && $this->profanityfilter->hasProfanity($e->getPlayer()->getName())) {
$e->getPlayer()->kick("No Rude Names Allowed");
$e->setCancelled(true);
$e->cancel();
}
}

Expand Down