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
Harmonic
3f2a65f2eb
Merge branch 'fix-onwalkoff-rollers' into 'dev'
...
Made Roller sliding off trigger OnWalkOff Event for Wired.
See merge request morningstar/Arcturus-Community!226
2020-06-05 04:07:03 -04:00
Harmonic
3b7f87e4a9
Merge branch 'fix-onwalkon-exploit' into 'dev'
...
Fixed weird edge-case teleporting loop with wired.
See merge request morningstar/Arcturus-Community!225
2020-06-05 04:06:48 -04:00
Harmonic
de1b59acab
Fixes users being sent into an endless loop in various edge cases when it tries to teleport them to a tile they're already on. Now it won't bother.
2020-06-05 04:06:48 -04:00
Harmonic
d44d7fe162
Merge branch 'fix-photo-deleting' into 'dev'
...
Fix Photo Deleting when the photo isn't owned by the user.
See merge request morningstar/Arcturus-Community!227
2020-06-05 04:06:21 -04:00
Harmonic
a6721ba548
Merge branch 'fix-chat-exploit' into 'dev'
...
Fix Chat Flooding in Room Cycle.
See merge request morningstar/Arcturus-Community!224
2020-06-05 04:06:10 -04:00
harmonic
c49d9248ce
Fixed Pet Inventory limit check on purchasing too.
2020-06-04 21:55:38 +01:00
harmonic
ec41fdc73f
Fixes Issue 656
2020-06-04 20:53:39 +01:00
harmonic
6cb39c232f
Added it so that when a roller rolls you off of an object it counts as OnWalkOff, allowing it to be used in conjunction with the Wired Trigger: User walks off furni.
...
(LIKE HABBO)
2020-06-04 20:01:44 +01:00
harmonic
1db6571db6
Runs the flood protection everytime someone talks, as well as via the room cycle, fixing a tanji exploit.
2020-06-04 16:52:04 +01:00
harmonic
43a1ca2a30
Cleanup.
2020-06-04 16:44:19 +01:00
harmonic
7ac72b2935
Fixed Permission.
2020-06-04 16:19:34 +01:00
harmonic
d97bc09c11
Fixed Bot picking up, before if you had 15 in your inventory it wouldn't let you pick them up, but would allow you to buy more from the catalogue, i've set it to use the existing "hotel.bots.max.inventory" and it now checks on catalogue purchase and will alert you with a configurable message if you have too many, if you want it to act like habbo you can give users the unlimited bots perm.
2020-06-04 14:23:19 +01:00
Mike
c19ef29cf9
Merge branch '625-ignore-staff' into 'dev'
...
Resolve "User can ignore Habbo Staffs"
See merge request morningstar/Arcturus-Community!172
2020-06-02 22:28:10 -04:00
Mike
5b52ece5e3
Clean up code, fix bug showing it succeeded while it didn't
2020-06-03 04:26:07 +02:00
Swirny
d2d3dcc78c
Fixed if-else statement
2020-06-03 04:06:37 +02:00
Swirny
b638e04737
Made ignore staff optional, active by default
2020-06-03 04:06:37 +02:00
Swirny
60a63e4832
User can no longer ignore staffs
2020-06-03 04:06:21 +02:00
Mike
1afca5c0a0
Fixes #624 - Wrong online_time counting
2020-06-03 03:53:28 +02:00
Mike
92dad4cfa8
Merge branch 'softkick-command' into 'dev'
...
Added official moderation command "softkick"
See merge request morningstar/Arcturus-Community!170
2020-06-02 21:28:31 -04:00
Mike
e4e8b5fe6f
Improve code
2020-06-03 03:25:06 +02:00
Mike
f5dd208809
Move SQL to correct file
2020-06-03 03:17:32 +02:00
Mike
25c9f88718
Changes by Swirny, squashed to make merging easier
2020-06-03 03:16:09 +02:00
Swirny
e2013c8451
Added official moderation command softkick
2020-06-03 03:16:09 +02:00
Mike
1e51448b38
Merge branch '605-flood' into 'dev'
...
Resolve "Flood "problem""
See merge request morningstar/Arcturus-Community!168
2020-06-02 21:04:45 -04:00
