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

Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev

Browse Source
This commit is contained in:
Ilany 2020-09-24 09:41:14 +02:00
commit 8b873edd14
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVendingMachine.java
View File

@ -34,8 +34,12 @@ public class InteractionVendingMachine extends HabboItem {
} }
public THashSet<RoomTile> getActivatorTiles(Room room) { public THashSet<RoomTile> getActivatorTiles(Room room) {
THashSet<RoomTile> tiles = new THashSet<RoomTile>(); THashSet<RoomTile> tiles = new THashSet<>();
tiles.add(getSquareInFront(room.getLayout(), this)); RoomTile tileInFront = getSquareInFront(room.getLayout(), this);
if (tileInFront != null)
tiles.add(tileInFront);
tiles.add(room.getLayout().getTile(this.getX(), this.getY())); tiles.add(room.getLayout().getTile(this.getX(), this.getY()));
return tiles; return tiles;
} }

27
src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java
View File

@ -138,29 +138,14 @@ public class WordFilter {
filteredMessage = this.normalise(filteredMessage); filteredMessage = this.normalise(filteredMessage);
} }
TObjectHashIterator iterator = this.words.iterator(); for (WordFilterWord word : this.words) {
if (!StringUtils.containsIgnoreCase(filteredMessage, word.key)) continue;
boolean foundShit = false; if (habbo != null) {
if (Emulator.getPluginManager().fireEvent(new UserTriggerWordFilterEvent(habbo, word)).isCancelled())
while (iterator.hasNext()) { continue;
WordFilterWord word = (WordFilterWord) iterator.next();
if (StringUtils.containsIgnoreCase(filteredMessage, word.key)) {
if (habbo != null) {
if (Emulator.getPluginManager().fireEvent(new UserTriggerWordFilterEvent(habbo, word)).isCancelled())
continue;
}
filteredMessage = filteredMessage.replace("(?i)" + word.key, word.replacement);
foundShit = true;
if (habbo != null && word.muteTime > 0) {
habbo.mute(word.muteTime, false);
}
} }
}
if (!foundShit) { filteredMessage = filteredMessage.replaceAll("(?i)" + Pattern.quote(word.key), word.replacement);
return message;
} }
return filteredMessage; return filteredMessage;