Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-25 09:02:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-05-30 19:40:39 +00:00
parent 36a35c11aa
commit c69a889e66
13 changed files with 145 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/emu/grasscutter/game/ability/actions/AbilityActionHandler.java
View File

@@ -22,12 +22,13 @@ public abstract class AbilityActionHandler {
default -> throw new RuntimeException("Unknown target type: " + target);
case "Self" -> entity;
case "Team" -> ability.getPlayerOwner().getTeamManager().getEntity();
case "OriginOwner" -> ability.getPlayerOwner()
.getTeamManager().getCurrentAvatarEntity();
case "OriginOwner" -> ability.getPlayerOwner().getTeamManager().getCurrentAvatarEntity();
case "Owner" -> ability.getOwner();
case "Applier" -> entity; // TODO: Validate.
case "CurLocalAvatar" -> ability.getPlayerOwner()
.getTeamManager().getCurrentAvatarEntity(); // TODO: Validate.
case "CurLocalAvatar" -> ability
.getPlayerOwner()
.getTeamManager()
.getCurrentAvatarEntity(); // TODO: Validate.
case "CasterOriginOwner" -> null; // TODO: Figure out.
};
}

3
src/main/java/emu/grasscutter/game/ability/actions/ActionCopyGlobalValue.java
View File

@@ -9,7 +9,8 @@ import emu.grasscutter.game.entity.GameEntity;
@AbilityAction(AbilityModifierAction.Type.CopyGlobalValue)
public final class ActionCopyGlobalValue extends AbilityActionHandler {
@Override
public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity entity) {
public boolean execute(
Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity entity) {
// Get the entities referred to.
var source = this.getTarget(ability, entity, action.srcTarget);
var destination = this.getTarget(ability, entity, action.dstTarget);

5
src/main/java/emu/grasscutter/game/inventory/Inventory.java
View File

@@ -1,5 +1,7 @@
package emu.grasscutter.game.inventory;
import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.common.ItemParamData;
@@ -20,14 +22,11 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
private final Long2ObjectMap<GameItem> store;
private final Int2ObjectMap<InventoryTab> inventoryTypes;

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

@@ -41,15 +41,14 @@ import emu.grasscutter.server.event.player.PlayerTeleportEvent;
import emu.grasscutter.server.packet.send.*;
import emu.grasscutter.utils.objects.KahnsSort;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
import javax.annotation.Nullable;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
public final class Scene {
@Getter private final World world;