Commit graph

2088 commits

Author SHA1 Message Date
Video 9550f54e2b
Merge branch 'development' into FS-199 2021-06-17 05:37:30 -06:00
Video 39dade78e3
Merge pull request #80 from AtlasMediaGroup/FS-24-Round-2
Code quality improvements (FS-24)
2021-06-17 05:35:55 -06:00
Video 5b6d8b01a4
Merge branch 'development' into FS-24-Round-2 2021-06-17 05:25:42 -06:00
Video 96bc83cead
Merge pull request #78 from AtlasMediaGroup/FS-207
Two fixes, one commit (FS-207)
2021-06-17 04:58:26 -06:00
Video be700a90ce Simple fix 2021-06-16 22:42:45 -06:00
Video 6d1fce1716 FS-201 2021-06-16 22:06:12 -06:00
Video d3665f31fe Shut up Codacy 2021-06-16 21:56:25 -06:00
Video 4188cb80fa FS-54 2021-06-16 21:10:08 -06:00
Video 62fe72d99b Code quality and consistency improvements
Here's all the changes I've made in this commit:
- Resolves FS-44 (AutoEject.java)
- Resolves FS-45 (BlockBlocker.java)
- Resolves FS-47 and FS-48 (InteractBlocker.java)
- Resolves FS-49 (Command_cage.java)
- Resolves FS-50 (Command_manageshop.java)
- Resolves FS-51 (Command_notes.java)
- Resolves FS-52 (Command_potion.java)
- Resolves FS-53 (Command_tag.java)
- Resolves FS-55 (ItemFun.java)
- Resolves FS-56 (Module_list.java)
- Resolves FS-57 (Module_players.java)
- Removes redundant code from InteractBlocker.java
- Misc. code consistency corrections (global)
2021-06-16 21:10:08 -06:00
Video f4749559d2 FS-25 2021-06-16 21:10:08 -06:00
Video ed815794ed FS-26 2021-06-16 21:10:08 -06:00
Video 0c12a19d1d FS-27 2021-06-16 21:10:08 -06:00
Video 96d47e8e0c Update EntityWiper.java 2021-06-16 17:47:09 -06:00
Video 3027e2a18c Two fixes, one commit
To kill two birds with one stone, I've done two fixes in this commit.
- Fixes issue that caused quiet warns to behave improperly (e.g. the warnings wouldn't increment if quiet)
- Added WARN to the PunishmentType list.
2021-06-16 17:29:57 -06:00
Ryan 06025b2e69
Updated permissions to re-baseline with the dev server (#75)
Updating this to be based off of the dev server as it seems this has not been updated in some time. Primary purpose is to add the crackshot bypass removal for everyone (Though allow admins to bypass) and to add a start of network manager perms in the hopes it makes it more usable going forward.
2021-06-13 19:51:27 +01:00
Video da7e8f64aa
Continuation on that notes thing (#74)
I forgot to remove the dependency after I removed the code that used JSONMessage. This fixes that by removing both the repository and the dependency from the pom file.
2021-06-12 11:26:40 +01:00
Ryan 17b051e2a7 Retired support for 2021.02 fully. (#72) 2021-06-07 16:26:15 +01:00
Nathan Curran 77a05f22a8 TotalFreedomMod May Update 2021-06-07 16:26:15 +01:00
Nathan Curran 5c3ef1f107 Bump version 2021-06-07 16:26:15 +01:00
Video 53c5991971 Addresses FS-224 (#70) 2021-06-07 16:26:15 +01:00
Nathan Curran ff760a6c11 Use long instead of int and use offset to check time (FS-181) (#69)
* Use long instead of int and use offset to check time (FS-181)

* Remove star import
2021-06-07 16:26:15 +01:00
Nathan Curran 63069ff9ec Calculate the player count without offline players (FS-247) (#68)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-07 16:26:15 +01:00
Nathan Curran 5e63b71861 Small modification to new TFGuilds (FS-255) (#67) 2021-06-07 16:26:15 +01:00
Ryan b72782de4f Add //g to blocked commands (#62)
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-06-07 16:26:15 +01:00
Nathan Curran de9556c550 Name change for Fleek (#64) 2021-06-07 16:26:15 +01:00
Nathan Curran 6590504545 Added new dependency to allow TFM to compile (#65) 2021-06-07 16:26:15 +01:00
Ryan 8d1e8dcf05 Switched from -c to -ci (#63)
Resolves FS-219
2021-06-07 16:26:15 +01:00
Video 07b5076717 Bug fixes, improvements, and removals (FS-192) (#46)
* Three fixes

* Fixes /tempban throwing a NullPointerException when trying to get a player who isn't on the server but was in the past
* Fixes /tempban banning players for 24 hours regardless of the duration defined
* Fixes /list -t throwing a NullPointerException when performed from a non-player source (such as Telnet)

* Removes hubworld entriely

* Configurable blacklists for tag, muted commands, and wildcard

Changes:
* Moves globally blocked commands to the `global` subsection of the original `blocked_commands` section. You *will* need to update your configurations
* /wildcard's command blacklist is now configurable under the `wildcard` section in `blocked_commands`.
* The commands muted players can't use are now configurable under the `muted` section in `blocked_commands`.
* Removes some commented-out globally blocked command entries.

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-07 16:26:15 +01:00
Video 6fb9507a4c Why overcomplicating things is a horrifically bad idea (#55)
The longer I look into this plugin's code, the angrier I will become.

This fixes 2 bugs in the /potion command:
- Fixes non-admins being able to clear other players
- Fixes NPE caused when trying to add potion effects to players who are not on the server as a non-admin.

Both of these issues are caused by overcomplicating seemingly simple solutions, hence the name of this commit.

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-06-07 16:26:15 +01:00
Ryan 879a524bb4 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-06-07 16:26:15 +01:00
Elmon11 c60b451ce7 grammar fix 2021-06-07 16:26:15 +01:00
Video f85f3e32ea Fixes FS-137 2021-06-07 16:26:15 +01:00
Video 57b3351047 ok, done (FS-156) 2021-06-07 16:26:15 +01:00
Video dd10eb3f5e Update Command_ride.java 2021-06-07 16:26:15 +01:00
Ryan Wild a498104777 Merge branch 'main' of github.com:AtlasMediaGroup/TotalFreedomMod into development 2021-06-07 16:22:43 +01:00
Ryan 4e577f97fa
Enable downward Sync from main (#60)
We want to make sure anything on the main branch which is commited makes it's way down to the dev and other branches.
2021-05-28 15:22:07 +01:00
Video 8c7bf365a0
Addresses FS-224 (#70) 2021-05-26 19:55:49 +10:00
Nathan Curran eedb7a5375
Use long instead of int and use offset to check time (FS-181) (#69)
* Use long instead of int and use offset to check time (FS-181)

* Remove star import
2021-05-25 21:45:53 +10:00
Nathan Curran d047cfc8ff
Calculate the player count without offline players (FS-247) (#68)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-05-22 15:40:55 +01:00
Nathan Curran 9ff5da8d8f
Small modification to new TFGuilds (FS-255) (#67) 2021-05-22 15:06:34 +01:00
Ryan ac615f54f7
Add //g to blocked commands (#62)
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-05-21 22:44:51 +01:00
Nathan Curran 21af722e23
Name change for Fleek (#64) 2021-05-17 20:31:34 +10:00
Nathan Curran b1196fcf00
Added new dependency to allow TFM to compile (#65) 2021-05-17 06:50:09 +01:00
Ryan d170f6d323
Switched from -c to -ci (#63)
Resolves FS-219
2021-05-16 15:27:12 +01:00
Video 9dd0298f56
Bug fixes, improvements, and removals (FS-192) (#46)
* Three fixes

* Fixes /tempban throwing a NullPointerException when trying to get a player who isn't on the server but was in the past
* Fixes /tempban banning players for 24 hours regardless of the duration defined
* Fixes /list -t throwing a NullPointerException when performed from a non-player source (such as Telnet)

* Removes hubworld entriely

* Configurable blacklists for tag, muted commands, and wildcard

Changes:
* Moves globally blocked commands to the `global` subsection of the original `blocked_commands` section. You *will* need to update your configurations
* /wildcard's command blacklist is now configurable under the `wildcard` section in `blocked_commands`.
* The commands muted players can't use are now configurable under the `muted` section in `blocked_commands`.
* Removes some commented-out globally blocked command entries.

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-05-09 16:42:31 +01:00
Video bdf4ca84e0
Why overcomplicating things is a horrifically bad idea (#55)
The longer I look into this plugin's code, the angrier I will become.

This fixes 2 bugs in the /potion command:
- Fixes non-admins being able to clear other players
- Fixes NPE caused when trying to add potion effects to players who are not on the server as a non-admin.

Both of these issues are caused by overcomplicating seemingly simple solutions, hence the name of this commit.

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-05-04 13:31:55 +01:00
Ryan caaa067096
Update Security Matrix (#59)
* Update Security Matrix

Updating the full security matrix.

* Yay for consistency

* I hate Markdown / Markup / Whatever the fuck this is.
2021-05-04 13:30:17 +01:00
Ryan 7258d7f1bf
Merge pull request #58 from AtlasMediaGroup/FS-221
Remove a number of wipe commands we don't want anyway
2021-05-04 12:59:31 +01:00
Video 8a504bff07
Merge branch 'development' into FS-221 2021-05-03 22:15:20 -06:00
Ryan c00e64f736
Merge pull request #54 from VideoGameSmash12/FS-137
Assistant executive discord integration (FS-137)
2021-05-03 20:14:35 +01:00