mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed player looking at cursor with no ammo

Browse Source
This commit is contained in:
Anuken 2018-05-06 21:35:59 -04:00
parent ad3ce3f9fc
commit 84a126253a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/Player.java
View File

@ -263,7 +263,7 @@ public class Player extends Unit{
movement.y += ya*speed;
movement.x += xa*speed;
boolean shooting = control.input().canShoot() && control.input().isShooting();
boolean shooting = control.input().canShoot() && control.input().isShooting() && inventory.hasAmmo();
if(shooting){
weapon.update(player, true);

3
core/src/io/anuke/mindustry/game/TeamInfo.java
View File

@ -29,8 +29,7 @@ public class TeamInfo {
/**Register a team.
* @param team The team type enum.
* @param ally Whether this team is an ally with the player or an enemy with the player.
* In PvP situations with dedicated servers, the sides can be arbitrary.
*/
* In PvP situations with dedicated servers, the sides can be arbitrary.*/
public void add(Team team, boolean ally){
if(has(team)) throw new RuntimeException("Can't define team information twice!");