mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-11-23 15:20:52 +01:00
Merge branch 'fix-wf-match-sshot' into 'dev'
Fixed WiredEffectMatchFurni to no longer send furniture under users. (Like Habbo) See merge request morningstar/Arcturus-Community!229
This commit is contained in:
commit
e60b621d73
@ -89,11 +89,12 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect {
|
||||
if (t != null && t.state != RoomTileState.INVALID) {
|
||||
boolean canMove = true;
|
||||
|
||||
if (t.x == item.getX() && t.y == item.getY()) {
|
||||
if (t.x == item.getX() && t.y == item.getY() || room.hasHabbosAt(t.x, t.y)) {
|
||||
canMove = !(room.getTopItemAt(t.x, t.y) == item);
|
||||
slideAnimation = false;
|
||||
}
|
||||
|
||||
|
||||
if (canMove && !room.hasHabbosAt(t.x, t.y)) {
|
||||
THashSet<RoomTile> tiles = room.getLayout().getTilesAt(t, item.getBaseItem().getWidth(), item.getBaseItem().getLength(), setting.rotation);
|
||||
double highestZ = -1d;
|
||||
|
Loading…
Reference in New Issue
Block a user