fix OfflineData Read Null...
Signed-off-by: j502647092 <jtb1@163.com>
This commit is contained in:
parent
5d97130868
commit
cc4fd85bc6
2
pom.xml
2
pom.xml
|
@ -3,7 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>cn.citycraft</groupId>
|
<groupId>cn.citycraft</groupId>
|
||||||
<artifactId>LuckLottery</artifactId>
|
<artifactId>LuckLottery</artifactId>
|
||||||
<version>1.1</version>
|
<version>1.2</version>
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.name}</finalName>
|
<finalName>${project.name}</finalName>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
|
@ -5,6 +5,7 @@ import org.bukkit.plugin.RegisteredServiceProvider;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
import cn.citycraft.LuckLottery.command.LuckLotteryCommand;
|
import cn.citycraft.LuckLottery.command.LuckLotteryCommand;
|
||||||
|
import cn.citycraft.LuckLottery.config.OfflineDate;
|
||||||
import cn.citycraft.LuckLottery.listen.PlayerListen;
|
import cn.citycraft.LuckLottery.listen.PlayerListen;
|
||||||
import cn.citycraft.LuckLottery.runnable.LotteryReward;
|
import cn.citycraft.LuckLottery.runnable.LotteryReward;
|
||||||
import cn.citycraft.LuckLottery.utils.ChatUtils;
|
import cn.citycraft.LuckLottery.utils.ChatUtils;
|
||||||
|
@ -18,7 +19,7 @@ public class LuckLottery extends JavaPlugin {
|
||||||
public static boolean isEconomy;
|
public static boolean isEconomy;
|
||||||
public static LuckLottery plugin;
|
public static LuckLottery plugin;
|
||||||
protected FileConfig config;
|
protected FileConfig config;
|
||||||
protected FileConfig offlinedata;
|
protected OfflineDate offlinedata;
|
||||||
protected FileConfig playerdata;
|
protected FileConfig playerdata;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -26,7 +27,7 @@ public class LuckLottery extends JavaPlugin {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
public FileConfig getOfflinedata() {
|
public OfflineDate getOfflineData() {
|
||||||
return offlinedata;
|
return offlinedata;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +70,7 @@ public class LuckLottery extends JavaPlugin {
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
plugin = this;
|
plugin = this;
|
||||||
config = new FileConfig(this);
|
config = new FileConfig(this);
|
||||||
offlinedata = new FileConfig(this, "offlinedata");
|
offlinedata = new OfflineDate(this);
|
||||||
playerdata = new FileConfig(this, "playerdate.yml");
|
playerdata = new FileConfig(this, "playerdate.yml");
|
||||||
LotteryUtils.init(this);
|
LotteryUtils.init(this);
|
||||||
LotteryUtils.reloadPlayerLottery();
|
LotteryUtils.reloadPlayerLottery();
|
||||||
|
|
|
@ -14,14 +14,19 @@ public class OfflineDate {
|
||||||
instance = new FileConfig(p, CONFIG_NAME);
|
instance = new FileConfig(p, CONFIG_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void addMessage(final String p, final String message) {
|
public void addMessage(final String p, final String message) {
|
||||||
final List<String> messages = instance.getStringList(p);
|
final List<String> messages = instance.getStringList(p);
|
||||||
messages.add(message);
|
messages.add(message);
|
||||||
instance.set(p, messages);
|
instance.set(p, messages);
|
||||||
instance.save();
|
instance.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> getMessage(final String p) {
|
public void clearMessage(final String p) {
|
||||||
|
instance.set(p, null);
|
||||||
|
instance.save();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getMessage(final String p) {
|
||||||
return instance.getStringList(p);
|
return instance.getStringList(p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,6 @@ import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import cn.citycraft.LuckLottery.LuckLottery;
|
import cn.citycraft.LuckLottery.LuckLottery;
|
||||||
import cn.citycraft.LuckLottery.config.OfflineDate;
|
|
||||||
import cn.citycraft.LuckLottery.runnable.LaterShow;
|
import cn.citycraft.LuckLottery.runnable.LaterShow;
|
||||||
import cn.citycraft.LuckLottery.utils.ChatUtils;
|
import cn.citycraft.LuckLottery.utils.ChatUtils;
|
||||||
import cn.citycraft.LuckLottery.utils.InvUtils;
|
import cn.citycraft.LuckLottery.utils.InvUtils;
|
||||||
|
@ -79,11 +78,10 @@ public class PlayerListen implements Listener {
|
||||||
@EventHandler(priority = EventPriority.HIGH)
|
@EventHandler(priority = EventPriority.HIGH)
|
||||||
public void onPlayerInteract(final PlayerJoinEvent e) {
|
public void onPlayerInteract(final PlayerJoinEvent e) {
|
||||||
final Player p = e.getPlayer();
|
final Player p = e.getPlayer();
|
||||||
final List<String> messages = OfflineDate.getMessage(p.getName());
|
final List<String> messages = plugin.getOfflineData().getMessage(p.getName());
|
||||||
if (messages != null && !messages.isEmpty()) {
|
if (messages != null && !messages.isEmpty()) {
|
||||||
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(LuckLottery.plugin, new LaterShow(p, messages), 5);
|
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(LuckLottery.plugin, new LaterShow(p, messages), 5);
|
||||||
plugin.getOfflinedata().set(p.getName(), null);
|
plugin.getOfflineData().clearMessage(p.getName());
|
||||||
plugin.getOfflinedata().save();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@ import org.bukkit.ChatColor;
|
||||||
import org.bukkit.OfflinePlayer;
|
import org.bukkit.OfflinePlayer;
|
||||||
|
|
||||||
import cn.citycraft.LuckLottery.LuckLottery;
|
import cn.citycraft.LuckLottery.LuckLottery;
|
||||||
import cn.citycraft.LuckLottery.config.OfflineDate;
|
|
||||||
import cn.citycraft.LuckLottery.utils.ChatUtils;
|
import cn.citycraft.LuckLottery.utils.ChatUtils;
|
||||||
import cn.citycraft.LuckLottery.utils.LotteryUtils;
|
import cn.citycraft.LuckLottery.utils.LotteryUtils;
|
||||||
|
|
||||||
|
@ -45,7 +44,7 @@ public class LotteryReward implements Runnable {
|
||||||
if (p.isOnline()) {
|
if (p.isOnline()) {
|
||||||
// ChatUtils.sendMessage((Player) p, message);
|
// ChatUtils.sendMessage((Player) p, message);
|
||||||
} else {
|
} else {
|
||||||
OfflineDate.addMessage(p.getName(), message);
|
plugin.getOfflineData().addMessage(p.getName(), message);
|
||||||
}
|
}
|
||||||
LuckLottery.economy.depositPlayer(p, winprices);
|
LuckLottery.economy.depositPlayer(p, winprices);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue