Merge pull request #9 from GTNewHorizons/fix/fakeplayer

neid compat attempt
GTNewHorizons · Aug 13, 2024 · 327fc7f · 327fc7f
2 parents 2fed41d + 73a4958
commit 327fc7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
@@ -73,7 +73,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
      * Indicates the maximum data value (inclusive) that can be used. A future
      * version of Minecraft may abolish block data values.
      */
-    public static final int MAX_DATA = 15;
+    public static int MAX_DATA = 15;
 
     // Instances of this class should be _as small as possible_ because there will
     // be millions of instances of this object.

diff --git a/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java b/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
@@ -37,6 +37,7 @@
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldVector;
+import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
 import com.sk89q.worldedit.extension.platform.Platform;
@@ -119,6 +120,10 @@ public void preInit(FMLPreInitializationEvent event) {
         FMLCommonHandler.instance()
             .bus()
             .register(ThreadSafeCache.getInstance());
+
+        if (Loader.isModLoaded("neid")) {
+            BaseBlock.MAX_DATA = (2 << 16) - 1;
+        }
     }
 
     @EventHandler