Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #24.

Browse Source
This commit is contained in:
IzzelAliz 2020-07-18 11:37:09 +08:00
parent 89c108d1f3
commit 37708e68ff
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/ItemEntityMixin.java
View File

@ -1,6 +1,5 @@
package io.izzel.arclight.common.mixin.core.entity.item; 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.LivingEntityBridge;
import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge;
import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; 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")) @Inject(method = "setItem", at = @At("HEAD"))
private void arclight$noAirDrops(ItemStack stack, CallbackInfo ci) { private void arclight$noAirDrops(ItemStack stack, CallbackInfo ci) {
Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air");
} }
*/
@Inject(method = "setItem", at = @At("RETURN")) @Inject(method = "setItem", at = @At("RETURN"))
private void arclight$markDirty(ItemStack stack, CallbackInfo ci) { private void arclight$markDirty(ItemStack stack, CallbackInfo ci) {

8
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/play/ServerPlayNetHandlerMixin.java
View File

@ -971,12 +971,12 @@ public abstract class ServerPlayNetHandlerMixin implements ServerPlayNetHandlerB
if (component == null) return null; if (component == null) return null;
Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component)); Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component));
if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) { if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
for (Object player : minecraftServer.getPlayerList().players) { for (ServerPlayerEntity player : minecraftServer.getPlayerList().players) {
((ServerPlayerEntityBridge) player).bridge$sendMessage(component); ((ServerPlayerEntityBridge) player).bridge$sendMessage(component);
} }
} else { } else {
for (Player player2 : queueEvent.getRecipients()) { for (Player player2 : queueEvent.getRecipients()) {
((ServerPlayerEntityBridge) player2).bridge$sendMessage(component); ((ServerPlayerEntityBridge) ((CraftPlayer) player2).getHandle()).bridge$sendMessage(component);
} }
} }
return null; return null;
@ -1012,12 +1012,12 @@ public abstract class ServerPlayNetHandlerMixin implements ServerPlayNetHandlerB
if (component == null) return null; if (component == null) return null;
Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component)); Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component));
if (((LazyPlayerSet) event.getRecipients()).isLazy()) { if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) { for (ServerPlayerEntity recipient : minecraftServer.getPlayerList().players) {
((ServerPlayerEntityBridge) recipient).bridge$sendMessage(component); ((ServerPlayerEntityBridge) recipient).bridge$sendMessage(component);
} }
} else { } else {
for (Player recipient2 : event.getRecipients()) { for (Player recipient2 : event.getRecipients()) {
((ServerPlayerEntityBridge) recipient2).bridge$sendMessage(component); ((ServerPlayerEntityBridge) ((CraftPlayer) recipient2).getHandle()).bridge$sendMessage(component);
} }
} }
return null; return null;