Ryan
85d90090c8
Merge branch 'development' into Elmon11-patch-2
2021-04-11 18:41:54 +01:00
Ryan
09930c2d9a
Merge pull request #43 from VideoGameSmash12/development
...
Consistency fixes (across 46 commands), additional CoreProtect integration (/dispfill and /setlever), and a critical bugfix (/setlever) (FS-162)
2021-04-10 12:56:32 +01:00
Ryan
7ae1ab035a
Merge branch 'development' into development
2021-04-10 12:50:52 +01:00
Ryan
2bd1787663
Updated supported versions for TFM.
2021-04-10 12:45:56 +01:00
Ryan
765b7dcc4b
Merge branch 'development' into development
2021-04-10 12:39:47 +01:00
Ryan
091381a076
Merge pull request #44 from AtlasMediaGroup/FS-145
...
Update JDA version and location (FS-145)
2021-04-10 12:39:08 +01:00
Nathan Curran
27dfd71b2e
Update JDA version and location (FS-145)
2021-04-09 21:20:33 +10: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
09a435053e
Merge pull request #40 from AtlasMediaGroup/phoenix-patch-1
...
Remove /premium
2021-03-31 17:12:56 -05:00
TFTWPhoenix
14309275fb
Remove /premium
2021-03-31 15:16:01 -05:00
Ryan
2375e92d90
Merge pull request #36 from AtlasMediaGroup/tfm-bugfix-001
...
FS-143
2021-03-26 15:43:22 +00: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
Paldiu
2725857364
Merge pull request #38 from AtlasMediaGroup/FS-147
...
Fix ban expiration (FS-147)
2021-03-20 22:14:10 -05: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
Ryan
086dec28ac
Merge branch 'development' into tfm-bugfix-001
2021-03-19 23:31:31 +00:00
Paldiu
b03870c0aa
SQL Fixes
...
:)
2021-03-19 10:39:58 -05:00
Ryan
f5c08cd28b
Merge pull request #34 from AtlasMediaGroup/2021.02-release
...
Bump version to 2021.02 Release
2021-03-19 14:26:02 +00:00
Paldiu
2a87271642
Should fix FS-143
2021-03-19 08:58:29 -05:00
Ryan
3b57aec0e8
Merge branch 'development' into 2021.02-release
2021-03-18 23:57:10 +00:00
Ryan
efac65bc76
Merge pull request #35 from AtlasMediaGroup/FS-58
...
Fix checkstyle & other formatting
2021-03-18 23:17:25 +00:00
Ryan Wild
9c8fe6c590
Fix checkstyle & other formatting
...
This should help clear a lot of the "Security" alerts resolving FS-58
2021-03-18 22:42:52 +00:00
Ryan
9f52cdf753
Merge branch 'development' into 2021.02-release
2021-03-18 22:28:53 +00:00
Paldiu
216234ea01
Merge pull request #32 from AtlasMediaGroup/FS-33
...
Properly fix FS-33
2021-03-18 16:20:06 -05:00
Nathan Curran
881dead392
Merge branch 'development' into 2021.02-release
2021-03-19 08:04:36 +11:00
Ryan
ff2bca26aa
Merge branch 'development' into FS-33
2021-03-18 19:58:10 +00:00
Ryan Wild
89ad934aa6
Bump version to 2021.02 Release
2021-03-18 19:18:11 +00:00
Paldiu
d0a195647c
Merge pull request #33 from AtlasMediaGroup/FS-93
...
Fixed permission not setting for new players (FS-93)
2021-03-17 09:06:45 -05: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 Wild
2fb8f224e7
Bump release to 2021.02-RC03
2021-03-06 23:38:46 +00:00
Ryan
b6a2c8e021
Merge pull request #29 from AtlasMediaGroup/abhi-test
...
Added myself to TFM
2021-03-06 20:32:04 +00:00
Ryan
f0a25fde0c
Merge branch 'development' into abhi-test
2021-03-06 20:03:19 +00:00
