From 99b3084a565e6c5bd954b308d045c3a8417ee86a Mon Sep 17 00:00:00 2001 From: makeo Date: Tue, 10 Nov 2015 16:48:24 +0100 Subject: [PATCH] Added "event" if the boss is killed --- .../tiles/TileOverrideEldritchLock.java | 36 +++++++++++++++++-- .../common/utils/world/TCMazeHandler.java | 4 +++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java index cb95889..7f2b8df 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java @@ -1,6 +1,8 @@ package makeo.gadomancy.common.blocks.tiles; import makeo.gadomancy.common.utils.world.TCMazeHandler; +import makeo.gadomancy.common.utils.world.TCMazeSession; +import net.minecraft.entity.Entity; import thaumcraft.common.lib.world.dim.CellLoc; import thaumcraft.common.lib.world.dim.MazeHandler; import thaumcraft.common.tiles.TileEldritchLock; @@ -16,19 +18,49 @@ import java.util.concurrent.ConcurrentHashMap; * Created by makeo @ 09.11.2015 21:20 */ public class TileOverrideEldritchLock extends TileEldritchLock { + private int count = 0; + private Entity[] bosses = null; + @Override public void updateEntity() { if (!this.worldObj.isRemote) { - if (this.count != -1) { - if (this.count + 1 > 100) { + if (super.count != -1) { + if (super.count + 1 > 100) { ConcurrentHashMap old = MazeHandler.labyrinth; MazeHandler.labyrinth = TCMazeHandler.labyrinthCopy; + + int nextEntityId = Entity.nextEntityID; + super.updateEntity(); + + int count = Entity.nextEntityID - nextEntityId; + bosses = new Entity[count]; + for(int i = 0; i < count; i++) { + bosses[i] = worldObj.getEntityByID(nextEntityId + i); + } + MazeHandler.labyrinth = old; return; } } } + super.updateEntity(); + + if(bosses != null && ++count % 20 == 0) { + for(Entity entity : bosses) { + if(entity != null && !entity.isDead) { + return; + } + } + + for(TCMazeSession session : TCMazeHandler.getSessions().values()) { + if(session.chunksAffected != null && session.chunksAffected.containsKey(new CellLoc(xCoord >> 4, zCoord >> 4))) { + TCMazeHandler.handleBossFinish(session); + break; + } + } + bosses = null; + } } } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java index 8bbe615..3b01987 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java @@ -176,6 +176,10 @@ public class TCMazeHandler { } } + public static Map getSessions() { + return runningSessions; + } + public static void free(Map locations) { if (locations == null) return; for (CellLoc loc : locations.keySet()) {