Skip to content

Commit 16847e9

Browse files
author
HongchengQ
committed
fix: build errors
1 parent 487c56c commit 16847e9

File tree

5 files changed

+25
-38
lines changed

5 files changed

+25
-38
lines changed

src/main/java/emu/grasscutter/game/ability/AbilityManager.java

+17-30
Original file line numberDiff line numberDiff line change
@@ -222,20 +222,20 @@ public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
222222
}
223223

224224
switch (invoke.getArgumentType()) {
225-
case ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM -> this.handleOverrideParam(invoke);
226-
case ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP -> this.handleReinitOverrideMap(invoke);
227-
case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE -> this.handleModifierChange(invoke);
228-
case ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA -> this.handleMixinCostStamina(invoke);
229-
case ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL -> this.handleGenerateElemBall(invoke);
230-
case ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE -> this.handleGlobalFloatValue(invoke);
231-
case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE -> this
232-
.handleModifierDurabilityChange(invoke);
233-
case ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY -> this.handleAddNewAbility(invoke);
234-
case ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE -> this.handleKillState(invoke);
225+
case ABILITY_META_OVERRIDE_PARAM -> this.handleOverrideParam(invoke);
226+
case ABILITY_META_REINIT_OVERRIDEMAP -> this.handleReinitOverrideMap(invoke);
227+
case ABILITY_META_MODIFIER_CHANGE -> this.handleModifierChange(invoke);
228+
case ABILITY_MIXIN_COST_STAMINA -> this.handleMixinCostStamina(invoke);
229+
case ABILITY_ACTION_GENERATE_ELEM_BALL -> this.handleGenerateElemBall(invoke);
230+
case ABILITY_META_GLOBAL_FLOAT_VALUE -> this.handleGlobalFloatValue(invoke);
231+
case ABILITY_META_MODIFIER_DURABILITY_CHANGE -> this
232+
.handleModifierDurabilityChange(invoke);
233+
case ABILITY_META_ADD_NEW_ABILITY -> this.handleAddNewAbility(invoke);
234+
case ABILITY_META_SET_KILLED_SETATE -> this.handleKillState(invoke);
235235
default -> {
236236
if (DebugConstants.LOG_MISSING_ABILITIES) {
237237
Grasscutter.getLogger()
238-
.trace("Missing invoke handler for ability {}.", invoke.getArgumentType().name());
238+
.trace("Missing invoke handler for ability {}.", invoke.getArgumentType().name());
239239
}
240240
}
241241
}
@@ -361,12 +361,6 @@ public void onSkillEnd(Player player) {
361361
}
362362

363363
private void setAbilityOverrideValue(Ability ability, AbilityScalarValueEntry valueChange) {
364-
if (valueChange.getValueType() != AbilityScalarType.ABILITY_SCALAR_TYPE_FLOAT) {
365-
Grasscutter.getLogger().trace("Scalar type not supported: {}", valueChange.getValueType());
366-
367-
return;
368-
}
369-
370364
if (!valueChange.getKey().hasStr()) {
371365
Grasscutter.getLogger().trace("TODO: Calculate all the ability value hashes");
372366

@@ -542,12 +536,12 @@ private void handleGenerateElemBall(AbilityInvokeEntry invoke)
542536
throws InvalidProtocolBufferException {}
543537

544538
private void handleGlobalFloatValue(AbilityInvokeEntry invoke)
545-
throws InvalidProtocolBufferException {
539+
throws InvalidProtocolBufferException {
546540
var entity = this.player.getScene().getEntityById(invoke.getEntityId());
547541
if (entity == null) return;
548542

549543
var entry = AbilityScalarValueEntry.parseFrom(invoke.getAbilityData());
550-
if (entry == null || !entry.hasFloatValue()) return;
544+
if (entry == null) return;
551545

552546
String key = null;
553547
if (entry.getKey().hasStr()) key = entry.getKey().getStr();
@@ -557,17 +551,10 @@ else if (entry.getKey().hasHash())
557551
if (key == null) return;
558552

559553
if (key.startsWith("SGV_")) return; // Server does not allow to change this variables I think
560-
switch (entry.getValueType().getNumber()) {
561-
case AbilityScalarType.ABILITY_SCALAR_TYPE_FLOAT_VALUE -> {
562-
if (!Float.isNaN(entry.getFloatValue()))
563-
entity.getGlobalAbilityValues().put(key, entry.getFloatValue());
564-
}
565-
case AbilityScalarType.ABILITY_SCALAR_TYPE_UINT_VALUE -> entity
566-
.getGlobalAbilityValues()
567-
.put(key, (float) entry.getUintValue());
568-
default -> {
569-
return;
570-
}
554+
if (!Float.isNaN(entry.getFloatValue())) {
555+
entity.getGlobalAbilityValues().put(key, entry.getFloatValue());
556+
} else {
557+
return;
571558
}
572559

573560
entity.onAbilityValueUpdate();

src/main/java/emu/grasscutter/game/entity/EntityAvatar.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public float heal(float amount, boolean mute) {
160160
mute
161161
? PropChangeReason.PROP_CHANGE_REASON_NONE
162162
: PropChangeReason.PROP_CHANGE_REASON_ABILITY,
163-
ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY));
163+
ChangeHpReason.CHANGE_HP_ADD_ABILITY));
164164
}
165165

166166
return healed;

src/main/java/emu/grasscutter/game/managers/SotSManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void checkAndHealAvatar(EntityAvatar entity) {
142142
((float) needHP / 100),
143143
List.of(3),
144144
PropChangeReason.PROP_CHANGE_REASON_STATUE_RECOVER,
145-
ChangeHpReason.CHANGE_HP_REASON_ADD_STATUE));
145+
ChangeHpReason.CHANGE_HP_ADD_STATUE));
146146
player
147147
.getSession()
148148
.send(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));

src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public PacketGachaWishRsp(
1414
.setGachaType(gachaType)
1515
.setGachaScheduleId(scheduleId)
1616
.setWishItemId(itemId)
17-
.setWishProgress(progress)
18-
.setWishMaxProgress(maxProgress)
17+
.setTenCostItemId(progress)
18+
.setGachaSortId(maxProgress)
1919
.build();
2020

2121
this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ public PacketTowerLevelStarCondNotify(int floorId, int levelIndex, int lostStar)
1717
// If these are still obfuscated in the next client version,
1818
// just set all int fields to the star (1 <= star <= 3)
1919
// that failed and set all boolean fields to true.
20-
.setNGHNFHCLFBH(lostStar)
21-
.setIBGHBFANCBK(true)
22-
.setOILLLBMMABH(true)
23-
.setOMOECEGOALC(lostStar)
20+
.setCondValue(lostStar)
21+
.setIsFail(true)
22+
.setIsPause(true)
23+
.setStarCondIndex(lostStar)
2424
.build());
2525
} else {
2626
proto

0 commit comments

Comments
 (0)