nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2025-01-18 23:46:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'remco-wired-fixes' into 'dev'

Browse Source 
Fixed wired effect bot walks to furni #909

See merge request morningstar/Arcturus-Community!333
This commit is contained in:
Harmonic 2020-12-21 08:19:41 -05:00
commit 2b3259072a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotWalkToFurni.java
View File

@ -19,6 +19,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class WiredEffectBotWalkToFurni extends InteractionWiredEffect {
public static final WiredEffectType type = WiredEffectType.BOT_MOVE;
@ -116,9 +117,14 @@ public class WiredEffectBotWalkToFurni extends InteractionWiredEffect {
Bot bot = bots.get(0);
this.items.removeIf(item -> item == null || item.getRoomId() != this.getRoomId() || Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId()).getHabboItem(item.getId()) == null);
// wtf was that
if (this.items.size() > 0) {
HabboItem item = this.items.get(Emulator.getRandom().nextInt(this.items.size()));
// Bots shouldn't walk to the tile they are already standing on
List<HabboItem> possibleItems = this.items.stream()
.filter(item -> !room.getBotsOnItem(item).contains(bot))
.collect(Collectors.toList());
// Get a random tile of possible tiles to walk to
if (possibleItems.size() > 0) {
HabboItem item = possibleItems.get(Emulator.getRandom().nextInt(possibleItems.size()));
if (item.getRoomId() != 0 && item.getRoomId() == bot.getRoom().getId()) {
bot.getRoomUnit().setGoalLocation(room.getLayout().getTile(item.getX(), item.getY()));