Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change invasion spawn rules so that entities always spawn on ground. #326

Merged
merged 1 commit into from
Oct 31, 2024
+21 −9
Merged

Change invasion spawn rules so that entities always spawn on ground. #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions src/main/java/supersymmetry/api/event/MobHordeEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.ResourceLocation;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
Expand Down Expand Up @@ -73,7 +75,7 @@ public boolean run(EntityPlayer player) {
return run(player, playerData::addEntity);
}
public boolean run(EntityPlayer player, Consumer<UUID> uuidConsumer) {
int quantity = quantityMin + (int) (Math.random() * quantityMax);
int quantity = (int) (Math.random() * (quantityMax - quantityMin) + quantityMin);
boolean didSpawn = false;
if (hasToBeUnderground(player) || !canUsePods) {
for (int i = 0; i < quantity; i++) {
Expand Down Expand Up @@ -132,16 +134,26 @@ public boolean spawnMobWithPod(EntityPlayer player, Consumer<UUID> uuidConsumer)
public boolean spawnMobWithoutPod(EntityPlayer player, Consumer<UUID> uuidConsumer) {
EntityLiving mob = entitySupplier.apply(player);

for (int i = 0; i < 3; i++) {
for (int i = 0; i < 4; i++) {
double angle = Math.random() * 2 * Math.PI;
int x = (int) (player.posX + 15 * Math.cos(angle));
int z = (int) (player.posZ + 15 * Math.sin(angle));

mob.setPosition(x, player.posY - 5, z);
while ((!mob.getCanSpawnHere() || !mob.isNotColliding()) && mob.posY < player.posY + 12) {
mob.setPosition(x, mob.posY + 1, z);
int radius = 16 + (int) (20 * Math.random());
double x = (int) (player.posX + radius * Math.cos(angle)) + 0.5;
double z = (int) (player.posZ + radius * Math.sin(angle)) + 0.5;
double y = Math.floor(player.posY) + 7;
BlockPos pos = new BlockPos(x, y, z);
IBlockState blockstate = player.world.getBlockState(pos);
Block block = blockstate.getBlock();

mob.setPosition(x, y, z);
while ((!mob.getCanSpawnHere() || !mob.isNotColliding() || block.isAir(blockstate, player.world, pos))
&& (Math.abs(mob.posY - player.posY) < 8)) {
mob.setPosition(x, mob.posY - 1, z);
pos = new BlockPos(x, mob.posY - 1, z);
blockstate = player.world.getBlockState(pos);
block = blockstate.getBlock();
}
if (mob.posY < player.posY + 12) {

if ((Math.abs(mob.posY - player.posY) < 8) && !block.isAir(blockstate, player.world, pos)) {
player.world.spawnEntity(mob);
mob.enablePersistence();
uuidConsumer.accept(mob.getPersistentID());
Expand Down