Skip to content

Commit 7f94206

Browse files
committed
previous commit didn't apply to turrets
1 parent 4b80e77 commit 7f94206

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/main/java/com/onewhohears/dscombat/data/weapon/WeaponData.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,20 @@ public boolean shootFromVehicle(Level level, Entity owner, Vec3 direction, Entit
155155
1f, 1f);
156156
setLaunchSuccess(1, owner, consume);
157157
updateClientAmmo(vehicle);
158+
vehicle.lastShootTime = vehicle.tickCount;
158159
return true;
159160
}
160161

161-
public boolean shootFromTurret(Level level, Entity owner, Vec3 direction, Vec3 pos, @Nullable EntityAircraft parent, boolean consume) {
162+
public boolean shootFromTurret(Level level, Entity owner, Vec3 direction, Vec3 pos, @Nullable EntityAircraft vehicle, boolean consume) {
162163
overrideGroundCheck = true;
163-
EntityWeapon w = getShootEntity(level, owner, pos, direction, parent);
164+
EntityWeapon w = getShootEntity(level, owner, pos, direction, vehicle);
164165
if (w == null) return false;
165166
level.addFreshEntity(w);
166167
level.playSound(null, w.blockPosition(),
167168
getShootSound(), SoundSource.PLAYERS,
168169
1f, 1f);
169170
setLaunchSuccess(1, owner, consume);
171+
if (vehicle != null) vehicle.lastShootTime = vehicle.tickCount;
170172
return true;
171173
}
172174

src/main/java/com/onewhohears/dscombat/data/weapon/WeaponSystem.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ public boolean shootSelected(Entity controller, boolean consume) {
115115
if (reason != null && controller instanceof ServerPlayer player) {
116116
player.displayClientMessage(Component.translatable(reason), true);
117117
}
118-
if (reason == null) parent.lastShootTime = parent.tickCount;
119118
return true;
120119
}
121120

0 commit comments

Comments
 (0)