Commit Graph

1721 Commits

Author SHA1 Message Date
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
Mike
dd98c3072a Remove duplicate code, simplify logic 2020-06-03 03:04:05 +02:00
Mike
caf0bcb41f Add SQL and fix code 2020-06-03 02:53:10 +02:00
Swirny
462592f217 Fixed flood with rights 2020-06-03 02:44:10 +02:00
Mike
93922dcd49 Fixes #621 - acc_hide_mail 2020-06-03 02:42:38 +02:00
Mike
34e7239ac4 Fixes #610 - negative flood time 2020-06-03 02:30:32 +02:00
Mike
c0249a39ff Merge branch 'fix/machine-id' into 'dev'
Fixes MachineID sometimes not unique #620.

See merge request morningstar/Arcturus-Community!213
2020-06-02 19:57:40 -04:00
Mike
00f36170f1 Resolve syntax issues caused by xjoao. 2020-06-02 11:35:46 +02:00
Mike
ff912dccc2 Merge branch 'patch-30' into 'dev'
updated exception

See merge request morningstar/Arcturus-Community!206
2020-06-01 09:35:15 -04:00
Mike
f6058890ed Merge branch 'patch-28' into 'dev'
optimized statement

See merge request morningstar/Arcturus-Community!204
2020-06-01 09:33:18 -04:00
Mike
fa1b27f4b7 Merge branch 'patch-25' into 'dev'
Update close for try witch resources

See merge request morningstar/Arcturus-Community!197
2020-06-01 09:32:31 -04:00
Mike
1018985f3e Merge branch 'patch-24' into 'dev'
Update exception

See merge request morningstar/Arcturus-Community!196
2020-06-01 09:30:27 -04:00
Mike
c69e48d20f Merge branch 'patch-23' into 'dev'
Update exception

See merge request morningstar/Arcturus-Community!195
2020-06-01 09:30:08 -04:00
Mike
fdfe0754c3 Merge branch 'patch-22' into 'dev'
Update exception

See merge request morningstar/Arcturus-Community!194
2020-06-01 09:27:42 -04:00
Mike
9762e7a70d Merge branch 'patch-35' into 'dev'
updated exception

See merge request morningstar/Arcturus-Community!217
2020-06-01 08:51:42 -04:00
Mike
1866e343ca Merge branch 'patch-36' into 'dev'
updated exception

See merge request morningstar/Arcturus-Community!218
2020-06-01 08:51:27 -04:00
Mike
29c3dfbb49 Merge branch 'patch-34' into 'dev'
@override added

See merge request morningstar/Arcturus-Community!216
2020-06-01 08:51:12 -04:00
Harmonic
3386fc5763 Merge branch 'marketplace-search' into 'dev'
Enhancement: Marketplace search

See merge request morningstar/Arcturus-Community!202
2020-05-31 14:13:44 -04:00
harmonic
41f1bf465e Start 2.4.0 rc-2 2020-05-31 19:10:49 +01:00
xjoao
f45844ef65 updated exception 2020-05-29 22:29:14 -04:00
xjoao
bb2c3a270d updated exception 2020-05-29 22:28:00 -04:00
xjoao
3feea72105 @override added 2020-05-29 22:25:23 -04:00
Harmonic
17299bf160 Merge branch 'room-sorting-public' into 'dev'
Resolve "Public Room Sorting"

Resolve #483

See merge request morningstar/Arcturus-Community!215
2020-05-29 19:43:30 -04:00
Swirny
5157e12d27 Resolve "Public Room Sorting" 2020-05-29 19:43:30 -04:00
Mike
9e1177cb07 Fixes MachineID sometimes not unique #620. 2020-05-28 22:21:31 +02:00
xjoao
b0aa1996e3 Apply suggestion to src/main/java/com/eu/habbo/networking/Server.java 2020-05-24 16:33:48 -04:00
xjoao
c9d2f46535 updated exception 2020-05-24 15:44:43 -04:00
xjoao
6ebfc66cda optimized statement 2020-05-24 12:50:42 -04:00
Swirny
f9a76c8fc6 Adjusted marketplace search 2020-05-24 11:27:56 +02:00
xjoao
f3042b6b45 Update close for try witch resources 2020-05-22 13:58:45 -04:00
xjoao
d766818ef2 Update exception 2020-05-22 13:38:33 -04:00
xjoao
c46d12f87c Update exception 2020-05-22 13:34:01 -04:00
xjoao
04e2e7847d Update exception 2020-05-22 13:23:35 -04:00
Swirny
57d489b83b Update 2_4_0 RC-1 to 2_4_0 RC-2.sql 2020-05-16 10:28:58 -04:00
Swirny
c6df972265 Update 2.4.0 RC-1 to 2.4.0 RC-2.sql 2020-05-16 10:22:21 -04:00
Swirny
5ec38a5efe Update 2.4.0 RC-1 to 2.4.0 RC-2.sql 2020-05-16 10:21:45 -04:00
Swirny
c92b9ecea3 Added SQL file for 2.4.0 RC-2 2020-05-16 10:21:22 -04:00
Harmonic
84f4760349 Update README.md 2020-05-15 17:11:40 -04:00