nullチェック追加 Versionを2.0.0に

AzisabaNetwork · Aug 12, 2024 · 2d611bf · 2d611bf
1 parent 6b17183
commit 2d611bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>net.azisaba</groupId>
   <artifactId>LeonGunWar</artifactId>
-  <version>1.4.6</version>
+  <version>2.0.0</version>
 
   <name>${project.artifactId}</name>
   <description>A core plugin in Azisaba LeonGunWar</description>

diff --git a/src/main/java/net/azisaba/lgw/core/listeners/others/DisableChangeItemListener.java b/src/main/java/net/azisaba/lgw/core/listeners/others/DisableChangeItemListener.java
@@ -70,10 +70,12 @@ public void onInventoryClick(InventoryClickEvent event) {
         if (!(event.getWhoClicked() instanceof Player)) {
             return;
         }
-        if (LeonGunWar.getPlugin().getManager().getCurrentGameMap().getSpawnPoint(LeonGunWar.getPlugin().getManager().getBattleTeam((Player) event.getWhoClicked()))!=null) {
-            Location spawnPoint = LeonGunWar.getPlugin().getManager().getCurrentGameMap().getSpawnPoint(LeonGunWar.getPlugin().getManager().getBattleTeam((Player) event.getWhoClicked()));
-            if (spawnPoint.distance(event.getWhoClicked().getLocation()) <= 10) {
-                return;
+        if(LeonGunWar.getPlugin().getManager().getCurrentGameMap() != null) {
+            if (LeonGunWar.getPlugin().getManager().getCurrentGameMap().getSpawnPoint(LeonGunWar.getPlugin().getManager().getBattleTeam((Player) event.getWhoClicked())) != null) {
+                Location spawnPoint = LeonGunWar.getPlugin().getManager().getCurrentGameMap().getSpawnPoint(LeonGunWar.getPlugin().getManager().getBattleTeam((Player) event.getWhoClicked()));
+                if (spawnPoint.distance(event.getWhoClicked().getLocation()) <= 10) {
+                    return;
+                }
             }
         }
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: ${project.name}
 main: net.azisaba.lgw.core.LeonGunWar
 version: ${project.version}
-authors: ["siloneco", "YukiLeafX"]
+authors: ["siloneco", "YukiLeafX", "matsu1213", "Arisa9006"]
 description: ${project.description}
 website: ${project.url}
 depend: ["CrackShot", "Essentials", "WorldGuard", "PlayerSettings", "KDStatusReloaded"]