Harmonic
4a3d977777
Merge branch 'wired-game-fix' into 'dev'
...
Wired Game Fix
See merge request morningstar/Arcturus-Community!252
2020-07-06 12:02:26 -04:00
Rodolfo-XDR
599cd615d1
Wired Game Fix
2020-07-02 16:01:05 -05:00
Mike
b598425979
Fix flood race conditions
2020-06-12 22:10:05 +02:00
Mike
38cf88aeac
Merge branch 'mute-time-config' into 'dev'
...
Make flood time configurable
See merge request morningstar/Arcturus-Community!241
2020-06-12 14:53:40 -04:00
Swirny
bc30623a05
Make flood time configurable
2020-06-12 14:53:40 -04:00
Alejandro
62ab54a3e3
Fix syntax error
2020-06-08 14:03:31 +03:00
Alejandro
6bf8bd14db
Refactor trade start and disallow trading ignored users
2020-06-08 14:01:41 +03:00
Alejandro
a0c1973622
Customizable gift wrapping config & gift purchase validation
2020-06-07 16:19:05 +03:00
Alejandro
9e5a00b052
Make vending machines walkable if desired
2020-06-07 16:03:38 +03:00
Alejandro
ab04c491fd
Ignore case with room-specific wordfilter
2020-06-07 15:54:08 +03:00
Alejandro
0a0091e563
Disable avatar rotation with vending machines if on a chair
2020-06-07 15:49:26 +03:00
Alejandro
2af52de0ca
Remove horse items properly when used
2020-06-07 15:44:57 +03:00
Alejandro
8892c86e3d
Pick up pets & bots on room deletion
2020-06-07 15:40:34 +03:00
Alejandro
828d5110b0
Prevent deletion of homeroom
2020-06-07 15:25:40 +03:00
Alejandro
21c87145ea
Prevent adding yourself as a friend
2020-06-07 15:21:29 +03:00
Alejandro
e40d8c4f99
Validate post-it color and remove debugging
2020-06-07 15:16:39 +03:00
Alejandro
3df2f8055d
Ignore spaces when validating room name length on creation
2020-06-07 15:07:00 +03:00
Alejandro
ed2ec3e6f3
Validate room name and description when creating room & save trade mode
2020-06-07 15:05:02 +03:00
Alejandro
db14789d6b
Check guild membership
2020-06-07 14:52:07 +03:00
Mike
ff021608f5
Fixes marketplace offers ( #680 ).
2020-06-07 04:55:52 +02:00
Mike
6615588b34
Fixes wordfilter permission checks ( #670 ).
2020-06-07 04:36:15 +02:00
Mike
f4fd43eb89
Merge branch 'vuln-monsterplant' into 'dev'
...
Added RateLimit to ScratchPetEvent
See merge request morningstar/Arcturus-Community!208
2020-06-06 22:22:20 -04:00
Mike
2e98d5d21c
Proper monster plant fix
2020-06-07 04:21:38 +02:00
Swirny
54519ac4e4
Added RateLimit to ScratchPetEvent
2020-06-07 03:11:32 +02:00
Mike
d2ccc15ce7
Merge branch 'ban-counter' into 'dev'
...
Added Ban counter to MOD Tools
See merge request morningstar/Arcturus-Community!201
2020-06-06 21:08:32 -04:00
Mike
46d431e190
Fix bans count
2020-06-07 03:05:22 +02:00
Mike
10f860dc0c
Add catch.
2020-06-07 02:58:38 +02:00
Swirny
5bd184a03a
Revert "Removed optional exception logger"
...
This reverts commit 4ad8d3d077
.
2020-06-07 02:58:05 +02:00
Swirny
4ad8d3d077
Removed optional exception logger
2020-06-07 02:57:58 +02:00
Swirny
88d68220d0
Added Ban counter to MOD Tools
2020-06-07 02:57:58 +02:00
Mike
fe72f89ebd
Merge branch 'tradelock-counter' into 'dev'
...
Added MOD Tools tradelock counter
See merge request morningstar/Arcturus-Community!199
2020-06-06 20:44:31 -04:00
Mike
a20dc373d7
Fix merge request
2020-06-07 02:42:54 +02:00
Swirny
418bc882fa
Update ModToolUserInfoComposer.java
2020-06-07 02:13:00 +02:00
Swirny
e3e9286c51
Added MOD Tools Tradelocks counter
2020-06-07 02:13:00 +02:00
Mike
906f1318aa
Merge branch 'cfh-info' into 'dev'
...
Added CFH counter
See merge request morningstar/Arcturus-Community!198
2020-06-06 20:09:55 -04:00
Mike
4c92dbf277
Fix entire merge request
2020-06-07 02:08:59 +02:00
Swirny
b958c4dbfe
Update UpdateModToolIssue.java
2020-06-07 01:56:00 +02:00
Swirny
1efa38fefc
Added CFH counter
2020-06-07 01:56:00 +02:00
Harmonic
f51bbc52a4
Merge branch 'revert-a6721ba5' into 'dev'
...
Revert "Merge branch 'fix-chat-exploit' into 'dev'"
See merge request morningstar/Arcturus-Community!230
2020-06-05 14:28:11 -04:00
Harmonic
671a43e6c5
Revert "Merge branch 'fix-chat-exploit' into 'dev'"
...
This reverts merge request !224
2020-06-05 14:27:37 -04:00
Harmonic
e60b621d73
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
2020-06-05 12:32:50 -04:00
harmonic
f00c5136cd
Fixed WiredEffectMatchFurni to no longer send furniture under users. (Like Habbo)
2020-06-05 17:30:54 +01:00
harmonic
d1f811ad94
Fixed issue with compiling due to missing import.
2020-06-05 16:41:30 +01:00
Harmonic
91f6614978
Merge branch 'fix-bot-limit' into 'dev'
...
Fixed Optional Bot & Pet Inventory Limits
See merge request morningstar/Arcturus-Community!221
2020-06-05 11:38:21 -04:00
Harmonic
93b46b468b
Merge branch 'dev' into 'fix-bot-limit'
...
# Conflicts:
# src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java
# src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java
# src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPickupEvent.java
2020-06-05 11:36:39 -04:00
harmonic
d8bcb50e9b
Fixed emulator texts value, made it return so that it didn't pick up the bot if the limit was reached.
2020-06-05 16:35:08 +01:00
Harmonic
a572539645
Merge branch 'goodbye-magic-strings' into 'dev'
...
Goodbye magic strings
See merge request morningstar/Arcturus-Community!223
2020-06-05 04:12:49 -04:00
Harmonic
582b60b810
Goodbye magic strings
2020-06-05 04:12:49 -04:00
Harmonic
5e15e3c2d7
Merge branch 'john' into 'dev'
...
Fix Room Bundle currency updating.
See merge request morningstar/Arcturus-Community!219
2020-06-05 04:10:50 -04:00
Harmonic
ed6dab3da9
Fix Room Bundle currency updating.
...
Before: The currency was taken when purchasing a room bundle, however it did not send a composer window to update the client, also it still took the currency even if a user had maxiumum rooms, meaning that the user was charged even if they didn't get the room!
2020-06-05 04:10:49 -04:00