Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 09:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-05-11 23:46:37 +00:00
parent e514095e8a
commit 45f4a9233d
6 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
View File

@@ -1,5 +1,7 @@
package emu.grasscutter.scripts;
import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import emu.grasscutter.Grasscutter;
@@ -26,14 +28,6 @@ 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;
@@ -41,8 +35,13 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
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;
public class SceneScriptManager {
private final Scene scene;
@@ -353,9 +352,9 @@ public class SceneScriptManager {
public synchronized void deregisterRegion(SceneRegion region) {
this.regions.values().stream()
.filter(r -> r.getMetaRegion().equals(region))
.findFirst()
.ifPresent(entityRegion -> this.regions.remove(entityRegion.getId()));
.filter(r -> r.getMetaRegion().equals(region))
.findFirst()
.ifPresent(entityRegion -> this.regions.remove(entityRegion.getId()));
}
public Map<Integer, Set<SceneGroup>> getLoadedGroupSetPerBlock() {

3
src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
View File

@@ -2,9 +2,8 @@ package emu.grasscutter.scripts.data;
import emu.grasscutter.scripts.constants.ScriptRegionShape;
import emu.grasscutter.utils.Position;
import lombok.Setter;
import java.util.List;
import lombok.Setter;
@Setter
public class SceneRegion {