From cd641029c3c132e8bb8bf0a4af813e7e0a0cf3ef Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 7 Nov 2020 03:39:15 +0800 Subject: [PATCH] We forgot to add player into ChatEvent#SERVER --- .../java/me/shedaniel/architectury/event/events/ChatEvent.java | 3 ++- .../mixin/fabric/MixinServerGamePacketListenerImpl.java | 2 +- .../shedaniel/architectury/event/forge/EventFactoryImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/me/shedaniel/architectury/event/events/ChatEvent.java b/common/src/main/java/me/shedaniel/architectury/event/events/ChatEvent.java index 269697c2..dfc92fc5 100644 --- a/common/src/main/java/me/shedaniel/architectury/event/events/ChatEvent.java +++ b/common/src/main/java/me/shedaniel/architectury/event/events/ChatEvent.java @@ -22,6 +22,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResultHolder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,6 +57,6 @@ public interface ChatEvent { interface Server { @NotNull - InteractionResultHolder process(String message, Component component); + InteractionResultHolder process(ServerPlayer player, String message, Component component); } } diff --git a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java index 8c9869e2..e7dccb25 100644 --- a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java +++ b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java @@ -51,7 +51,7 @@ public abstract class MixinServerGamePacketListenerImpl { private void handleChat(ServerboundChatPacket packet, CallbackInfo ci) { String string = StringUtils.normalizeSpace(packet.getMessage()); Component component = new TranslatableComponent("chat.type.text", this.player.getDisplayName(), string); - InteractionResultHolder process = ChatEvent.SERVER.invoker().process(string, component); + InteractionResultHolder process = ChatEvent.SERVER.invoker().process(this.player, string, component); if (process.getResult() == InteractionResult.FAIL) ci.cancel(); else if (process.getObject() != null && !process.getObject().equals(component)) { diff --git a/forge/src/main/java/me/shedaniel/architectury/event/forge/EventFactoryImpl.java b/forge/src/main/java/me/shedaniel/architectury/event/forge/EventFactoryImpl.java index 4114d747..266d046f 100644 --- a/forge/src/main/java/me/shedaniel/architectury/event/forge/EventFactoryImpl.java +++ b/forge/src/main/java/me/shedaniel/architectury/event/forge/EventFactoryImpl.java @@ -227,7 +227,7 @@ public class EventFactoryImpl implements EventFactory.Impl { @SubscribeEvent public static void event(ServerChatEvent event) { - ActionResult process = ChatEvent.SERVER.invoker().process(event.getMessage(), event.getComponent()); + ActionResult process = ChatEvent.SERVER.invoker().process(event.getPlayer(), event.getMessage(), event.getComponent()); if (process.getObject() != null) event.setComponent(process.getObject()); if (process.getResult() == ActionResultType.FAIL)