diff --git a/src/com/alphaae/mcpe/servers/MainPlugin.java b/src/com/alphaae/mcpe/servers/MainPlugin.java index 20fc30e..0b9d593 100644 --- a/src/com/alphaae/mcpe/servers/MainPlugin.java +++ b/src/com/alphaae/mcpe/servers/MainPlugin.java @@ -52,6 +52,6 @@ public class MainPlugin extends PluginBase { pluginManager.registerEvents(new PlayerJoinQuitEvent(), this); pluginManager.registerEvents(new PlayerInteractSetEvent(), this); pluginManager.registerEvents(new FormRespondedEvent(), this); - pluginManager.registerEvents(new PlayerInventoryEvent(), this); +// pluginManager.registerEvents(new PlayerInventoryEvent(), this); } } diff --git a/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java b/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java index f8f329a..9c6fee0 100644 --- a/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java +++ b/src/com/alphaae/mcpe/servers/event/PlayerInteractSetEvent.java @@ -11,6 +11,7 @@ import cn.nukkit.event.player.PlayerInteractEvent; import cn.nukkit.event.player.PlayerItemHeldEvent; import cn.nukkit.item.Item; import cn.nukkit.utils.TextFormat; +import com.alphaae.mcpe.servers.MainPlugin; import com.alphaae.mcpe.servers.form.FormWindowMeun; import com.alphaae.mcpe.servers.form.FormWindowOtherPlayer; @@ -19,15 +20,15 @@ public class PlayerInteractSetEvent implements Listener { //玩家长按交互事件 @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL) 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() == 0 && block.getId() == 0) { - FormWindowMeun form = new FormWindowMeun(player); - player.showFormWindow(form); - } - } +// Player player = event.getPlayer(); +// Item item = event.getItem(); +// Block block = event.getBlock(); +// if (player != null && item != null) { +// if (item.getId() == 0 && block.getId() == 0) { +// FormWindowMeun form = new FormWindowMeun(player); +// player.showFormWindow(form); +// } +// } } //玩家手持物品事件 @@ -35,8 +36,14 @@ public class PlayerInteractSetEvent implements Listener { public void onPlayerItemHeld(PlayerItemHeldEvent event) { Player player = event.getPlayer(); Item item = event.getItem(); + int slot = event.getSlot(); if (player != null && item != null) { if (item.getId() == 347) { + if (slot != 0) { + player.getInventory().setHeldItemSlot(0); + } else { + player.getInventory().setHeldItemSlot(1); + } FormWindowMeun form = new FormWindowMeun(player); player.showFormWindow(form); } diff --git a/src/com/alphaae/mcpe/servers/event/PlayerInventoryEvent.java b/src/com/alphaae/mcpe/servers/event/PlayerInventoryEvent.java index 070e9fd..f5ae77b 100644 --- a/src/com/alphaae/mcpe/servers/event/PlayerInventoryEvent.java +++ b/src/com/alphaae/mcpe/servers/event/PlayerInventoryEvent.java @@ -1,6 +1,5 @@ package com.alphaae.mcpe.servers.event; -import cn.nukkit.Player; import cn.nukkit.event.EventHandler; import cn.nukkit.event.EventPriority; import cn.nukkit.event.Listener; @@ -8,10 +7,9 @@ import cn.nukkit.event.inventory.InventoryClickEvent; public class PlayerInventoryEvent implements Listener { + //点击物品栏事件 @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL) public void onInventoryClick(InventoryClickEvent event) { - Player player = event.getPlayer(); - int slot = event.getSlot(); - player.sendMessage("Solt: " + slot); + //在背包打开状态下才有效 } } diff --git a/src/com/alphaae/mcpe/servers/event/block/joinquit/DisplayInfoBlock.java b/src/com/alphaae/mcpe/servers/event/block/joinquit/DisplayInfoBlock.java index 684fe1d..bed1e6f 100644 --- a/src/com/alphaae/mcpe/servers/event/block/joinquit/DisplayInfoBlock.java +++ b/src/com/alphaae/mcpe/servers/event/block/joinquit/DisplayInfoBlock.java @@ -26,26 +26,25 @@ public class DisplayInfoBlock implements JoinQuitEventBlock { final UUID uuid = player.getUniqueId(); try { - infoHandler = MainPlugin.getPlugin().getServer().getScheduler().scheduleDelayedRepeatingTask(new Task() { - @Override - public void onRun(int i) { - try { - RePlayer rePlayer = StaticData.rePlayerMap.get(uuid); - String name = player.getDisplayName(); - int ping = player.getPing(); - int coin = rePlayer.getCoin(); - float tps = MainPlugin.getPlugin().getServer().getTicksPerSecond(); + infoHandler = MainPlugin.getPlugin().getServer().getScheduler().scheduleDelayedRepeatingTask(MainPlugin.getPlugin(), () -> { + try { + RePlayer rePlayer = StaticData.rePlayerMap.get(uuid); + String name = player.getDisplayName(); + int ping = player.getPing(); + int coin = rePlayer.getCoin(); + float tps = MainPlugin.getPlugin().getServer().getTicksPerSecond(); - StringBuilder showText = new StringBuilder() - .append(name) - .append(" &f硬币: ").append(coin) - .append(" 延迟: ").append(ping).append("ms") - .append(" TPS: ").append(tps); + StringBuilder showText = new StringBuilder() + .append(name) + .append(" &f硬币: ").append(coin) + .append(" 延迟: ").append(ping).append("ms") + .append(" TPS: ").append(tps); - player.sendActionBar(TextFormat.colorize(showText.toString())); - } catch (Exception e) { - cancel(); - } + player.sendActionBar(TextFormat.colorize(showText.toString())); + } catch (Exception e) { + if (infoHandler != null) + infoHandler.cancel(); + e.printStackTrace(); } }, Config.JOIN_WAITING_TIME, 36); } catch (Exception e) {