Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround for MinecraftForge#7519

Browse Source
This commit is contained in:
IzzelAliz 2021-01-24 01:22:21 +08:00
parent 678786d426
commit f0b4f82f1f
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeInternalHandlerMixin.java
View File

@ -2,7 +2,12 @@ package io.izzel.arclight.common.mixin.forge;
import io.izzel.arclight.common.mod.util.ArclightCaptures; import io.izzel.arclight.common.mod.util.ArclightCaptures;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.util.concurrent.TickDelayedTask;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.IChunk;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.common.ForgeInternalHandler; import net.minecraftforge.common.ForgeInternalHandler;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -15,8 +20,15 @@ public class ForgeInternalHandlerMixin {
// Workaround for MinecraftForge#7519 // Workaround for MinecraftForge#7519
@Redirect(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;addEntity(Lnet/minecraft/entity/Entity;)Z")) @Redirect(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;addEntity(Lnet/minecraft/entity/Entity;)Z"))
private boolean arclight$addDuringWorldGen(World world, Entity entityIn) { private boolean arclight$addDuringWorldGen(World world, Entity entityIn) {
return world instanceof ServerWorld && ArclightCaptures.isWorldGenAdd() if (world instanceof ServerWorld && ArclightCaptures.isWorldGenAdd()) {
? ((ServerWorld) world).addEntityIfNotDuplicate(entityIn) world.getServer().enqueue(new TickDelayedTask(world.getServer().getTickCounter(), () -> {
: world.addEntity(entityIn); IChunk ichunk = world.getChunk(MathHelper.floor(entityIn.getPosX() / 16.0D), MathHelper.floor(entityIn.getPosZ() / 16.0D), ChunkStatus.FULL, entityIn.forceSpawn);
if (ichunk instanceof Chunk) {
ichunk.addEntity(entityIn);
}
}));
return ((ServerWorld) world).addEntityIfNotDuplicate(entityIn);
}
return world.addEntity(entityIn);
} }
} }