Ryan
05e118dcb4
Merge branch 'development' into ride-typo
2021-05-03 18:21:16 +01:00
Ryan
b12afbdc1f
Merge branch 'development' into FS-137
2021-05-03 15:45:45 +01:00
Ryan
eb9107bedf
Merge branch 'development' into FS-156
2021-05-03 15:45:25 +01:00
Ryan
951c699ed0
Remove a number of wipe commands we don't want anyway
...
We shouldn't be wiping any of this data within the server now anyway so let's not tempt fate again.
2021-05-03 15:44:05 +01:00
Elmon11
6895e46375
Merge branch 'development' into ride-typo
2021-05-02 14:15:15 +02:00
Elmon11
1cf46c7337
grammar fix
2021-05-02 14:03:48 +02:00
Nathan Curran
f240a15af3
Force the count to be zero if the value is negative (FS-216) ( #56 )
2021-05-01 23:58:03 +10:00
Video
407b63e48b
Fixes FS-137
2021-04-26 01:23:24 -06:00
Video
be562fe722
ok, done (FS-156)
2021-04-26 00:58:28 -06:00
Video
928ab41d7f
Update Command_ride.java
2021-04-26 00:37:16 -06:00
Nathan Curran
d11d55b218
Vanished admins are no longer being counted (FS-148) ( #41 )
2021-04-24 14:06:28 +10:00
Video
debb95fb4c
video dev man ( #51 )
2021-04-24 13:03:11 +10:00
Nathan Curran
b9f7ab3ec3
Change punishment from kicking to muting on spam (FS-97) ( #45 )
2021-04-22 21:54:29 +10:00
Video
2cdf1e66a6
Disables block gravity and makes it togglable (FS-89) ( #50 )
...
* Disables block gravity by default (FS-89)
* Combine these checks as Codacy ever so kindly suggested
2021-04-19 17:34:36 +10:00
Nathan Curran
20c2c4c96e
Delete /wipeuserdata (FS-196) ( #49 )
2021-04-15 22:07:22 +10:00
Video
d5238150d0
Curse be gone ( #47 )
...
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-04-13 14:13:47 +10:00
abhiram
0c2f0a714c
[+] Fix #replace()
2021-04-12 16:31:48 +05:30
abhiram
4c67553bdd
[+] Whitespace change!
2021-04-12 16:26:06 +05:30
abhiram
ffab5e3c12
[+] Allman style formating
2021-04-12 16:01:31 +05:30
abhiram
f7556a4861
[+] Remove redundant comments
2021-04-12 15:59:27 +05:30
abhiram
385fc77771
[+] Done all the requested changes!
2021-04-12 15:44:51 +05:30
abhiram
b852ea1822
[+] Update my account in developers list
2021-04-12 14:44:27 +05:30
abhiram
4a5a3a1a2d
[+] Fix FS-191
2021-04-12 13:57:58 +05:30
Ryan
85d90090c8
Merge branch 'development' into Elmon11-patch-2
2021-04-11 18:41:54 +01:00
Video
16e06bd932
Forgot I had this there
2021-04-07 19:45:03 -06:00
Video
a33c310757
Fucking shit
2021-04-07 19:41:13 -06:00
Video
df21bdfa7e
Other bug fixes
...
Credit to Fleek for some of the code here.
Bugs that were fixed:
* [Media] showing up with an extra space at the beginning of blank messages with attachments
* Admin chat using incorrect colors for its ranks in messages from Discord to Minecraft
* Admin notes not sending to admins, only admin impostors
2021-04-07 19:40:19 -06:00
Nathan Curran
d7e2c0da42
Merge branch 'development' into Elmon11-patch-2
2021-04-07 11:52:16 +10:00
Video
a7529b41fb
Oops
2021-04-05 18:08:24 -06:00
Video
c4fce3f0f9
Right, so this change applies only to commands. For the sake of code consistency, I tried to change as many as possible to use FreedomCommand.msg instead of CommandSender.sendMessage for their messages. Here are a list of the files containing those changes:
...
* Command_adminworld.java
* Command_adventure.java
* Command_banip.java
* Command_blockedit.java
* Command_blockpvp.java
* Command_cage.java
* Command_cartsit.java
* Command_clearchat.java
* Command_clearinventory.java
* Command_commandlist.java
* Command_creative.java
* Command_deop.java
* Command_deopall.java
* Command_dispfill.java
* Command_doom.java
* Command_gcmd.java
* Command_hubworld.java
* Command_inspect.java
* Command_list.java
* Command_lockup.java
* Command_manageshop.java
* Command_manuallyverify.java
* Command_masterbuilderworld.java
* Command_mbconfig.java
* Command_moblimiter.java
* Command_mp44.java
* Command_mute.java
* Command_nickfilter.java
* Command_op.java
* Command_opall.java
* Command_opme.java
* Command_potion.java (Also corrected the inconsistent "player not found" message's color)
* Command_rank.java
* Command_ride.java
* Command_saconfig.java
* Command_scare.java
* Command_setplayerlimit.java
* Command_settotalvotes.java
* Command_smite.java
* Command_spectator.java
* Command_survival.java
* Command_unblockcmd.java
* Command_uncage.java
* Command_unmute.java
* Command_verifynoadmin.java
Here are some commands I added functionality to:
* Command_dispfill.java: Added some code that hooks into the CoreProtect API to log the items being removed from and added into the dispensers.
* Command_setlever.java: Added some code that hooks into the CoreProtect API to log the levers being interacted with.
Here's a command I fixed a critical bug in:
* Command_setlever.java
2021-04-05 17:13:26 -06:00
Ryan
27f5f18962
FS-143 Resolution ( #42 )
...
* Bump to patch version.
* Fixes FS-143
Various changes to make it work better with logging and things like that.
2021-04-06 07:11:12 +10:00
Elmon11
dca5e30291
Actually display assistant exec in game ( #37 )
...
* Actually display assistant exec in game
* Update RankManager.java
* Update ConfigEntry.java
* Update FUtil.java
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-04-04 22:24:06 +10:00
TFTWPhoenix
14309275fb
Remove /premium
2021-03-31 15:16:01 -05:00
Paldiu
97672c2fff
Update DiscordToAdminChatListener.java
...
This is the only way we can load media after [Discord] and [Formatting] without rewriting the method
2021-03-22 09:57:09 -05:00
Paldiu
5837b05a35
Merge branch 'tfm-bugfix-001' of https://github.com/AtlasMediaGroup/TotalFreedomMod into tfm-bugfix-001
2021-03-21 14:02:51 -05:00
Paldiu
b3b68ebd13
Switch to Allman Formatting
2021-03-21 14:02:43 -05:00
Elmon11
2dbbb5c262
Intellij says this is fine so if it breaks again gg
2021-03-21 19:07:07 +01:00
Elmon11
e45655edbb
im a clown
2021-03-21 18:33:38 +01:00
Elmon11
9713fcabd6
Should work fingers crossed
2021-03-21 18:25:28 +01:00
Elmon11
dc10c40578
noclear option in smite
2021-03-21 13:57:24 +01:00
Nathan Curran
db3c190b2b
Merge branch 'development' into tfm-bugfix-001
2021-03-21 16:11:13 +11:00
Nathan Curran
9f291f675c
Use 'toEpochMilli()' instead (FS-147)
2021-03-21 13:44:55 +11:00
Nathan Curran
561c192c27
Fix bans not expiring (FS-147)
2021-03-21 12:21:15 +11:00
Paldiu
b03870c0aa
SQL Fixes
...
:)
2021-03-19 10:39:58 -05:00
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
Paldiu
97edce0a67
Fixes for Codacy;
...
These fixes are designed to satisfy codacy.
However, codacy reports a NPath Complexity of 649, whereas the current, recommended, and standardized threshold is 200.
This is caused by FreedomCommand#execute(CommandSender, String, String[]);
2020-12-25 15:35:33 -05:00
Paldiu
361aa4ee04
Bugfix on Commit #5c0f77c
...
A mismatched argument count during constructor initialization in Module_logs.class was fixed in this patch.
2020-12-25 15:20:34 -05:00
Paldiu
5c0f77c7c5
Removal of Lombok
...
Lombok implementation removal.
I have also gone through and replaced things with inline methods and variables, lambdas, and simplified loops down, removed unnecessary guard clauses, and overall cleaned up every single class. This took a long time, please do remember to follow proper naming conventions, don't include unnecessary guard clauses, follow exception rules and comment rules, and please PLEASE remember to use the DIAMOND OPERATOR rather than just inferring RAW TYPES!!!
Thank you!!
2020-12-25 14:46:43 -05:00
speed
210b0f8b43
unnecessary
2020-12-24 20:07:09 -05:00
speed
585fdb7992
fix verification toggle breaking everything (FS-39)
2020-12-24 19:48:52 -05:00
speed
de496970d9
remove reddit system
...
jraw free 🦀 🦀 🦀
2020-12-24 13:09:42 -05:00
