Made fish spawn block require water on each side, instead of just 1

TeamMetallurgy · Apr 22, 2020 · e2ab670 · e2ab670
1 parent 7572278
commit e2ab670
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java b/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java
@@ -70,12 +70,12 @@ protected SoundEvent getFlopSound() {
 
     @Override
     @Nonnull
-    public EntitySize getSize(Pose pose) {
+    public EntitySize getSize(@Nonnull Pose pose) {
         return super.getSize(pose);
     }
 
     @Override
-    public void onCollideWithPlayer(PlayerEntity player) {
+    public void onCollideWithPlayer(@Nonnull PlayerEntity player) {
         super.onCollideWithPlayer(player);
         if (Objects.equals(this.getType().getRegistryName(), AquaItems.JELLYFISH.getRegistryName())) {
             if (this.isAlive()) {
@@ -88,8 +88,9 @@ public void onCollideWithPlayer(PlayerEntity player) {
     }
 
     public static boolean canSpawnHere(EntityType<? extends AbstractFishEntity> fish, IWorld world, SpawnReason spawnReason, BlockPos pos, Random random) {
-        boolean isNeighborWater = isSourceBlock(world, pos.north()) || isSourceBlock(world, pos.south()) || isSourceBlock(world, pos.west()) || isSourceBlock(world, pos.east());
-        return isSourceBlock(world, pos) && isNeighborWater;
+        boolean isAllNeighborsSource = isSourceBlock(world, pos.north()) && isSourceBlock(world, pos.south()) && isSourceBlock(world, pos.west()) && isSourceBlock(world, pos.east());
+        System.out.println(isSourceBlock(world, pos) && isAllNeighborsSource);
+        return isSourceBlock(world, pos) && isAllNeighborsSource;
     }
 
     private static boolean isSourceBlock(IWorld world, BlockPos pos) {