currently not fixed codes

Grasscutters · Dec 13, 2022 · 56be55f · 56be55f
1 parent 2051a83
commit 56be55f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java b/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
@@ -76,8 +76,8 @@ public ActivityInfoOuterClass.ActivityInfo toProto(PlayerActivityData playerActi
             .setBeginTime(DateHelper.getUnixTime(activityConfigItem.getBeginTime()))
             .setFirstDayStartTime(DateHelper.getUnixTime(activityConfigItem.getBeginTime()))
             .setEndTime(DateHelper.getUnixTime(activityConfigItem.getEndTime()))
-            .addAllMeetCondList(activityConfigItem.getMeetCondList());
-
+//            .addAllMeetCondList(activityConfigItem.getMeetCondList())
+            ;
         if (playerActivityData != null){
             proto.addAllWatcherInfoList(playerActivityData.getAllWatcherInfoList());
         }

diff --git a/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java
@@ -45,7 +45,7 @@ public EntityClientGadget(Scene scene, Player player, EvtCreateGadgetNotify noti
         this.campType = notify.getCampType();
         this.ownerEntityId = notify.getPropOwnerEntityId();
         this.targetEntityId = notify.getTargetEntityId();
-        this.asyncLoad = notify.getIsAsyncLoad();
+//        this.asyncLoad = notify.getIsAsyncLoad();
 
         GameEntity owner = scene.getEntityById(this.ownerEntityId);
         if (owner instanceof EntityClientGadget ownerGadget) {

diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCombineRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCombineRsp.java
@@ -45,9 +45,9 @@ public PacketCombineRsp(CombineReqOuterClass.CombineReq combineReq,
                 .setAvatarGuid(combineReq.getAvatarGuid())
                 .addAllCostItemList(costItemList)
                 .addAllResultItemList(resultItemList)
-                .addAllTotalRandomItemList(totalRandomItemList)
-                .addAllTotalReturnItemList(totalReturnItemList)
-                .addAllTotalExtraItemList(totalExtraItemList)
+//                .addAllTotalRandomItemList(totalRandomItemList)
+//                .addAllTotalReturnItemList(totalReturnItemList)
+//                .addAllTotalExtraItemList(totalExtraItemList)
                 .build();
 
         this.setData(proto);

diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketEntityAiSyncNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketEntityAiSyncNotify.java
@@ -6,16 +6,18 @@
 import emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify;
 
 public class PacketEntityAiSyncNotify extends BasePacket {
-	
+
 	public PacketEntityAiSyncNotify(EntityAiSyncNotify notify) {
 		super(PacketOpcodes.EntityAiSyncNotify, true);
-		
+
 		EntityAiSyncNotify.Builder proto = EntityAiSyncNotify.newBuilder();
-		
+
 		for (int monsterId : notify.getLocalAvatarAlertedMonsterListList()) {
-			proto.addInfoList(AiSyncInfo.newBuilder().setEntityId(monsterId).setHasPathToTarget(true));
-		}
-
+			proto.addInfoList(AiSyncInfo.newBuilder().setEntityId(monsterId)
+                //.setHasPathToTarget(true)
+            );
+        }
+
 		this.setData(proto);
 	}
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java
@@ -43,7 +43,7 @@ public PacketGetPlayerTokenRsp(GameSession session, int retcode, String msg, int
             .setIsProficientPlayer(session.getPlayer().getAvatars().getAvatarCount() > 0)
             .setRetcode(retcode)
             .setMsg(msg)
-            .setBlackUidEndTime(blackEndTime)
+//            .setBlackUidEndTime(blackEndTime)
             .setRegPlatform(3)
             .setCountryCode("US")
             .setClientIpStr(session.getAddress().getAddress().getHostAddress())
@@ -70,8 +70,8 @@ public PacketGetPlayerTokenRsp(GameSession session, String encryptedSeed, String
             .setClientVersionRandomKey("c25-314dd05b0b5f")
             .setRegPlatform(3)
             .setClientIpStr(session.getAddress().getAddress().getHostAddress())
-            .setEncryptedSeed(encryptedSeed)
-            .setSeedSignature(encryptedSeedSign)
+            .setServerRandKey(encryptedSeed)
+            .setSign(encryptedSeedSign)
             .build();
 
         this.setData(p.toByteArray());

diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java
@@ -44,7 +44,8 @@ public PacketGetShopRsp(Player inv, int shopType) {
                         .setMaxLevel(info.getMaxLevel())
                         .setMcoin(info.getMcoin())
                         .setDisableType(info.getDisableType())
-                        .setSecondarySheetId(info.getSecondarySheetId());
+//                        .setSecondarySheetId(info.getSecondarySheetId())
+                        ;
                 if (info.getCostItemList() != null) {
                     goods.addAllCostItemList(info.getCostItemList().stream().map(x -> ItemParamOuterClass.ItemParam.newBuilder().setItemId(x.getId()).setCount(x.getCount()).build()).collect(Collectors.toList()));
                 }

diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java
@@ -6,17 +6,17 @@
 import emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify;
 
 public class PacketProudSkillExtraLevelNotify extends BasePacket {
-	
+
 	public PacketProudSkillExtraLevelNotify(Avatar avatar, int talentIndex) {
 		super(PacketOpcodes.ProudSkillExtraLevelNotify);
 
 		ProudSkillExtraLevelNotify proto = ProudSkillExtraLevelNotify.newBuilder()
 				.setAvatarGuid(avatar.getGuid())
-				.setTalentType(3) // Talent type = 3
-				.setTalentIndex(talentIndex)
-				.setExtraLevel(3)
+//				.setTalentType(3) // Talent type = 3
+//				.setTalentIndex(talentIndex)
+//				.setExtraLevel(3)
 				.build();
-		
+
 		this.setData(proto);
 	}
 }