Skip to content

Fix airtime incrementing when flying #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Exterminate5573 merged 2 commits into from
Sep 8, 2025
Merged

Fix airtime incrementing when flying #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0c630d
fix: stop airtime from incrementing when flying
Zpiboo Sep 7, 2025
3774b90
refactor: move fly handling to the Player class
Zpiboo Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class Player {
public BoundingBox3D boundingBox = null;
public String sidestep = "None";
public boolean wadStart = false;
public boolean flying = false;

@InfoString.Getter
public static LandingBlock getLatestLB() {
Expand Down Expand Up @@ -225,7 +226,7 @@ public Player buildAndSave() {
Player.updateDisplayInstance();
return this;
}
if (prev.onGround) airtime = 0;
if (prev.onGround || flying) airtime = 0;
else airtime = prev.airtime + 1;
if (prev.onGround && !onGround) airtime = 1;

Expand Down Expand Up @@ -391,6 +392,16 @@ public String getSidestep() {
return sidestep;
}

@InfoString.Getter
public boolean isFlying() {
return flying;
}

public Player setFlying(boolean flying) {
this.flying = flying;
return this;
}

@InfoString.DataClass
public static class Blip implements FormatDecimals {
@InfoString.Field
Expand Down
1 change: 1 addition & 0 deletions ...1.6/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_21_6/EventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public void onClientTickEnd(MinecraftClient mc) {
new Vector3D(playerBB.minX, playerBB.minY, playerBB.minZ),
new Vector3D(playerBB.maxX, playerBB.maxY, playerBB.maxZ)
))
.setFlying(mcPlayer.getAbilities().flying)
.constructKeyInput()
.setKeyMSList(timeQueue)
.buildAndSave();
Expand Down
1 change: 1 addition & 0 deletions ...-1.8.9/src/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/EventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public void onTick(TickEvent.ClientTickEvent e) {
new Vector3D(playerBB.minX, playerBB.minY, playerBB.minZ),
new Vector3D(playerBB.maxX, playerBB.maxY, playerBB.maxZ)
))
.setFlying(mcPlayer.capabilities.isFlying)
.constructKeyInput()
.setKeyMSList(timeQueue.copy())
.buildAndSave();
Expand Down
8 changes: 2 additions & 6 deletions ...rc/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/FunctionCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package io.github.kurrycat.mpkmod.compatibility.forge_1_8;

import io.github.kurrycat.mpkmod.compatibility.MCClasses.*;
import io.github.kurrycat.mpkmod.util.BoundingBox3D;
import io.github.kurrycat.mpkmod.util.Debug;
import io.github.kurrycat.mpkmod.util.Vector2D;
import io.github.kurrycat.mpkmod.util.Vector3D;
import io.github.kurrycat.mpkmod.util.ScissorBox;
import io.github.kurrycat.mpkmod.util.*;
import io.github.kurrycat.mpknetapi.common.network.packet.MPKPacket;
import net.minecraft.block.Block;
import net.minecraft.block.properties.IProperty;
Expand Down Expand Up @@ -35,8 +31,8 @@
import java.awt.*;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.util.List;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;

public class FunctionCompatibility implements FunctionHolder,
Expand Down