nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-24 15:40:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
967 Commits 6 Branches 30 Tags 9.6 MiB
84689f8786
Commit Graph

735 Commits

Author SHA1 Message Date
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
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
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
671a43e6c5 Revert "Merge branch 'fix-chat-exploit' into 'dev'" 
This reverts merge request !224
 2020-06-05 14:27:37 -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
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
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
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
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
e4e8b5fe6f Improve code 2020-06-03 03:25:06 +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
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
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
Harmonic
40a1c34e19 Merge branch 'marketplace' into 'dev' 
Set marketplace limit like Habbo

See merge request morningstar/Arcturus-Community!164
 2020-05-15 07:59:47 -04:00
Mike
492c8f6142 Revert ServerMessage release/retain. 2020-05-13 20:55:07 +02:00
Mike
40818513aa Fix packet length. 2020-05-13 00:31:30 +02:00
Mike
ec3a7d8f58 Fix crash when bot message is empty, increase max packet length. 2020-05-13 00:31:30 +02:00
Mike
46ff22f720 Fix all last edge cases. 2020-05-13 00:31:30 +02:00
Mike
463fb82654 Fix more issues. 2020-05-13 00:31:30 +02:00
Mike
4c140d9402 Fix more edge cases. 2020-05-13 00:31:30 +02:00
Mike
a93ffbbbac Added debug. 2020-05-13 00:31:30 +02:00
Mike
ee5a97bbae Add reliability to packets and actually clear the message buffer. 2020-05-13 00:31:30 +02:00
Mike
f9d81ea198 Fix reference counting and repeated composer() calls. 2020-05-13 00:31:30 +02:00
Swirny
6345244ff3 Set marketplace limit like Habbo 2020-05-12 18:14:27 +02:00
KrewsOrg
ea27e419bb revert timestamp commit by zGrav 2020-05-09 17:31:09 +01:00
Harmonic
e96c9492a4 Merge branch 'feature/rework-logging' into 'new-logging' 
Rework logging, upgrade dependencies and remove unused dependencies

See merge request morningstar/Arcturus-Community!139
 2020-05-08 17:19:14 -04:00
skeletor
d0b673952a Merge branch 'chatlog-timestamp' into 'dev' 
Fixed !146 Chatlog should be orderer by timestamp

See merge request morningstar/Arcturus-Community!151
 2020-05-08 06:31:17 -04:00
Swirny
2e40f295df Chatlog ordered by timestamp 2020-05-08 06:23:37 -04:00
Harmonic
b3d3240e26 Merge branch 'fix-water-cpu-issues' into 'dev' 
Fix water cpu issues

See merge request morningstar/Arcturus-Community!150
 2020-05-08 05:30:44 -04:00
Harmonic
7f987c7446 Merge branch '600-cme' into 'dev' 
fix(Room): pets CME

See merge request morningstar/Arcturus-Community!142
 2020-05-08 05:22:00 -04:00
Harmonic
980cf66815 Merge branch '595-npe' into 'dev' 
fix(WiredEffectMoveFurniTowards): npe

See merge request morningstar/Arcturus-Community!141
 2020-05-08 05:21:49 -04:00
David Silva
31c7ff7b6d fix(Room): pets CME 2020-05-05 13:59:12 +02:00
David Silva
145c02681f fix(WiredEffectMoveFurniTowards): npe 2020-05-05 12:57:18 +02:00
Mike
401af627ff Fix exception spam on busy hotels. 2020-05-05 04:00:02 +02:00
Mike
2bc4bc3473 Added stub for old logger so plugins don't break. 2020-05-05 03:56:21 +02:00
Mike
ca5ca73a9d Try to improve build size by reducing dependencies used for logging. 2020-05-05 02:24:33 +02:00
Mike
5fc6bc4002 Add packet names to logger. 2020-05-05 01:31:50 +02:00
Mike
14a1c56877 Remove unused packet ids and fix duplicate composer. 2020-05-05 01:27:39 +02:00
Mike
a7946b4adc Replace remainder sout with logger. 2020-05-05 00:28:25 +02:00
Mike
a0582c09ee Re-added Jansi, moved ClientMessage logging. 2020-05-05 00:20:07 +02:00
Mike
89ff26f21b More logging progress 2020-05-04 22:24:09 +02:00
Mike
4748c033ad Dependencies and logging progress 2020-05-04 19:54:07 +02:00
Mike
9a9b986948 Improve corner clipping and remove picked up furni from mask calculation 2020-05-04 06:18:12 +02:00
Mike
87fdba280a Optimize water item update. 2020-05-04 05:53:28 +02:00