lol fixing bugs

Weever1337 · May 29, 2024 · 6cbc242 · 6cbc242
1 parent 8784669
commit 6cbc242
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/main/java/com/weever/rotp_cm/entity/CMoonEntity.java b/src/main/java/com/weever/rotp_cm/entity/CMoonEntity.java
@@ -126,18 +126,17 @@ else if ((user.isAlive() && this.getUserPower().getResolveLevel() == 0)
             IStandPower userPower = this.getUserPower();
             userPower.toggleSummon();
         } else if (this.isAtt()) {
-            if (this.getCurrentTaskAction() == ModStandsInit.UNSUMMON_STAND_ENTITY.get() && user instanceof PlayerEntity) {
-                this.setAttOrNot(false);
-            } else if (this.getCurrentTaskAction() == InitStands.CMOON_BLOCK.get() && user instanceof PlayerEntity) {
-                this.setAttOrNot(false);
+            if (this.getCurrentTaskAction() == ModStandsInit.UNSUMMON_STAND_ENTITY.get() && user instanceof PlayerEntity){
+                PlayerEntity player = (PlayerEntity) this.getUser ();
+                this.stopTask();
+                player.displayClientMessage(new TranslationTextComponent("jojo.message.action_condition.cant_control_stand"), true);
             }
             LivingEntity livingTarget = null;
 
             Entity curTarget = getCurrentTask().map(StandEntityTask::getTarget).orElse(ActionTarget.EMPTY).getEntity();
             if (curTarget instanceof LivingEntity && curTarget.isAlive() && curTarget.distanceToSqr(user) < range * range) {
                 livingTarget = (LivingEntity) curTarget;
-            }
-            else {
+            } else {
                 List<Entity> entitiesAround = this.level.getEntities(this, user.getBoundingBox().inflate(range),
                         entity -> (entity instanceof LivingEntity && this.checkTargets(entity)));
                 if (!entitiesAround.isEmpty()) {
@@ -187,8 +186,8 @@ else if (livingTarget.isDeadOrDying () && livingTarget.getMaxHealth () >= 20){
             if (isManuallyControlled()) {
                 if (user instanceof PlayerEntity) {
                     PlayerEntity player = (PlayerEntity) getUser();
-                    StandUtil.setManualControl(player, false, false);
-                    player.displayClientMessage(new TranslationTextComponent("jojo.message.action_condition.cant_control_stand"), true);
+                    //StandUtil.setManualControl(player, false, false);
+                    setAttOrNot(false);
                 }
             }
         } else if (this.isBarr()) {