Skip to content

Commit 680cb97

Browse files
NexIsDumbNeeEoo
andcommitted
simple force event null bugfix
idk we were bored and started a liveshare Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
1 parent ae5fc55 commit 680cb97

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

source/funkin/backend/scripting/events/DirectionAnimEvent.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class DirectionAnimEvent extends CancellableEvent {
2828
**/
2929
public var frame:Int;
3030
/**
31-
Force the animation to replay even if it's already playing.
31+
Force the animation to replay even if it's already playing (if it's null it will be forced based on the sprite's data xml, if it has one).
3232
**/
33-
public var force:Bool = true;
33+
public var force:Null<Bool>;
3434
}

source/funkin/backend/scripting/events/NoteHitEvent.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ final class NoteHitEvent extends CancellableEvent {
102102
/**
103103
* Whenever the animation should be forced to play (if it's null it will be forced based on the sprite's data xml, if it has one).
104104
*/
105-
public var forceAnim:Null<Bool> = true;
105+
public var forceAnim:Null<Bool> = null;
106106

107107
/**
108108
* Prevents the default sing animation from being played.

source/funkin/game/Character.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
207207
}
208208

209209
public var singAnims = ["singLEFT", "singDOWN", "singUP", "singRIGHT"];
210-
public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, ?Force:Bool = true, Reversed:Bool = false, Frame:Int = 0) {
210+
public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, ?Force:Null<Bool> = null, Reversed:Bool = false, Frame:Int = 0) {
211211
var event = EventManager.get(DirectionAnimEvent).recycle(singAnims[direction % singAnims.length] + suffix, direction, suffix, Context, Reversed, Frame, Force);
212212
script.call("onPlaySingAnim", [event]);
213213
if (!event.cancelled)

source/funkin/game/PlayState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1919,7 +1919,7 @@ class PlayState extends MusicBeatState
19191919
}
19201920
}
19211921

1922-
class ComboRating {
1922+
final class ComboRating {
19231923
public var percent:Float;
19241924
public var rating:String;
19251925
public var color:FlxColor;

0 commit comments

Comments
 (0)