Merge pull request #2 from AzisabaNetwork/master

つけ忘れてたownerplugin追加とお金をdoubleに
AzisabaNetwork · Dec 10, 2024 · a2329bc · a2329bc
2 parents 826241a + 4985e67
commit a2329bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/dev/felnull/Data/GroupData.java b/src/main/java/dev/felnull/Data/GroupData.java
@@ -14,20 +14,22 @@ public class GroupData {
     public Map<Player,String[]> playerPermission; //プレイヤーが保持している役職
     public boolean isPrivate; //個人用グループか否か
     public StorageData storageData; //グループ保有のストレージデータ null許容
+    public String ownerPlugin;
 
-    public GroupData (@NotNull String groupName,@NotNull Set<Player> playerList,@NotNull Map<Player,String[]> playerPermission, boolean isPrivate, StorageData storageData) {
+    public GroupData (@NotNull String groupName,@NotNull Set<Player> playerList,@NotNull Map<Player,String[]> playerPermission, boolean isPrivate, StorageData storageData, String ownerPlugin) {
         this.groupName = groupName;
         this.playerList = playerList;
         this.playerPermission = playerPermission;
         this.isPrivate = isPrivate;
         storageData.groupName = groupName;
         storageData.groupData = this;
         this.storageData = storageData;
+        this.ownerPlugin = ownerPlugin;
     }
 
-    public GroupData (@NotNull Player player, StorageData storageData) {
-        this.groupName = player.getUniqueId().toString();
+    public GroupData (@NotNull Player player, StorageData storageData, String ownerPlugin) {
 
+        this.groupName = player.getUniqueId().toString();
         //引数で得たプレイヤーをメンバに追加してowner権限を付与する
         playerList = new HashSet<>();
         playerPermission = new HashMap<>();
@@ -40,6 +42,7 @@ public GroupData (@NotNull Player player, StorageData storageData) {
         storageData.groupName = groupName;
         storageData.groupData = this;
         this.storageData = storageData;
+        this.ownerPlugin = ownerPlugin;
     }
 
 }
diff --git a/src/main/java/dev/felnull/Data/StorageData.java b/src/main/java/dev/felnull/Data/StorageData.java
@@ -10,11 +10,11 @@ public class StorageData {
     public String groupName;//グループ名(個人プレイヤーもグループ扱い)
     public GroupData groupData;//ストレージの所属グループ
     public final Set<String> requireBankPermission;//ストレージ直下の金庫の要求パーミッション(BukkitPermではない)
-    public int bankMoney;//ストレージ付属金庫の値
+    public double bankMoney;//ストレージ付属金庫の値
     @NotNull
     public Map<String,InventoryData> storageInventory;//ストレージに含まれているインベントリデータ　キーのStringはページ名
 
-    public StorageData(@NotNull Set<String> requireBankPermission, Map<String,InventoryData> storageInventory, int bankMoney) {
+    public StorageData(@NotNull Set<String> requireBankPermission, Map<String,InventoryData> storageInventory, double bankMoney) {
         this.requireBankPermission = requireBankPermission;
         if(storageInventory == null){
             storageInventory = new HashMap<>();