Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-10-09 12:59:59 -04:00
parent 99539bbab0
commit 96656bac6b
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/core/Control.java
View File

@@ -317,6 +317,7 @@ public class Control implements ApplicationListener, Loadable{
}else{
net.reset();
logic.reset();
sector.setSecondsPassed(0);
world.loadSector(sector);
state.rules.sector = sector;
//assign origin when launching

5
core/src/mindustry/game/DefaultWaves.java
View File

@@ -38,6 +38,7 @@ public class DefaultWaves{
unitScaling = 1.7f;
spacing = 2;
max = 4;
shieldScaling = 15f;
}},
new SpawnGroup(pulsar){{
@@ -59,7 +60,8 @@ public class DefaultWaves{
unitScaling = 1;
unitAmount = 4;
spacing = 2;
shieldScaling = 10f;
shieldScaling = 15f;
max = 20;
}},
new SpawnGroup(mace){{
@@ -215,7 +217,6 @@ public class DefaultWaves{
spacing = 4;
shields = 40f;
shieldScaling = 20f;
}},
new SpawnGroup(atrax){{

2
core/src/mindustry/graphics/Shaders.java
View File

@@ -254,7 +254,7 @@ public class Shaders{
public static class LoadShader extends Shader{
public LoadShader(String frag, String vert){
super(Core.files.internal("shaders/" + vert + ".vert").readString(), Core.files.internal("shaders/" + frag + ".frag").readString());
super(Core.files.internal("shaders/" + vert + ".vert"), Core.files.internal("shaders/" + frag + ".frag"));
}
}
}

4
core/src/mindustry/input/InputHandler.java
View File

@@ -124,7 +124,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
@Remote(called = Loc.server, targets = Loc.both, forward = true)
public static void requestItem(Player player, Building tile, Item item, int amount){
if(player == null || tile == null || !tile.interactable(player.team()) || !player.within(tile, buildingRange)) return;
if(player == null || tile == null || !tile.interactable(player.team()) || !player.within(tile, buildingRange) || player.dead()) return;
amount = Math.min(player.unit().maxAccepted(item), amount);
int fa = amount;
@@ -271,7 +271,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
@Remote(targets = Loc.both, forward = true, called = Loc.server)
public static void transferInventory(Player player, Building tile){
if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null) return;
if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null || player.dead()) return;
if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) ||
!netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> {