mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-02-03 16:54:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Not pointing

Browse source 
- Fix occasional npe in PlayerUniforms
- Mark accessor method as Nullable
This commit is contained in:
Jozufozu 2024-09-23 11:16:45 -07:00
parent 36b0ad4cf9
commit 7bd59f7b14
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/PlayerUniforms.java
View file

@ -40,7 +40,7 @@ public final class PlayerUniforms extends UniformWriter {
Vec3 eyePos = player.getEyePosition(context.partialTick()); Vec3 eyePos = player.getEyePosition(context.partialTick());
ptr = writeVec3(ptr, (float) eyePos.x, (float) eyePos.y, (float) eyePos.z); ptr = writeVec3(ptr, (float) eyePos.x, (float) eyePos.y, (float) eyePos.z);
ptr = writeTeamColor(ptr, info.getTeam()); ptr = writeTeamColor(ptr, info == null ? null : info.getTeam());
ptr = writeEyeBrightness(ptr, player); ptr = writeEyeBrightness(ptr, player);
@ -54,7 +54,8 @@ public final class PlayerUniforms extends UniformWriter {
ptr = writeInt(ptr, player.isShiftKeyDown() ? 1 : 0); ptr = writeInt(ptr, player.isShiftKeyDown() ? 1 : 0);
ptr = writeInt(ptr, info.getGameMode().getId()); ptr = writeInt(ptr, info == null ? 0 : info.getGameMode()
.getId());
BUFFER.markDirty(); BUFFER.markDirty();
} }

2
common/src/backend/java/dev/engine_room/flywheel/backend/mixin/AbstractClientPlayerAccessor.java
View file

@ -1,5 +1,6 @@
package dev.engine_room.flywheel.backend.mixin; package dev.engine_room.flywheel.backend.mixin;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.gen.Invoker;
@ -9,5 +10,6 @@ import net.minecraft.client.player.AbstractClientPlayer;
@Mixin(AbstractClientPlayer.class) @Mixin(AbstractClientPlayer.class)
public interface AbstractClientPlayerAccessor { public interface AbstractClientPlayerAccessor {
@Invoker("getPlayerInfo") @Invoker("getPlayerInfo")
@Nullable
PlayerInfo flywheel$getPlayerInfo(); PlayerInfo flywheel$getPlayerInfo();
} }