Merge pull request #49 from KanekiLeChomeur/patch-1

API Change and Patch
EvolSoft · Oct 13, 2023 · b1c0885 · b1c0885
2 parents 86bbdb2 + c650753
commit b1c0885
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/CustomAlerts/plugin.yml b/CustomAlerts/plugin.yml
@@ -1,7 +1,7 @@
 name: CustomAlerts
 main: CustomAlerts\CustomAlerts
-version: 2.4
-api: [4.0.0]
+version: 3.1
+api: [5.0.0]
 load: STARTUP
 author: [EvolSoft, KanekiLeChomeur]
 description: Customize or hide alerts (join/leave messages, whitelist messages, outdated server/client messages, etc...) plugin

diff --git a/CustomAlerts/src/CustomAlerts/Commands/Commands.php b/CustomAlerts/src/CustomAlerts/Commands/Commands.php
@@ -43,7 +43,7 @@ public function execute(CommandSender $sender, string $commandLabel, array $args
                 case "reload":
                     if($sender->hasPermission("customalerts.reload")){
 			            $this->plugin->reloadConfig();
-			            $this->plugin->cfg = $this->plugin->getConfig()->getAll();
+			            $this->plugin->reloadCfg();
 			            $sender->sendMessage(TextFormat::colorize(CustomAlerts::PREFIX . "&aConfiguration Reloaded."));
 			        }else{
 						$sender->sendMessage(TextFormat::colorize("&cYou don't have permissions to use this command"));

diff --git a/CustomAlerts/src/CustomAlerts/CustomAlerts.php b/CustomAlerts/src/CustomAlerts/CustomAlerts.php
@@ -26,6 +26,7 @@
 use pocketmine\event\entity\ProjectileHitEntityEvent;
 use pocketmine\player\Player as PlayerPlayer;
 use pocketmine\player\PlayerInfo;
+use pocketmine\utils\Config;
 use pocketmine\world\World;
 
 class CustomAlerts extends PluginBase {
@@ -36,7 +37,7 @@ class CustomAlerts extends PluginBase {
 	/** @var string */
 	const API_VERSION = "2.0";
 
-	private $cfg;
+	protected Config $cfg;
 
 	/** @var CustomAlerts $instance */
 	private static $instance = null;
@@ -228,6 +229,10 @@ public function isFirstJoinMessageEnabled() : bool {
     	return $this->cfg["FirstJoin"]["enable"];
     }
 
+    public function reloadCfg(){
+        $this->cfg = $this->getConfig()->getAll();
+    }
+
     /**
      * Get first join message
      * 

diff --git a/CustomAlerts/src/CustomAlerts/EventListener.php b/CustomAlerts/src/CustomAlerts/EventListener.php
@@ -106,7 +106,7 @@ public function onPlayerPreLogin(PlayerPreLoginEvent $event){
     			}
     			$cevent->call();
     			if($cevent->getMessage() != ""){
-    				$event->setKickReason(PlayerPreLoginEvent::KICK_REASON_SERVER_WHITELISTED, $cevent->getMessage());
+    				$event->setKickFlag(PlayerPreLoginEvent::KICK_FLAG_SERVER_WHITELISTED, $cevent->getMessage());
     				return;
     			}
     		}

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ PocketMine-MP plugins
 
 ## Requirements
 
-PocketMine-MP API 4.0.0
+PocketMine-MP API 5.0.0
 
 ## Overview
 
@@ -24,6 +24,12 @@ PocketMine-MP API 4.0.0
 
 With CustomAlerts you can customize or hide whitelist kick messages, outdated server/client messages, join/leave messages, first join messages, death messages, world change messages... (read documentation)
 
+**Changelogs** 13/10/2023
+
+- Applied PocketMine-MP API 5.0.0 changes
+- Bumped version from 2.4 to 3.1
+- Patched Config Reload Command
+
 **Features**
 
 - Customize or hide join, quit and death messages