fix MAJOR bug

TheSillyDoggo · Sep 30, 2024 · a38d516 · a38d516
1 parent 240ca90
commit a38d516
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,7 @@
 - Fixed lag in game caused by custom fonts
 - Rewrote Copy Hack to work better
 - Fixed Monster Show Hitbox fix being broken with scaling
+- Fixed Event Trigger not detecting player 2 jump
 - Added **Custom Icon Effect Speed**
 
 # 1.6.8

diff --git a/src/Labels/Labels.cpp b/src/Labels/Labels.cpp
@@ -371,9 +371,9 @@ void StatusNode::updateCPS(float dt)
 
 class $modify (PlayerObject)
 {
-    void pushButton(PlayerButton p0)
+    bool pushButton(PlayerButton p0)
     {
-        PlayerObject::pushButton(p0);
+        auto ret = PlayerObject::pushButton(p0);
 
         if (p0 == PlayerButton::Jump && GJBaseGameLayer::get() && GJBaseGameLayer::get()->m_player1 == this)
         {
@@ -386,11 +386,13 @@ class $modify (PlayerObject)
                 stn->sLabels[8]->setColor(ccc3(0, 255, 0));
             }
         }
+
+        return ret;
     }
 
-    void releaseButton(PlayerButton p0)
+    bool releaseButton(PlayerButton p0)
     {
-        PlayerObject::releaseButton(p0);
+        auto ret = PlayerObject::releaseButton(p0);
 
         if (p0 == PlayerButton::Jump && GJBaseGameLayer::get())
         {
@@ -404,6 +406,8 @@ class $modify (PlayerObject)
                     stn->sLabels[8]->runAction(CCTintTo::create(1, 255, 255, 255));
             }
         }
+
+        return ret;
     }
 };