Fix #5, mobs may only join a raid if they can see the sky

rikka0w0 · May 29, 2022 · 789644d · 789644d
1 parent 8c8375c
commit 789644d
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 6 deletions.
diff --git a/fabric/gradle.properties b/fabric/gradle.properties
@@ -15,7 +15,7 @@ org.gradle.daemon=false
 	fabric_version=0.48.0+1.18.2
 
 # Mod Properties
-	mod_version = 3.3.3
+	mod_version = 3.3.4
 	dev_group = net.mobz
 	archives_base_name = mobz
 

diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 # MobZ (Reborn)
-A port of [Globox1997's MobZ](https://www.curseforge.com/minecraft/mc-mods/mobz), for Minecraft 1.18.1, 1.17.1, and 1.16.5. Supports both Forge and Fabric.
+A port of [Globox1997's MobZ](https://www.curseforge.com/minecraft/mc-mods/mobz), for Minecraft 1.18.2, 1.17.1, and 1.16.5. Supports both Forge and Fabric.
 
 1.16.5 only has Forge version, for 1.16.5 Fabric version, check out [the original MobZ](https://github.com/Globox1997/MobZ).
 

diff --git a/src/main/java/net/mobz/entity/Archer2Entity.java b/src/main/java/net/mobz/entity/Archer2Entity.java
@@ -71,6 +71,11 @@ public boolean checkSpawnObstruction(LevelReader view) {
 
     }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
+
     @Override
     protected void dropCustomDeathLoot(DamageSource damageSource_1, int int_1, boolean boolean_1) {
         return;

diff --git a/src/main/java/net/mobz/entity/ArcherEntity.java b/src/main/java/net/mobz/entity/ArcherEntity.java
@@ -96,15 +96,20 @@ protected void registerGoals() {
         this.targetSelector.addGoal(4, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(IceGolem.class));
     }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
+
     @Override
     public boolean checkSpawnObstruction(LevelReader view) {
         BlockPos blockunderentity = new BlockPos(this.getX(), this.getY() - 1, this.getZ());
         BlockPos posentity = new BlockPos(this.getX(), this.getY(), this.getZ());
         return view.isUnobstructed(this) && this.level.isDay() && !level.containsAnyLiquid(this.getBoundingBox())
+        		&& view.canSeeSky(blockunderentity)
                 && this.level.getBlockState(posentity).getBlock().isPossibleToRespawnInThis() && this.level
                         .getBlockState(blockunderentity).isValidSpawn(view, blockunderentity, MobZEntities.ARCHERENTITY.get())
                 && MobZ.configs.BowmanSpawn;
-
     }
 
 }
diff --git a/src/main/java/net/mobz/entity/DwarfEntity.java b/src/main/java/net/mobz/entity/DwarfEntity.java
@@ -104,4 +104,9 @@ public boolean checkSpawnObstruction(LevelReader view) {
                 && MobZ.configs.DwarfSpawn;
 
     }
+
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
 }
diff --git a/src/main/java/net/mobz/entity/Illusioner.java b/src/main/java/net/mobz/entity/Illusioner.java
@@ -45,6 +45,11 @@ protected SoundEvent getHurtSound(DamageSource damageSource_1) {
       return MobZSounds.ILLUHURTEVENT.get();
    }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
+
    @Override
    public boolean checkSpawnObstruction(LevelReader view) {
       BlockPos blockunderentity = new BlockPos(this.getX(), this.getY() - 1, this.getZ());

diff --git a/src/main/java/net/mobz/entity/IslandKing.java b/src/main/java/net/mobz/entity/IslandKing.java
@@ -121,4 +121,8 @@ public void attack(LivingEntity target, float f) {
     IslandKing.this.level.addFreshEntity(vexEntity);
   }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
 }
diff --git a/src/main/java/net/mobz/entity/IslandKnightNormal.java b/src/main/java/net/mobz/entity/IslandKnightNormal.java
@@ -83,4 +83,8 @@ protected SoundEvent getDeathSound() {
     return SoundEvents.PLAYER_DEATH;
   }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
 }
diff --git a/src/main/java/net/mobz/entity/IslandKnightSpecial2.java b/src/main/java/net/mobz/entity/IslandKnightSpecial2.java
@@ -95,4 +95,8 @@ public void doEnchantDamageEffects(LivingEntity attacker, Entity target) {
     }
   }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
 }
diff --git a/src/main/java/net/mobz/entity/Knight2Entity.java b/src/main/java/net/mobz/entity/Knight2Entity.java
@@ -108,4 +108,8 @@ public boolean checkSpawnObstruction(LevelReader view) {
 
     }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
 }
diff --git a/src/main/java/net/mobz/entity/Knight3Entity.java b/src/main/java/net/mobz/entity/Knight3Entity.java
@@ -97,6 +97,10 @@ public boolean checkSpawnObstruction(LevelReader view) {
                 && this.level.getBlockState(blockunderentity).isValidSpawn(view, blockunderentity,
                         MobZEntities.KNIGHT3ENTITY.get())
                 && MobZ.configs.EnderKnightSpawn;
-
     }
+
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
 }
diff --git a/src/main/java/net/mobz/entity/Knight5Entity.java b/src/main/java/net/mobz/entity/Knight5Entity.java
@@ -90,7 +90,10 @@ public boolean checkSpawnObstruction(LevelReader view) {
                 && this.level.getBlockState(blockunderentity).isValidSpawn(view, blockunderentity,
                         MobZEntities.KNIGHT5ENTITY.get())
                 && MobZ.configs.LordofDarknessSpawn;
-
     }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
 }
diff --git a/src/main/java/net/mobz/entity/Mage2Entity.java b/src/main/java/net/mobz/entity/Mage2Entity.java
@@ -90,9 +90,13 @@ public boolean checkSpawnObstruction(LevelReader view) {
             && this.level.getBlockState(posentity).getBlock().isPossibleToRespawnInThis()
             && this.level.getBlockState(blockunderentity).isValidSpawn(view, blockunderentity, MobZEntities.MAGE2ENTITY.get())
             && MobZ.configs.ZombieMageSpawn;
-
    }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
+
    @Override
    protected void defineSynchedData() {
       super.defineSynchedData();

diff --git a/src/main/java/net/mobz/entity/MageEntity.java b/src/main/java/net/mobz/entity/MageEntity.java
@@ -82,6 +82,11 @@ protected void registerGoals() {
       this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, IronGolem.class, false));
    }
 
+	@Override
+	public boolean canJoinRaid() {
+		return super.canJoinRaid() && this.level.canSeeSky(this.blockPosition());
+	}
+
    @Override
    protected void defineSynchedData() {
       super.defineSynchedData();