Merge branch 'version/7.2.x'

Euphillya · Feb 29, 2024 · 01a5916 · 01a5916
2 parents 98750e0 + 5511908
commit 01a5916
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts
@@ -2,6 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.minecraftforge.gradle.common.util.RunConfig
 import net.minecraftforge.gradle.userdev.UserDevExtension
 import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
+import org.spongepowered.asm.gradle.plugins.MixinExtension.ConfigureReobfTask
 
 plugins {
     id("net.minecraftforge.gradle")
@@ -73,6 +74,13 @@ configure<org.spongepowered.asm.gradle.plugins.MixinExtension> {
     config("worldedit-forge.mixins.json")
 }
 
+// Workaround until SpongePowered/MixinGradle#51 is merged
+afterEvaluate {
+    tasks.withType<ConfigureReobfTask>().configureEach {
+        dependsOn(tasks.compileJava)
+    }
+}
+
 configure<BasePluginExtension> {
     archivesName.set("${archivesName.get()}-mc$minecraftVersion")
 }

diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/net/handler/WECUIPacketHandler.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/net/handler/WECUIPacketHandler.java
@@ -46,6 +46,10 @@ public static void init() {
     }
 
     public static void onPacketData(CustomPayloadEvent event) {
+        if (event.getSource().isClientSide()) {
+            // Ignore client-side packets
+            return;
+        }
         ServerPlayer player = event.getSource().getSender();
         LocalSession session = ForgeWorldEdit.inst.getSession(player);
         String text = event.getPayload().toString(StandardCharsets.UTF_8);