Commit graph

771 commits

Author SHA1 Message Date
Paldiu 2a87271642 Should fix FS-143 2021-03-19 08:58:29 -05:00
Ryan ff2bca26aa
Merge branch 'development' into FS-33 2021-03-18 19:58:10 +00:00
Nathan Curran eb05b05042
Fixed FS-93
- Players no longer need to relog, just need to be opped to get permissions.
- Removed redundant PlayerJoinEvent code as it's already been executed (See RankManager class).
2021-03-16 20:21:31 +11:00
Nathan Curran b9c1970d20
Update player's permission when opping. 2021-03-16 19:56:29 +11:00
Nathan Curran 9eca9ac5b2
Remove double storage
It is unnecessary as the information is already stored in a map (Username, IPs)
2021-03-08 11:34:48 +11:00
Nathan Curran 5b577fae07
Add myself to developer list 2021-03-07 20:46:30 +11:00
Nathan Curran 452a8755c2
Properly fix FS-33 2021-03-07 20:43:25 +11:00
Ryan f0a25fde0c
Merge branch 'development' into abhi-test 2021-03-06 20:03:19 +00:00
Paldiu 0dd5a26efa Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only 2021-03-06 12:12:59 -06:00
Paldiu 5c097c83cb Here's to hoping this fixes that stupid ban crap. 2021-03-06 12:00:32 -06:00
abhiram 342df43f85 Added myself to TFM 2021-03-06 13:04:36 +05:30
Paldiu 9161016f73
Merge branch 'development' into frontdoor-and-banExpiry-only 2021-03-03 11:52:37 -06:00
Paldiu bdd22f8d75
Update month to be 30 days instead of 4 weeks 2021-03-03 12:50:45 -05:00
abhiram 85c35f25a3 [+] Fix codacy issue 2021-03-03 06:47:22 +05:30
Paldiu 46273b3301 Revert "SQL PreparedStatement Fixes"
This reverts commit 17347c23a5.
2021-03-01 23:03:13 -06:00
abhiram d6b74a76bb [+] Fix of FS-33 2021-02-28 21:28:20 +05:30
abhiram 6f66957b17 Few fixes for JIRA issues.... 2021-02-28 21:08:39 +05:30
Paldiu 17347c23a5 SQL PreparedStatement Fixes 2021-02-26 15:29:02 -06:00
Paldiu 718748f1a2 Commit Ultimate
ultimate super mega mode power upgrade
2021-02-26 15:26:13 -06:00
Ivan 96424694ee fix codacy errors 2021-02-25 17:03:31 -05:00
Ivan 0367d9fd3a my end of the bargain 2021-02-25 16:42:30 -05:00
Elmon11 ec51cb7408
removing BukkitTelnet from untouchable plugins 2021-02-17 22:03:35 +01:00
Ivan b8a741aa58
Add new developers to util
Hopefully this doesn't fuck up this time - last PR my Macbook was having issues with for some reason.
2021-01-25 20:36:58 -05:00
speed 8225daf6f1 permission changes & remove massmurder
resolves FS-69, FS-70, FS-71
2021-01-10 16:23:20 -05:00
Paldiu 830daab8f4 Fix Daemon Error
Reflection issue when initializing the daemon; trying to call a constructor with one argument using two arguments.

Removed an unused constructor.
2021-01-08 17:32:54 -06:00
speed 9688827a39 formatting 2021-01-08 10:10:54 -05:00
Paldiu 3464a33678 NPE on Thread.join() possible fix
This bug is hard to decipher mainly due to the thread being terminated somewhere before the thread.join is called. this may be due to the safeClose method defined with serverSocket, but again, I'm not too sure what's up here. This may also be because something failed to execute in one of the try catch statements, causing the thread to never be initialized in the first place.
2021-01-08 00:25:46 -06:00
Paldiu fbf2972006 Merge branch 'sql-fix' into paldiu-local 2021-01-07 13:40:59 -06:00
Paldiu aa2836b29a Merge branch 'mbw-fix' into paldiu-local 2021-01-07 13:39:51 -06:00
Paldiu 260368585e reformat 2021-01-07 13:29:47 -06:00
Paldiu 323fd1a031 Should be fine now 2021-01-04 18:27:57 -06:00
Paldiu c7b0f77910 Merge branch 'development' into paldiu-local 2021-01-04 13:14:53 -06:00
Elmon11 e32c2eed15
Update FUtil.java 2021-01-03 19:23:10 +01:00
Elmon11 7afa80c89f
Update FUtil.java 2021-01-03 19:18:14 +01:00
Elmon11 a3cccc7ac0
Update FUtil.java 2021-01-03 19:16:41 +01:00
Elmon11 bc37ed5341
Fix developer title not showing up on Offline mode servers 2021-01-03 19:04:23 +01:00
speed 0a5ce5b9cc fix w/e in mbw 2020-12-31 13:06:05 -05:00
Paldiu a4e23dc03f Codacy Complacency Part 2 2020-12-29 22:14:57 -06:00
Paldiu 7a394e52e4 Codacy complacency 2020-12-29 22:06:12 -06:00
Paldiu 9352a48650 Finalized lombok removal
Finally removed all lomboks, also reduced npath complexity for FreedomCommand.FCommand#execute and removed empty constructor from Discord
2020-12-29 21:37:50 -06:00
Ryan fd725ca6c5
Merge branch 'development' into paldiu-local 2020-12-28 22:51:44 +00:00
Ryan 0703ea685e
Merge branch 'development' into FS-59 2020-12-28 22:51:21 +00:00
speed 7cdeac451b SQL fix 2020-12-28 17:39:07 -05:00
Elmon11 0c60cbc739
Update Command_gcmd.java 2020-12-28 00:18:05 +01:00
Elmon11 402a6be5ad
Make gcmd not work on admins 2020-12-28 00:04:57 +01:00
speed 9d131f0f24 ok codacy 2020-12-26 19:11:15 -05:00
speed b9606fa0e3 admin chat discord formatting (FS-59) 2020-12-26 18:54:15 -05:00
Paldiu d71f5452ad Changed instance of SplittableRandom back to Random
Overridable methods required Random instead of SplittableRandom and caused a build failure in the previous commit. This should fix the build failure.
2020-12-26 10:30:30 -05:00
Paldiu eb9759f2d8 Replaced All Instances of Random With SplittableRandom
SplittableRandom is faster (negligable) than Random and is also able to recursively return new instances of itself for an even more complex pseudo random generator compared to the default Random supplied by Java.
2020-12-25 15:57:10 -05:00
Paldiu dec35f76e4 Minor fix
Switched from a lengthy if else to a ternary.
2020-12-25 15:51:17 -05:00