Skip to content

Commit efc86d6

Browse files
committed
bug fix
1 parent 49b1a69 commit efc86d6

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/main/java/net/azisaba/afnw/afnwcore2/AfnwCore2.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import net.azisaba.afnw.afnwcore2.util.TheTAB;
1616
import net.azisaba.afnw.afnwcore2.util.data.PlayerData;
1717
import net.azisaba.afnw.afnwcore2.util.data.PlayerDataSave;
18+
import net.minecraft.core.registries.BuiltInRegistries;
1819
import net.minecraft.world.entity.ai.attributes.Attributes;
1920
import net.minecraft.world.entity.ai.attributes.RangedAttribute;
2021
import org.bukkit.Bukkit;
@@ -61,7 +62,7 @@ public void onEnable() {
6162
getLogger().info("Listener 設定中....");
6263
/* プレイヤーリスナー */
6364
pluginEvent.registerEvents(new JoinListener(this, data), this);
64-
pluginEvent.registerEvents(new QuitListener(), this);
65+
pluginEvent.registerEvents(new QuitListener(this), this);
6566
pluginEvent.registerEvents(new DeathListener(), this);
6667
pluginEvent.registerEvents(new FirstPlayerJoinListener(this, data), this);
6768
pluginEvent.registerEvents(new AFKListener(this), this);
@@ -129,7 +130,8 @@ public void onEnable() {
129130
}
130131
}, 10, 10);
131132

132-
((RangedAttribute) Attributes.LUCK).maxValue = Double.MAX_VALUE;
133+
((RangedAttribute) Objects.requireNonNull(BuiltInRegistries.ATTRIBUTE.get(Attributes.LUCK.unwrap().left().orElseThrow())))
134+
.maxValue = Double.MAX_VALUE;
133135
getLogger().info("正常に起動しました。");
134136
}
135137

src/main/java/net/azisaba/afnw/afnwcore2/listeners/player/QuitListener.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package net.azisaba.afnw.afnwcore2.listeners.player;
22

3+
import net.azisaba.afnw.afnwcore2.AfnwCore2;
34
import net.kyori.adventure.text.Component;
45
import net.kyori.adventure.text.format.NamedTextColor;
56
import org.bukkit.entity.Player;
67
import org.bukkit.event.EventHandler;
78
import org.bukkit.event.EventPriority;
89
import org.bukkit.event.Listener;
910
import org.bukkit.event.player.PlayerQuitEvent;
11+
import org.jetbrains.annotations.NotNull;
1012

1113
/**
1214
* ログアウトしたプレイヤーに関するクラス
@@ -15,6 +17,11 @@
1517
* @see org.bukkit.event.Listener
1618
*/
1719
public class QuitListener implements Listener {
20+
private final @NotNull AfnwCore2 plugin;
21+
22+
public QuitListener(@NotNull AfnwCore2 plugin) {
23+
this.plugin = plugin;
24+
}
1825

1926
/**
2027
* ログアウト通知を行います。
@@ -27,5 +34,6 @@ public void onQuit(PlayerQuitEvent e) {
2734
Player p = e.getPlayer();
2835

2936
e.quitMessage(Component.text("* " + p.getName() + "がログアウトしました。").color(NamedTextColor.AQUA));
37+
plugin.pvpEnabled.remove(p.getUniqueId());
3038
}
3139
}

0 commit comments

Comments
 (0)