Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-22 11:53:29 +01:00
Code Issues Projects Releases Wiki Activity

possibly fixed chunk watch event stalling the chunk gen thread #84

Browse source
This commit is contained in:
Ellpeck 2020-03-01 19:25:39 +01:00
parent 24babcffe6
commit 34c205accf
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java
View file

@ -1,5 +1,7 @@
package de.ellpeck.naturesaura.events; package de.ellpeck.naturesaura.events;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
@ -9,7 +11,9 @@ import de.ellpeck.naturesaura.chunk.AuraChunkProvider;
import de.ellpeck.naturesaura.commands.CommandAura; import de.ellpeck.naturesaura.commands.CommandAura;
import de.ellpeck.naturesaura.misc.WorldData; import de.ellpeck.naturesaura.misc.WorldData;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.server.ChunkHolder; import net.minecraft.world.server.ChunkHolder;
@ -24,10 +28,13 @@ import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.List;
import java.util.UUID;
public class CommonEvents { public class CommonEvents {
private static final Method GET_LOADED_CHUNKS_METHOD = ObfuscationReflectionHelper.findMethod(ChunkManager.class, "func_223491_f"); private static final Method GET_LOADED_CHUNKS_METHOD = ObfuscationReflectionHelper.findMethod(ChunkManager.class, "func_223491_f");
private static final ListMultimap<UUID, ChunkPos> PENDING_AURA_CHUNKS = ArrayListMultimap.create();
@SubscribeEvent @SubscribeEvent
public void onChunkCapsAttach(AttachCapabilitiesEvent<Chunk> event) { public void onChunkCapsAttach(AttachCapabilitiesEvent<Chunk> event) {
@ -67,6 +74,11 @@ public class CommonEvents {
@SubscribeEvent @SubscribeEvent
public void onPlayerTick(TickEvent.PlayerTickEvent event) { public void onPlayerTick(TickEvent.PlayerTickEvent event) {
if (!event.player.world.isRemote && event.phase == TickEvent.Phase.END) { if (!event.player.world.isRemote && event.phase == TickEvent.Phase.END) {
if (event.player.world.getGameTime() % 10 == 0) {
List<ChunkPos> pending = PENDING_AURA_CHUNKS.get(event.player.getUniqueID());
pending.removeIf(p -> this.handleChunkWatchDeferred(event.player, p));
}
if (event.player.world.getGameTime() % 200 != 0) if (event.player.world.getGameTime() % 200 != 0)
return; return;
@ -80,12 +92,18 @@ public class CommonEvents {
@SubscribeEvent @SubscribeEvent
public void onChunkWatch(ChunkWatchEvent.Watch event) { public void onChunkWatch(ChunkWatchEvent.Watch event) {
Chunk chunk = event.getWorld().getChunk(event.getPos().x, event.getPos().z); PENDING_AURA_CHUNKS.put(event.getPlayer().getUniqueID(), event.getPos());
if (!chunk.getWorld().isRemote) { }
AuraChunk auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null);
if (auraChunk != null) private boolean handleChunkWatchDeferred(PlayerEntity player, ChunkPos pos) {
PacketHandler.sendTo(event.getPlayer(), auraChunk.makePacket()); Chunk chunk = Helper.getLoadedChunk(player.world, pos.x, pos.z);
} if (chunk == null)
return false;
AuraChunk auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null);
if (auraChunk == null)
return false;
PacketHandler.sendTo(player, auraChunk.makePacket());
return true;
} }
@SubscribeEvent @SubscribeEvent