From 37708e68ff417db797ba3fe88bcf82edab4843d9 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sat, 18 Jul 2020 11:37:09 +0800 Subject: [PATCH] Fix #24. --- .../common/mixin/core/entity/item/ItemEntityMixin.java | 3 ++- .../core/network/play/ServerPlayNetHandlerMixin.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java index f408c555..5a5fa88e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java @@ -1,6 +1,5 @@ package io.izzel.arclight.common.mixin.core.entity.item; -import com.google.common.base.Preconditions; import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; @@ -111,10 +110,12 @@ public abstract class ItemEntityMixin extends EntityMixin { } } + /* #24 @Inject(method = "setItem", at = @At("HEAD")) private void arclight$noAirDrops(ItemStack stack, CallbackInfo ci) { Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); } + */ @Inject(method = "setItem", at = @At("RETURN")) private void arclight$markDirty(ItemStack stack, CallbackInfo ci) { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java index 57010b0f..7859e631 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java @@ -971,12 +971,12 @@ public abstract class ServerPlayNetHandlerMixin implements ServerPlayNetHandlerB if (component == null) return null; Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component)); if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) { - for (Object player : minecraftServer.getPlayerList().players) { + for (ServerPlayerEntity player : minecraftServer.getPlayerList().players) { ((ServerPlayerEntityBridge) player).bridge$sendMessage(component); } } else { for (Player player2 : queueEvent.getRecipients()) { - ((ServerPlayerEntityBridge) player2).bridge$sendMessage(component); + ((ServerPlayerEntityBridge) ((CraftPlayer) player2).getHandle()).bridge$sendMessage(component); } } return null; @@ -1012,12 +1012,12 @@ public abstract class ServerPlayNetHandlerMixin implements ServerPlayNetHandlerB if (component == null) return null; Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component)); if (((LazyPlayerSet) event.getRecipients()).isLazy()) { - for (Object recipient : minecraftServer.getPlayerList().players) { + for (ServerPlayerEntity recipient : minecraftServer.getPlayerList().players) { ((ServerPlayerEntityBridge) recipient).bridge$sendMessage(component); } } else { for (Player recipient2 : event.getRecipients()) { - ((ServerPlayerEntityBridge) recipient2).bridge$sendMessage(component); + ((ServerPlayerEntityBridge) ((CraftPlayer) recipient2).getHandle()).bridge$sendMessage(component); } } return null;