Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-20 08:59:49 +08:00
Code Issues Projects Releases Wiki Activity

Fix region removal checking

Browse Source
This commit is contained in:
KingRainbow44
2023-01-25 14:00:00 +01:00
Unverified
parent 5cd9d3a26d
commit e514095e8a
3 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
+14 -12
View File
@@ -1,7 +1,5 @@
package emu.grasscutter.scripts;
import static emu.grasscutter.scripts.constants.EventType.*;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import emu.grasscutter.Grasscutter;
@@ -28,6 +26,14 @@ import emu.grasscutter.utils.Position;
import io.netty.util.concurrent.FastThreadLocalThread;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import kotlin.Pair;
import lombok.val;
import org.luaj.vm2.LuaError;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.file.Files;
@@ -35,13 +41,8 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import kotlin.Pair;
import lombok.val;
import org.luaj.vm2.LuaError;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
public class SceneScriptManager {
private final Scene scene;
@@ -351,9 +352,10 @@ public class SceneScriptManager {
}
public synchronized void deregisterRegion(SceneRegion region) {
var instance =
regions.values().stream().filter(r -> r.getConfigId() == region.config_id).findFirst();
instance.ifPresent(entityRegion -> regions.remove(entityRegion.getId()));
this.regions.values().stream()
.filter(r -> r.getMetaRegion().equals(region))
.findFirst()
.ifPresent(entityRegion -> this.regions.remove(entityRegion.getId()));
}
public Map<Integer, Set<SceneGroup>> getLoadedGroupSetPerBlock() {