Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-01 05:58:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix PlayerCommandEvent being called 2 times

Browse Source
This commit is contained in:
Felix Cravic 2020-08-03 23:55:54 +02:00
parent 251fbbda32
commit 7007c507c1
2 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/net/minestom/server/inventory/Inventory.java
View File

@ -1,6 +1,5 @@
package net.minestom.server.inventory;
import io.netty.buffer.ByteBuf;
import net.minestom.server.Viewable;
import net.minestom.server.entity.Player;
import net.minestom.server.inventory.click.ClickType;
@ -17,7 +16,6 @@ import net.minestom.server.network.packet.server.play.WindowPropertyPacket;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.utils.ArrayUtils;
import net.minestom.server.utils.MathUtils;
import net.minestom.server.utils.PacketUtils;
import net.minestom.server.utils.inventory.PlayerInventoryUtils;
import net.minestom.server.utils.item.ItemStackUtils;
import net.minestom.server.utils.validate.Check;
@ -50,9 +48,6 @@ public class Inventory implements InventoryModifier, InventoryClickHandler, View
private InventoryClickProcessor clickProcessor = new InventoryClickProcessor();
// Cached windows packet
private ByteBuf windowItemsBuffer;
// True if the buffer above is up to date, false otherwise
private boolean windowItemsBufferUpdated;
public Inventory(InventoryType inventoryType, String title) {
this.id = generateId();
@ -199,11 +194,7 @@ public class Inventory implements InventoryModifier, InventoryClickHandler, View
* Refresh the inventory for all viewers
*/
public void update() {
final ByteBuf packetBuffer = getWindowItemsBuffer();
getViewers().forEach(player -> {
final PlayerConnection playerConnection = player.getPlayerConnection();
playerConnection.sendPacket(packetBuffer, true);
});
sendPacketToViewers(createNewWindowItemsPacket());
}
/**
@ -217,8 +208,7 @@ public class Inventory implements InventoryModifier, InventoryClickHandler, View
return;
final PlayerConnection playerConnection = player.getPlayerConnection();
final ByteBuf packetBuffer = getWindowItemsBuffer();
playerConnection.sendPacket(packetBuffer, true);
playerConnection.sendPacket(createNewWindowItemsPacket());
}
@Override
@ -290,9 +280,6 @@ public class Inventory implements InventoryModifier, InventoryClickHandler, View
setSlotPacket.slot = (short) slot;
setSlotPacket.itemStack = itemStack;
sendPacketToViewers(setSlotPacket);
// The inventory changed, buffer will be updated once requested again
this.windowItemsBufferUpdated = false;
}
/**
@ -306,33 +293,6 @@ public class Inventory implements InventoryModifier, InventoryClickHandler, View
*/
protected void setItemStackInternal(int slot, ItemStack itemStack) {
itemStacks[slot] = itemStack;
this.windowItemsBufferUpdated = false;
}
/**
* Get the window items packet as a buffer containing all the
* current inventory's items
* <p>
* The cached window items buffer will be updated if needed
*
* @return a {@link WindowItemsPacket} buffer
*/
private ByteBuf getWindowItemsBuffer() {
if (!windowItemsBufferUpdated) {
refreshWindowItemsBuffer();
}
return windowItemsBuffer;
}
/**
* Refresh the inventory {@link WindowItemsPacket} buffer
*/
private void refreshWindowItemsBuffer() {
final WindowItemsPacket windowItemsPacket = createNewWindowItemsPacket();
final ByteBuf packetBuffer = PacketUtils.writePacket(windowItemsPacket);
this.windowItemsBuffer = packetBuffer;
this.windowItemsBufferUpdated = true;
}
/**

6
src/main/java/net/minestom/server/listener/ChatMessageListener.java
View File

@ -8,7 +8,6 @@ import net.minestom.server.chat.RichMessage;
import net.minestom.server.command.CommandManager;
import net.minestom.server.entity.Player;
import net.minestom.server.event.player.PlayerChatEvent;
import net.minestom.server.event.player.PlayerCommandEvent;
import net.minestom.server.network.ConnectionManager;
import net.minestom.server.network.PacketWriterUtils;
import net.minestom.server.network.packet.client.play.ClientChatMessagePacket;
@ -30,10 +29,7 @@ public class ChatMessageListener {
// The message is a command
message = message.replaceFirst(cmdPrefix, "");
PlayerCommandEvent playerCommandEvent = new PlayerCommandEvent(player, message);
player.callCancellableEvent(PlayerCommandEvent.class, playerCommandEvent, () -> {
COMMAND_MANAGER.execute(player, playerCommandEvent.getCommand());
});
COMMAND_MANAGER.execute(player, message);
// Do not call chat event
return;