Commit Graph

2012 Commits

Author SHA1 Message Date
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
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 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
Ryan
9e73db0f24
Merge branch 'development' into FS-137 2021-05-03 19:46:59 +01:00
Ryan
951c061d77
Merge pull request #57 from AtlasMediaGroup/Elmon11-patch-2
grammar fix
2021-05-03 19:46:37 +01:00
Ryan
579d3e0719
Merge branch 'development' into Elmon11-patch-2 2021-05-03 19:13:39 +01:00
Ryan
9777733d04
Merge pull request #53 from VideoGameSmash12/ride-typo
Fixes typo in /ride
2021-05-03 19:13:26 +01:00
Ryan
05e118dcb4
Merge branch 'development' into ride-typo 2021-05-03 18:21:16 +01:00
Ryan
7a0d6f49f4
Merge pull request #52 from VideoGameSmash12/FS-156
Fixes typo in the Lightning Rod's name (FS-156)
2021-05-03 18:20:20 +01:00
Ryan
19f1b7f6bd
Merge branch 'development' into Elmon11-patch-2 2021-05-03 15:45:54 +01:00
Ryan
b12afbdc1f
Merge branch 'development' into FS-137 2021-05-03 15:45:45 +01:00
Ryan
49e77d4f93
Merge branch 'development' into ride-typo 2021-05-03 15:45:36 +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
Ryan
9e676143b8
2021.04 Release
Formal Release for 2021.04
2021-05-03 15:19:42 +01:00
Elmon11
6895e46375
Merge branch 'development' into ride-typo 2021-05-02 14:15:15 +02:00
Ryan
c8b20bc255
RC2 Release 2021-05-02 13:12:37 +01: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
Ryan
6073712fdf
Bump Version
Bump Version to 2021.04-RC01
2021-04-26 20:46:11 +01: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