nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-27 08:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wf_act_match_to_sshot packet sending (closes #338)

Browse Source
This commit is contained in:
Alejandro 2020-01-27 19:43:17 +02:00
parent b439774c11
commit fe78102678
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java
View File

@ -57,7 +57,9 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect {
int oldRotation = item.getRotation(); int oldRotation = item.getRotation();
boolean slideAnimation = true; boolean slideAnimation = true;
if (this.direction) { double offsetZ = 0;
if (this.direction && item.getRotation() != setting.rotation) {
item.setRotation(setting.rotation); item.setRotation(setting.rotation);
slideAnimation = false; slideAnimation = false;
@ -73,12 +75,9 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect {
}); });
} }
//room.sendComposer(new ItemStateComposer(item).compose());
room.sendComposer(new FloorItemUpdateComposer(item).compose());
if (this.position) {
RoomTile t = room.getLayout().getTile((short) setting.x, (short) setting.y); RoomTile t = room.getLayout().getTile((short) setting.x, (short) setting.y);
if (this.position) {
if (t != null) { if (t != null) {
if (t.state != RoomTileState.INVALID) { if (t.state != RoomTileState.INVALID) {
boolean canMove = true; boolean canMove = true;
@ -111,7 +110,7 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect {
if (highestZ != -1d) { if (highestZ != -1d) {
tilesToUpdate.addAll(tiles); tilesToUpdate.addAll(tiles);
double offsetZ = highestZ - item.getZ(); offsetZ = highestZ - item.getZ();
double totalHeight = item.getZ() + offsetZ; double totalHeight = item.getZ() + offsetZ;
if (totalHeight > 40) break; if (totalHeight > 40) break;
tilesToUpdate.addAll(room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), oldRotation)); tilesToUpdate.addAll(room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), oldRotation));
@ -120,12 +119,16 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect {
item.setX(t.x); item.setX(t.x);
item.setY(t.y); item.setY(t.y);
} }
}
}
}
}
}
if (slideAnimation && t != null) {
room.sendComposer(new FloorItemOnRollerComposer(item, null, t, offsetZ, room).compose()); room.sendComposer(new FloorItemOnRollerComposer(item, null, t, offsetZ, room).compose());
} } else {
} room.updateItem(item);
}
}
} }
item.needsUpdate(true); item.needsUpdate(true);