Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-15 08:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

more trace

Browse Source
This commit is contained in:
KingRainbow44
2023-05-31 19:17:41 -04:00
parent 1269a0430e
commit 25b75b9691
3 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
View File

@@ -6,13 +6,9 @@ import emu.grasscutter.Grasscutter.ServerRunMode;
import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest; import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
import emu.grasscutter.database.DatabaseHelper; import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.Account; import emu.grasscutter.game.Account;
import emu.grasscutter.server.dispatch.IDispatcher; import emu.grasscutter.server.dispatch.*;
import emu.grasscutter.server.dispatch.PacketIds; import emu.grasscutter.server.http.objects.*;
import emu.grasscutter.server.http.objects.ComboTokenResJson; import emu.grasscutter.utils.*;
import emu.grasscutter.server.http.objects.LoginResultJson;
import emu.grasscutter.utils.DispatchUtils;
import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.Utils;
import io.javalin.http.ContentType; import io.javalin.http.ContentType;
import javax.crypto.Cipher; import javax.crypto.Cipher;
@@ -20,8 +16,7 @@ import java.nio.charset.StandardCharsets;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPrivateKey;
import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.PKCS8EncodedKeySpec;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.*;
import java.util.concurrent.TimeUnit;
import static emu.grasscutter.config.Configuration.ACCOUNT; import static emu.grasscutter.config.Configuration.ACCOUNT;
import static emu.grasscutter.utils.lang.Language.translate; import static emu.grasscutter.utils.lang.Language.translate;

21
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
View File

@@ -1,20 +1,14 @@
package emu.grasscutter.game.ability; package emu.grasscutter.game.ability;
import com.google.protobuf.ByteString; import com.google.protobuf.*;
import com.google.protobuf.InvalidProtocolBufferException;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData; import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.AbilityData; import emu.grasscutter.data.binout.*;
import emu.grasscutter.data.binout.AbilityMixinData;
import emu.grasscutter.data.binout.AbilityModifier;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction; import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.game.ability.actions.AbilityAction; import emu.grasscutter.game.ability.actions.*;
import emu.grasscutter.game.ability.actions.AbilityActionHandler; import emu.grasscutter.game.ability.mixins.*;
import emu.grasscutter.game.ability.mixins.AbilityMixin;
import emu.grasscutter.game.ability.mixins.AbilityMixinHandler;
import emu.grasscutter.game.entity.GameEntity; import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.player.BasePlayerManager; import emu.grasscutter.game.player.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry; import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
import emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddAbility; import emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddAbility;
import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange; import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange;
@@ -27,10 +21,7 @@ import lombok.Getter;
import org.reflections.Reflections; import org.reflections.Reflections;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.ExecutorService; import java.util.concurrent.*;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
public final class AbilityManager extends BasePlayerManager { public final class AbilityManager extends BasePlayerManager {

2
src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java
View File

@@ -45,7 +45,7 @@ public class ActionCreateGadget extends AbilityActionHandler {
entity.getScene().addEntity(entityCreated); entity.getScene().addEntity(entityCreated);
Grasscutter.getLogger() Grasscutter.getLogger()
.info( .trace(
"Gadget {} created at pos {} rot {}", "Gadget {} created at pos {} rot {}",
action.gadgetID, action.gadgetID,
entityCreated.getPosition(), entityCreated.getPosition(),