优化战术冲刺设置判定
This commit is contained in:
parent
a872942a72
commit
fc16707199
4 changed files with 11 additions and 8 deletions
|
@ -51,7 +51,7 @@ public class MinigunItemModel extends GeoModel<MinigunItem> {
|
||||||
|
|
||||||
int rpm = GunData.from(stack).rpm();
|
int rpm = GunData.from(stack).rpm();
|
||||||
|
|
||||||
gun.setRotZ((float) (gun.getRotZ() + times * -0.07f * ((float) rpm / 1200) * ClientEventHandler.shootDelay));
|
gun.setRotZ(gun.getRotZ() + times * -0.07f * ((float) rpm / 1200) * ClientEventHandler.shootDelay);
|
||||||
|
|
||||||
shen.setPosX((float) (0.75f * ClientEventHandler.recoilHorizon * fpz * fp));
|
shen.setPosX((float) (0.75f * ClientEventHandler.recoilHorizon * fpz * fp));
|
||||||
shen.setPosY((float) (-0.03f * fp - 0.06f * fr));
|
shen.setPosY((float) (-0.03f * fp - 0.06f * fr));
|
||||||
|
|
|
@ -314,11 +314,13 @@ public class ClientEventHandler {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
tacticalSprint = !exhaustion && !zoom && isMoving() && player.isSprinting() && player.getVehicle() == null && !player.getAbilities().flying;
|
tacticalSprint = MiscConfig.ALLOW_TACTICAL_SPRINT.get()
|
||||||
|
&& !exhaustion
|
||||||
if (!MiscConfig.ALLOW_TACTICAL_SPRINT.get()) {
|
&& !zoom
|
||||||
tacticalSprint = false;
|
&& isMoving()
|
||||||
}
|
&& player.isSprinting()
|
||||||
|
&& player.getVehicle() == null
|
||||||
|
&& !player.getAbilities().flying;
|
||||||
|
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
|
|
|
@ -164,7 +164,7 @@ public class PlayerEventHandler {
|
||||||
attr.removeModifier(TACTICAL_SPRINT);
|
attr.removeModifier(TACTICAL_SPRINT);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.getData(ModAttachments.PLAYER_VARIABLE).tacticalSprint) {
|
if (MiscConfig.ALLOW_TACTICAL_SPRINT.get() && player.getData(ModAttachments.PLAYER_VARIABLE).tacticalSprint) {
|
||||||
player.setSprinting(true);
|
player.setSprinting(true);
|
||||||
attr.addTransientModifier(new AttributeModifier(TACTICAL_SPRINT, 0.25, AttributeModifier.Operation.ADD_MULTIPLIED_BASE));
|
attr.addTransientModifier(new AttributeModifier(TACTICAL_SPRINT, 0.25, AttributeModifier.Operation.ADD_MULTIPLIED_BASE));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.atsuishio.superbwarfare.network.message.send;
|
package com.atsuishio.superbwarfare.network.message.send;
|
||||||
|
|
||||||
import com.atsuishio.superbwarfare.Mod;
|
import com.atsuishio.superbwarfare.Mod;
|
||||||
|
import com.atsuishio.superbwarfare.config.server.MiscConfig;
|
||||||
import com.atsuishio.superbwarfare.init.ModAttachments;
|
import com.atsuishio.superbwarfare.init.ModAttachments;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import net.minecraft.network.codec.ByteBufCodecs;
|
import net.minecraft.network.codec.ByteBufCodecs;
|
||||||
|
@ -22,7 +23,7 @@ public record TacticalSprintMessage(boolean sprint) implements CustomPacketPaylo
|
||||||
var player = context.player();
|
var player = context.player();
|
||||||
|
|
||||||
var cap = player.getData(ModAttachments.PLAYER_VARIABLE).watch();
|
var cap = player.getData(ModAttachments.PLAYER_VARIABLE).watch();
|
||||||
cap.tacticalSprint = message.sprint;
|
cap.tacticalSprint = MiscConfig.ALLOW_TACTICAL_SPRINT.get() && message.sprint;
|
||||||
cap.sync(player);
|
cap.sync(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue