diff --git a/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java b/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java index c1219bf..f8f329a 100644 --- a/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java +++ b/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java @@ -1,6 +1,7 @@ package com.alphaae.mcpe.servers.event; import cn.nukkit.Player; +import cn.nukkit.block.Block; import cn.nukkit.entity.Entity; import cn.nukkit.event.EventHandler; import cn.nukkit.event.EventPriority; @@ -20,11 +21,12 @@ public class PlayerInteractSetEvent implements Listener { public void onPlayerInteract(PlayerInteractEvent event) { Player player = event.getPlayer(); Item item = event.getItem(); + Block block = event.getBlock(); if (player != null && item != null) { -// if (item.getId() == 347) { -// FormWindowMeun form = new FormWindowMeun(player); -// player.showFormWindow(form); -// } + if (item.getId() == 0 && block.getId() == 0) { + FormWindowMeun form = new FormWindowMeun(player); + player.showFormWindow(form); + } } } @@ -46,12 +48,10 @@ public class PlayerInteractSetEvent implements Listener { public void onPlayerInteractEntity(PlayerInteractEntityEvent event) { Player player = event.getPlayer(); Entity entity = event.getEntity(); - Item item = event.getItem(); - if (player != null && entity != null && item != null) { +// Item item = event.getItem(); + if (player != null && entity != null) { try { Player player2 = (Player) entity; -// player.sendMessage("你触碰了玩家" + player.getName()); -// player2.sendMessage("你被" + player.getName() + "触碰了"); FormWindowOtherPlayer formWindowOtherPlayer = new FormWindowOtherPlayer(player, player2); player.showFormWindow(formWindowOtherPlayer); } catch (Exception e) { diff --git a/src/com/alphaae/mcpe/servers/event/block/joinquit/LoadPlayerDataBlock.java b/src/com/alphaae/mcpe/servers/event/block/joinquit/LoadPlayerDataBlock.java index 6a3efb3..7ae3642 100644 --- a/src/com/alphaae/mcpe/servers/event/block/joinquit/LoadPlayerDataBlock.java +++ b/src/com/alphaae/mcpe/servers/event/block/joinquit/LoadPlayerDataBlock.java @@ -6,7 +6,7 @@ import cn.nukkit.event.player.PlayerQuitEvent; import cn.nukkit.utils.TextFormat; import com.alphaae.mcpe.servers.StaticData; import com.alphaae.mcpe.servers.model.RePlayer; -import com.alphaae.mcpe.servers.utils.PlayerDataLoadUtils; +import com.alphaae.mcpe.servers.utils.PlayerDataUtils; public class LoadPlayerDataBlock implements JoinQuitEventBlock { @@ -15,7 +15,7 @@ public class LoadPlayerDataBlock implements JoinQuitEventBlock { Player player = event.getPlayer(); //读取数据 - RePlayer rePlayer = PlayerDataLoadUtils.LoadData(player); + RePlayer rePlayer = PlayerDataUtils.LoadData(player); String title = rePlayer.getTitle(); diff --git a/src/com/alphaae/mcpe/servers/utils/ChangePlayerCoinUtils.java b/src/com/alphaae/mcpe/servers/utils/ChangePlayerCoinUtils.java index 13ad048..22cb7f9 100644 --- a/src/com/alphaae/mcpe/servers/utils/ChangePlayerCoinUtils.java +++ b/src/com/alphaae/mcpe/servers/utils/ChangePlayerCoinUtils.java @@ -11,7 +11,7 @@ public class ChangePlayerCoinUtils { int userCoin = rePlayer.getCoin(); int newCoin = userCoin + count; rePlayer.setCoin(newCoin); - return PlayerDataLoadUtils.ChangeData(rePlayer); + return PlayerDataUtils.ChangeData(rePlayer); } public static boolean ReduceIcon(RePlayer rePlayer, int count) { @@ -19,7 +19,7 @@ public class ChangePlayerCoinUtils { int newCoin = userCoin - count; if (newCoin >= 0) { rePlayer.setCoin(newCoin); - return PlayerDataLoadUtils.ChangeData(rePlayer); + return PlayerDataUtils.ChangeData(rePlayer); } Player player = MainPlugin.getPlugin().getServer().getPlayer(rePlayer.getUuid()).get(); player.sendMessage(TextFormat.colorize("&4硬币不足")); @@ -34,7 +34,7 @@ public class ChangePlayerCoinUtils { if (newCoin1 >= 0) { rePlayer1.setCoin(newCoin1); rePlayer2.setCoin(newCoin2); - return PlayerDataLoadUtils.ChangeData(rePlayer1) & PlayerDataLoadUtils.ChangeData(rePlayer2); + return PlayerDataUtils.ChangeData(rePlayer1) & PlayerDataUtils.ChangeData(rePlayer2); } Player player = MainPlugin.getPlugin().getServer().getPlayer(rePlayer1.getUuid()).get(); player.sendMessage(TextFormat.colorize("&4硬币不足")); diff --git a/src/com/alphaae/mcpe/servers/utils/PlayerDataLoadUtils.java b/src/com/alphaae/mcpe/servers/utils/PlayerDataUtils.java similarity index 98% rename from src/com/alphaae/mcpe/servers/utils/PlayerDataLoadUtils.java rename to src/com/alphaae/mcpe/servers/utils/PlayerDataUtils.java index 656d1bc..0d35086 100644 --- a/src/com/alphaae/mcpe/servers/utils/PlayerDataLoadUtils.java +++ b/src/com/alphaae/mcpe/servers/utils/PlayerDataUtils.java @@ -7,7 +7,7 @@ import com.alphaae.mcpe.servers.model.RePlayer; import java.io.*; import java.util.UUID; -public class PlayerDataLoadUtils { +public class PlayerDataUtils { private static final String FILE_TYPE = ".replayer"; private static final File DATA_FOLDER = MainPlugin.getPlugin().getDataFolder(); @@ -54,6 +54,8 @@ public class PlayerDataLoadUtils { playerDataFile.createNewFile(); ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(playerDataFile)); RePlayer rePlayer = new RePlayer(uuid, "新火", 2000); + + outputStream.writeObject(rePlayer); outputStream.close(); return true;