mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-20 12:58:38 +03:00
Fixed #3170
This commit is contained in:
parent
e92d26b9e8
commit
68ab48a1d3
@ -1543,10 +1543,10 @@ public class Blocks implements ContentList{
|
||||
|
||||
hasPower = true;
|
||||
size = 2;
|
||||
force = 5f;
|
||||
scaledForce = 5.5f;
|
||||
range = 160f;
|
||||
damage = 0.4f;
|
||||
force = 7f;
|
||||
scaledForce = 7f;
|
||||
range = 220f;
|
||||
damage = 0.3f;
|
||||
health = 160 * size * size;
|
||||
rotateSpeed = 10;
|
||||
|
||||
|
@ -363,7 +363,7 @@ public class NetClient implements ApplicationListener{
|
||||
});
|
||||
}
|
||||
|
||||
@Remote(variants = Variant.one)
|
||||
@Remote(variants = Variant.one, called = Loc.server)
|
||||
public static void setPosition(float x, float y){
|
||||
player.unit().set(x, y);
|
||||
player.set(x, y);
|
||||
|
@ -137,7 +137,7 @@ public class MapEditor{
|
||||
|
||||
if(isFloor){
|
||||
tile.setFloor(drawBlock.asFloor());
|
||||
}else{
|
||||
}else if(!(tile.block().isMultiblock() && !drawBlock.isMultiblock())){
|
||||
if(drawBlock.rotate && tile.build != null && tile.build.rotation != rotation){
|
||||
addTileOp(TileOp.get(tile.x, tile.y, (byte)OpType.rotation.ordinal(), (byte)rotation));
|
||||
}
|
||||
|
@ -237,12 +237,14 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
|
||||
|
||||
@Override
|
||||
public void add(){
|
||||
team.data().updateCount(type, 1);
|
||||
|
||||
//check if over unit cap
|
||||
if(count() > cap() && !spawnedByCore && !dead){
|
||||
Call.unitCapDeath(self());
|
||||
team.data().updateCount(type, -1);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -265,7 +265,7 @@ public class Teams{
|
||||
if(typeCounts == null || typeCounts.length <= type.id){
|
||||
typeCounts = new int[Vars.content.units().size];
|
||||
}
|
||||
typeCounts [type.id] = Math.max(amount + typeCounts [type.id], 0);
|
||||
typeCounts[type.id] = Math.max(amount + typeCounts [type.id], 0);
|
||||
}
|
||||
|
||||
public QuadTree<Unit> tree(){
|
||||
|
Loading…
Reference in New Issue
Block a user