Skip to content

Commit

Permalink
Merge pull request #3733 from kuwarantine/channel-fix
Browse files Browse the repository at this point in the history
Fix channel clip delay issue and channeled tick APL value
  • Loading branch information
jimmyt857 authored Sep 23, 2023
2 parents 3120aea + 1954d36 commit c8242e2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sim/core/apl_values_spell.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (rot *APLRotation) newValueSpellChanneledTicks(config *proto.APLValueSpellC
}
}
func (value *APLValueSpellChanneledTicks) Type() proto.APLValueType {
return proto.APLValueType_ValueTypeBool
return proto.APLValueType_ValueTypeInt
}
func (value *APLValueSpellChanneledTicks) GetInt(sim *Simulation) int32 {
channeledDot := value.spell.Unit.ChanneledDot
Expand Down
4 changes: 2 additions & 2 deletions ui/core/player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -827,11 +827,11 @@ export class Player<SpecType extends Spec> {
}

getChannelClipDelay(): number {
return this.reactionTime;
return this.channelClipDelay;
}

setChannelClipDelay(eventID: EventID, newChannelClipDelay: number) {
if (newChannelClipDelay == this.reactionTime)
if (newChannelClipDelay == this.channelClipDelay)
return;

this.channelClipDelay = newChannelClipDelay;
Expand Down

0 comments on commit c8242e2

Please sign in to comment.