Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-28 18:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run spotlessApply

Browse Source 
also set line endings to native, no more line conflict errors!
This commit is contained in:
KingRainbow44
2023-05-02 14:00:00 +01:00
parent 4f1136ce2d
commit d32f6982be
1426 changed files with 1307544 additions and 1212706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@@ -795,7 +795,7 @@ public final class Scene {
return true;
}
public void checkGroups() {
public synchronized void checkGroups() {
Set<Integer> visible =
this.players.stream()
.map(player -> this.getPlayerActiveGroups(player))
@@ -833,7 +833,7 @@ public final class Scene {
this.getScriptManager().loadBlockFromScript(block);
scriptManager.getLoadedGroupSetPerBlock().put(block.id, new HashSet<>());
Grasscutter.getLogger().trace("Scene {} Block {} loaded.", this.getId(), block.id);
Grasscutter.getLogger().debug("Scene {} Block {} loaded.", this.getId(), block.id);
}
public int loadDynamicGroup(int group_id) {
@@ -963,7 +963,7 @@ public final class Scene {
groupInstance = cachedInstance;
}
/* Don't load garbages
// Load garbages
var garbageGadgets = group.getGarbageGadgets();
if (garbageGadgets != null) {
@@ -973,7 +973,7 @@ public final class Scene {
.filter(Objects::nonNull)
.toList());
}
*/
// Load suites
// int suite = group.findInitSuiteIndex(0);
this.getScriptManager()
@@ -1014,7 +1014,7 @@ public final class Scene {
if (this.scriptManager.getLoadedGroupSetPerBlock().get(block.id).isEmpty()) {
this.scriptManager.getLoadedGroupSetPerBlock().remove(block.id);
Grasscutter.getLogger().trace("Scene {} Block {} is unloaded.", this.getId(), block.id);
Grasscutter.getLogger().debug("Scene {} Block {} is unloaded.", this.getId(), block.id);
}
this.broadcastPacket(new PacketGroupUnloadNotify(List.of(group_id)));

14
src/main/java/emu/grasscutter/game/world/World.java
View File

@@ -282,9 +282,7 @@ public class World implements Iterable<Player> {
teleportProps
.teleportTo(dungeonData.getStartPosition())
.teleportRot(dungeonData.getStartRotation());
teleportProps
.enterType(EnterType.ENTER_TYPE_DUNGEON)
.enterReason(EnterReason.DungeonEnter);
teleportProps.enterType(EnterType.ENTER_TYPE_DUNGEON).enterReason(EnterReason.DungeonEnter);
teleportProps.dungeonId(dungeonData.getId());
} else if (player.getSceneId() == sceneId) {
teleportProps.enterType(EnterType.ENTER_TYPE_GOTO);
@@ -504,10 +502,7 @@ public class World implements Iterable<Player> {
// Trigger script events.
this.players.forEach(
player ->
player
.getQuestManager()
.queueEvent(QuestContent.QUEST_CONTENT_GAME_TIME_TICK));
player -> player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_GAME_TIME_TICK));
}
/**
@@ -528,10 +523,7 @@ public class World implements Iterable<Player> {
// Update all players.
this.host.updatePlayerGameTime(currentWorldTime);
this.players.forEach(
player ->
player
.getQuestManager()
.queueEvent(QuestContent.QUEST_CONTENT_GAME_TIME_TICK));
player -> player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_GAME_TIME_TICK));
}
@Override