mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-11-22 23:10:52 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
e1be700dfd
@ -1672,7 +1672,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
|
|||||||
} else {
|
} else {
|
||||||
if (!unit.hasStatus(RoomUnitStatus.LAY)) {
|
if (!unit.hasStatus(RoomUnitStatus.LAY)) {
|
||||||
unit.setStatus(RoomUnitStatus.LAY, Item.getCurrentHeight(topItem) * 1.0D + "");
|
unit.setStatus(RoomUnitStatus.LAY, Item.getCurrentHeight(topItem) * 1.0D + "");
|
||||||
unit.setRotation(RoomUserRotation.values()[topItem.getRotation()]);
|
unit.setRotation(RoomUserRotation.values()[topItem.getRotation() % 4]);
|
||||||
|
|
||||||
if (topItem.getRotation() == 0 || topItem.getRotation() == 4) {
|
if (topItem.getRotation() == 0 || topItem.getRotation() == 4) {
|
||||||
unit.setLocation(this.layout.getTile(unit.getX(), topItem.getY()));
|
unit.setLocation(this.layout.getTile(unit.getX(), topItem.getY()));
|
||||||
|
Loading…
Reference in New Issue
Block a user