+ 解决 #10

Nova-Committee · Dec 24, 2023 · 3157fe8 · 3157fe8 · cnlimiter · Dec 24, 2023
1 parent 2e4a3e3
commit 3157fe8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/nova/committee/atom/sweep/core/Sweeper.java b/src/main/java/nova/committee/atom/sweep/core/Sweeper.java
@@ -2,6 +2,7 @@
 
 
 import lombok.val;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
@@ -151,7 +152,16 @@ private int cleanupEntity(ServerLevel world, Predicate<Entity> type, Predicate<E
                         .filter(additionalPredicate)
                         .forEach(
                                 entity -> {
-                                    entity.kill();
+                                    if (ModConfig.INSTANCE.getMob().isExpOn()) {
+                                        entity.kill();
+                                    } else {
+                                        //#if MC >= 11800
+                                        entity.discard();
+                                        //#else
+                                        //$$ entity.kill();
+                                        //#endif
+                                    }
+
                                     if (entity instanceof ItemEntity) {
                                         amount.getAndAdd(((ItemEntity) entity).getItem().getCount());
                                     } else {

diff --git a/src/main/java/nova/committee/atom/sweep/init/config/MobsConfig.java b/src/main/java/nova/committee/atom/sweep/init/config/MobsConfig.java
@@ -17,6 +17,8 @@
 public class MobsConfig extends AutoLoadTomlConfig {
     @TableField(rightComment = "生物实体清理功能（最高优先级）")
     private boolean isMobEntityCleanupEnable = true;
+    @TableField(rightComment = "生物清理是否掉落经验")
+    private boolean isExpOn = false;
     @TableField(rightComment = "动物实体清理功能（次级）")
     private boolean isAnimalEntitiesCleanupEnable = true;
     @TableField(rightComment = "怪物实体清理功能（次级）")
@@ -56,6 +58,14 @@ public void setMobEntityCleanupEnable(boolean mobEntityCleanupEnable) {
         isMobEntityCleanupEnable = mobEntityCleanupEnable;
     }
 
+    public boolean isExpOn() {
+        return isExpOn;
+    }
+
+    public void setExpOn(boolean expOn) {
+        isExpOn = expOn;
+    }
+
     public boolean isMobBlackMode() {
         return mobBlackMode;
     }