nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 15:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
888 Commits 6 Branches 30 Tags 9.6 MiB
f00c5136cd
Commit Graph

888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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