From 6bec00ab573702e23e14c3dd99c5b0b69d1d9d05 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 16 Feb 2019 21:30:19 +0200
Subject: [PATCH] Fixed rainbows spawning too close together (they just have to
 fight it out)

---
 .../unicopia/entity/EntityRainbow.java        | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java
index e9034c85..d08fbef3 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java
@@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.entity;
 
 import com.minelittlepony.unicopia.Race;
 
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.effect.EntityWeatherEffect;
 import net.minecraft.nbt.NBTTagCompound;
@@ -22,6 +23,11 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
     public static final int RAINBOW_MAX_SIZE = 180;
     public static final int RAINBOW_MIN_SIZE = 50;
 
+    public static final AxisAlignedBB SPAWN_COLLISSION_RADIUS = new AxisAlignedBB(
+            -RAINBOW_MAX_SIZE, -RAINBOW_MAX_SIZE, -RAINBOW_MAX_SIZE,
+             RAINBOW_MAX_SIZE,  RAINBOW_MAX_SIZE,  RAINBOW_MAX_SIZE
+     ).grow(RAINBOW_MAX_SIZE);
+
     public EntityRainbow(World world) {
         this(world, 0, 0, 0);
     }
@@ -85,6 +91,19 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
         if (ticksAlive-- <= 0) {
             setDead();
         }
+
+        if (!isDead) {
+            AxisAlignedBB bounds = SPAWN_COLLISSION_RADIUS.offset(getPosition());
+
+            world.getEntitiesWithinAABB(EntityRainbow.class, bounds).forEach(this::attackCompetitor);
+            world.getEntitiesWithinAABB(EntityRainbow.Spawner.class, bounds).forEach(this::attackCompetitor);
+        }
+    }
+
+    private void attackCompetitor(Entity other) {
+        if (other != this) {
+            other.setDead();
+        }
     }
 
     @Override
@@ -101,11 +120,6 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
 
     public static class Spawner extends EntityLiving {
 
-        public static final AxisAlignedBB SPAWN_COLLISSION_RADIUS = new AxisAlignedBB(
-                -RAINBOW_MAX_SIZE, -RAINBOW_MAX_SIZE, -RAINBOW_MAX_SIZE,
-                 RAINBOW_MAX_SIZE,  RAINBOW_MAX_SIZE,  RAINBOW_MAX_SIZE
-         );
-
         public Spawner(World worldIn) {
             super(worldIn);
             this.setInvisible(true);
@@ -113,11 +127,11 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
 
         @Override
         public boolean getCanSpawnHere() {
-            if (super.getCanSpawnHere()) {
-                return world.getEntitiesWithinAABB(EntityRainbow.class, SPAWN_COLLISSION_RADIUS.offset(getPosition())).size() == 0;
-            }
+            AxisAlignedBB bounds = SPAWN_COLLISSION_RADIUS.offset(getPosition());
 
-            return false;
+            return super.getCanSpawnHere()
+                    && world.getEntitiesWithinAABB(EntityRainbow.class, bounds).isEmpty()
+                    && world.getEntitiesWithinAABB(EntityRainbow.Spawner.class, bounds).isEmpty();
         }
 
         @Override
@@ -128,8 +142,13 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
         @Override
         public void onUpdate() {
             super.onUpdate();
-            setDead();
+            if (!this.dead) {
+                setDead();
+                trySpawnRainbow();
+            }
+        }
 
+        public void trySpawnRainbow() {
             EntityRainbow rainbow = new EntityRainbow(world);
             rainbow.setPosition(posX, posY, posZ);
             world.spawnEntity(rainbow);