Merge branch 'version/7.2.x'

EngineHub · Aug 24, 2023 · 3b6fbaf · 3b6fbaf
2 parents f8144e5 + 18cc29a
commit 3b6fbaf
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java
@@ -19,10 +19,8 @@
 
 package com.sk89q.worldedit.blocks;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.IntTag;
 import com.sk89q.jnbt.ListTag;
 import com.sk89q.jnbt.NBTUtils;
 import com.sk89q.jnbt.ShortTag;
@@ -135,15 +133,11 @@ public CompoundTag getNbtData() {
         values.put("MaxNearbyEntities", new ShortTag(maxNearbyEntities));
         values.put("RequiredPlayerRange", new ShortTag(requiredPlayerRange));
         if (spawnData == null) {
-            values.put("SpawnData", new CompoundTag(ImmutableMap.of("id", new StringTag(mobType))));
+            values.put("SpawnData", new CompoundTag(ImmutableMap.of("entity", new CompoundTag(ImmutableMap.of("id", new StringTag(mobType))))));
         } else {
             values.put("SpawnData", new CompoundTag(spawnData.getValue()));
         }
-        if (spawnPotentials == null) {
-            values.put("SpawnPotentials", new ListTag(CompoundTag.class, ImmutableList.of(
-                    new CompoundTag(ImmutableMap.of("Weight", new IntTag(1), "Entity",
-                            new CompoundTag(ImmutableMap.of("id", new StringTag(mobType))))))));
-        } else {
+        if (spawnPotentials != null) {
             values.put("SpawnPotentials", new ListTag(CompoundTag.class, spawnPotentials.getValue()));
         }