Fixed LtxProgrammer#1130

Foxyas · Oct 31, 2024 · 927c928 · 927c928
1 parent ceb2ac0
commit 927c928
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/net/ltxprogrammer/changed/command/CommandPale.java b/src/main/java/net/ltxprogrammer/changed/command/CommandPale.java
@@ -15,9 +15,9 @@ public class CommandPale {
     public static void registerCommands(RegisterCommandsEvent event) {
         event.getDispatcher().register(Commands.literal("setpaleexposure").requires(p -> p.hasPermission(2))
                 .then(Commands.argument("player", EntityArgument.player())
-                        .then(Commands.argument("form", IntegerArgumentType.integer(0, 72000))
+                        .then(Commands.argument("exposure", IntegerArgumentType.integer(0, 72000))
                                 .executes(context -> {
-                                    Pale.setPaleExposure(EntityArgument.getPlayer(context, "player"), IntegerArgumentType.getInteger(context, "form"));
+                                    Pale.setPaleExposure(EntityArgument.getPlayer(context, "player"), IntegerArgumentType.getInteger(context, "exposure"));
                                     return Command.SINGLE_SUCCESS;
                                 })
                         )));

diff --git a/src/main/java/net/ltxprogrammer/changed/process/Pale.java b/src/main/java/net/ltxprogrammer/changed/process/Pale.java
@@ -53,6 +53,8 @@ public static void tickPaleExposure(Player player) {
 
         AtomicInteger localExposure = new AtomicInteger(0);
         player.level.getEntitiesOfClass(LivingEntity.class, new AABB(player.blockPosition()).inflate(1.5)).forEach(livingEntity -> {
+            if (player == livingEntity) return;
+
             if (livingEntity.getType().is(ChangedTags.EntityTypes.PALE_SMALL_EXPOSURE))
                 localExposure.addAndGet(1);
             else if (livingEntity.getType().is(ChangedTags.EntityTypes.PALE_LARGE_EXPOSURE))
@@ -82,15 +84,15 @@ else if (livingEntity instanceof Player otherPlayer) {
 
         // VVV effects VVV
         if (exposure >= THRESHOLD_MINIMAL_DAMAGE && exposure < THRESHOLD_SMALL_DAMAGE) {
-            if (exposure % 1200 == 0) { // 1/2 Heart per minute
+            if (exposure % 1200 < 5) { // 1/2 Heart per minute
                 player.hurt(ChangedDamageSources.PALE, 1f);
             }
         } else if (exposure >= THRESHOLD_SMALL_DAMAGE && exposure < THRESHOLD_LARGE_DAMAGE) {
-            if (exposure % 600 == 0) { // 1/2 Heart per 30 seconds
+            if (exposure % 600 < 5) { // 1/2 Heart per 30 seconds
                 player.hurt(ChangedDamageSources.PALE, 1f);
             }
         } else if (exposure >= THRESHOLD_LARGE_DAMAGE && exposure < THRESHOLD_DEATH) {
-            if (exposure % 300 == 0) { // 1 Heart per 15 seconds
+            if (exposure % 300 < 5) { // 1 Heart per 15 seconds
                 player.hurt(ChangedDamageSources.PALE, 2f);
             }
         } else if (exposure >= THRESHOLD_DEATH) {