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

Use a static method to create the destroy entity packet

Browse Source
This commit is contained in:
TheMode 2021-05-31 18:53:57 +02:00
parent 9191e8ae1f
commit 6858690cc1
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -393,10 +393,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
if (!viewers.remove(player)) {
return false;
}
DestroyEntityPacket destroyEntityPacket = new DestroyEntityPacket();
destroyEntityPacket.entityId = getEntityId();
player.getPlayerConnection().sendPacket(destroyEntityPacket);
player.getPlayerConnection().sendPacket(DestroyEntityPacket.of(getEntityId()));
player.viewableEntities.remove(this);
return true;
}

12
src/main/java/net/minestom/server/entity/Player.java
View File

@ -38,14 +38,14 @@ import net.minestom.server.event.player.*;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.message.ChatMessageType;
import net.minestom.server.message.ChatPosition;
import net.minestom.server.inventory.Inventory;
import net.minestom.server.inventory.PlayerInventory;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.item.metadata.WrittenBookMeta;
import net.minestom.server.listener.PlayerDiggingListener;
import net.minestom.server.message.ChatMessageType;
import net.minestom.server.message.ChatPosition;
import net.minestom.server.message.Messenger;
import net.minestom.server.network.ConnectionManager;
import net.minestom.server.network.ConnectionState;
@ -1224,12 +1224,10 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
*/
public synchronized void setSkin(@Nullable PlayerSkin skin) {
this.skin = skin;
if (instance == null)
return;
DestroyEntityPacket destroyEntityPacket = new DestroyEntityPacket();
destroyEntityPacket.entityId = getEntityId();
DestroyEntityPacket destroyEntityPacket = DestroyEntityPacket.of(getEntityId());
final PlayerInfoPacket removePlayerPacket = getRemovePlayerToList();
final PlayerInfoPacket addPlayerPacket = getAddPlayerToList();
@ -2226,7 +2224,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
public void refreshOnGround(boolean onGround) {
this.onGround = onGround;
if(this.onGround && this.isFlyingWithElytra()) {
if (this.onGround && this.isFlyingWithElytra()) {
this.setFlyingWithElytra(false);
this.callEvent(PlayerStopFlyingWithElytraEvent.class, new PlayerStopFlyingWithElytraEvent(this));
}
@ -2675,7 +2673,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
*
* @param locale the player locale
* @param viewDistance the player view distance
* @param chatMessageType the chat messages the player wishes to receive
* @param chatMessageType the chat messages the player wishes to receive
* @param chatColors if chat colors should be displayed
* @param displayedSkinParts the player displayed skin parts
* @param mainHand the player main hand

6
src/main/java/net/minestom/server/network/packet/server/play/DestroyEntityPacket.java
View File

@ -13,6 +13,12 @@ public class DestroyEntityPacket implements ServerPacket {
public DestroyEntityPacket() {
}
public static DestroyEntityPacket of(int entityId) {
DestroyEntityPacket packet = new DestroyEntityPacket();
packet.entityId = entityId;
return packet;
}
@Override
public void write(@NotNull BinaryWriter writer) {
writer.writeVarInt(entityId);