Fixed "waiting for players" being shown after PvP end

This commit is contained in:
Anuken
2020-08-21 10:03:40 -04:00
parent 28d2243abc
commit 3b85dc27d7
6 changed files with 20 additions and 6 deletions

View File

@@ -41,6 +41,8 @@ public class MassDriver extends Block{
hasItems = true;
hasPower = true;
outlineIcon = true;
sync = true;
//point2 is relative
config(Point2.class, (MassDriverBuild tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY()));
config(Integer.class, (MassDriverBuild tile, Integer point) -> tile.link = point);
@@ -318,7 +320,7 @@ public class MassDriver extends Block{
super.read(read, revision);
link = read.i();
rotation = read.f();
state = DriverState.values()[read.b()];
state = DriverState.all[read.b()];
}
}
@@ -326,6 +328,8 @@ public class MassDriver extends Block{
idle, //nothing is shooting at this mass driver and it does not have any target
accepting, //currently getting shot at, unload items
shooting,
unloading
unloading;
public static final DriverState[] all = values();
}
}

View File

@@ -24,6 +24,7 @@ public class PayloadAcceptor extends Block{
super(name);
update = true;
sync = true;
}
public static boolean blends(Building tile, int direction){