fix0.5

Fixed the issue where cPlayer could be null in certain situations and added a cPlayer check

Author: XingZiNina

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "fr.xyness"
-version = "1.4"
+version = "1.4.2"
 
 java {
     toolchain {

src/main/java/fr/xyness/SCS/Commands/ClaimCommand.java

@@ -57,28 +57,18 @@
 import fr.xyness.SCS.Guis.ClaimMembersGui;
 import fr.xyness.SCS.Guis.ClaimMainGui;
 
-/**
- * Command executor and tab completer for the /claim command.
- */
 public class ClaimCommand implements CommandExecutor, TabCompleter {
 
 
     // ***************
     // *  Variables  *
     // ***************
 
-	
-    /** A map of players currently in the process of creating a claim. */
+
     public static Map<Player, Integer> isOnCreate = new HashMap<>();
-    
-    /** A map of players currently in the process of adding a chunk. */
     public static Map<Player, String> isOnAdd = new HashMap<>();
-    
-    /** A map of invitations */
     public static Map<Player, Map<Player,String>> invitations = new HashMap<>();
     public static Map<Player, Map<Player,LocalDateTime>> invitationsTime = new HashMap<>();
-	
-    /** Instance of SimpleClaimSystem */
     private SimpleClaimSystem instance;
 
     public static Set<String> commands = Set.of("settings", "add", "remove", "list", "setspawn", "setname", "members", "setdesc",
@@ -89,32 +79,13 @@ public class ClaimCommand implements CommandExecutor, TabCompleter {
     // ******************
     // *  Constructors  *
     // ******************
-    
-    
-    /**
-     * Constructor for ClaimCommand.
-     *
-     * @param instance The instance of the SimpleClaimSystem plugin.
-     */
     public ClaimCommand(SimpleClaimSystem instance) {
     	this.instance = instance;
     }
-
-    
     // ******************
     // *  Tab Complete  *
     // ******************
 
-    
-    /**
-     * Handles tab completion for the /claim command.
-     *
-     * @param sender the sender of the command
-     * @param cmd the command
-     * @param alias the alias of the command
-     * @param args the arguments provided to the command
-     * @return a list of possible completions for the final argument, or an empty list if none are applicable
-     */
     @Override
     public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {
         if (!(sender instanceof Player)) {
@@ -158,31 +129,21 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String alia
     // *  Main command  *
     // ******************
 
-    
-    /**
-     * Handles the execution of the /claim command.
-     *
-     * @param sender  the command sender
-     * @param command the command
-     * @param label   the command label
-     * @param args    the command arguments
-     * @return true if the command was successful, false otherwise
-     */
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-    	// If the sender is not a player
         if (!(sender instanceof Player)) {
             sender.sendMessage(instance.getLanguage().getMessage("command-only-by-players"));
             return true;
         }
 
-        // Get data
         Player player = (Player) sender;
         String playerName = player.getName();
         CPlayer cPlayer = instance.getPlayerMain().getCPlayer(player.getUniqueId());
-
-        // Check if for desc (so there are many arguments)
+        if (cPlayer == null) {
+            player.sendMessage(instance.getLanguage().getMessage("error"));
+            return true;
+        }
         if (args.length > 1 && args[0].equals("setdesc")) {
         	handleDesc(player, playerName, args);
             return true;

src/main/java/fr/xyness/SCS/Commands/ClaimsCommand.java

@@ -11,31 +11,20 @@
 import fr.xyness.SCS.Guis.Bedrock.BClaimsGui;
 import fr.xyness.SCS.Types.CPlayer;
 
-/**
- * Handles the /claims command, which opens a GUI for the player to view their claims.
- */
+
 public class ClaimsCommand implements CommandExecutor {
 
 
     // ***************
     // *  Variables  *
     // ***************
-	
-	
-    /** Instance of SimpleClaimSystem */
+
     private SimpleClaimSystem instance;
-    
-    
+
     // ******************
     // *  Constructors  *
     // ******************
-    
-    
-    /**
-     * Constructor for ClaimsCommand.
-     *
-     * @param instance The instance of the SimpleClaimSystem plugin.
-     */
+
     public ClaimsCommand(SimpleClaimSystem instance) {
     	this.instance = instance;
     }
@@ -44,17 +33,7 @@ public ClaimsCommand(SimpleClaimSystem instance) {
     // ******************
     // *  Main command  *
     // ******************
-	
-    
-    /**
-     * Executes the given command, returning its success.
-     *
-     * @param sender Source of the command
-     * @param command Command which was executed
-     * @param label Alias of the command which was used
-     * @param args Passed command arguments
-     * @return true if a valid command, otherwise false
-     */
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
@@ -67,7 +46,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         // Get data
         Player player = (Player) sender;
         CPlayer cPlayer = instance.getPlayerMain().getCPlayer(player.getUniqueId());
-        
+        if (cPlayer == null) {
+            player.sendMessage(instance.getLanguage().getMessage("error"));
+            return true;
+        }
         // Open the claims GUI for the player
         cPlayer.setGuiPage(1);
         if(instance.getSettings().getBooleanSetting("floodgate")) {

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: SimpleClaimSystem
-version: 1.4
+version: 1.4.2
 main: fr.xyness.SCS.SimpleClaimSystem
-authors: [Xyness]
+authors: [Xyness,MingLi.]
 softdepend: [PlaceholderAPI, WorldGuard, Vault, dynmap, BlueMap, pl3xmap, GriefPrevention, floodgate, ItemsAdder, CraftEngine]
 api-version: 1.18
 folia-supported: true