Video
4ac9844534
Merge branch 'development' into FS-309
2021-07-12 22:53:44 -06:00
Ryan
92bbb62379
Temporarily re-naming /clearchat to /cleanchat ( #91 )
...
* Temporarily re-naming /clearchat to /cleanchat
Due to another plugin which currently doesn't quite have all the permissions working, this command is not currently able to be executed as it stands.
* Shhh I know I'm an idiot
2021-07-05 23:29:22 +01:00
Video
e4a0943af2
Merge branch 'development' into FS-309
2021-06-29 22:00:13 -06:00
Video
36bd8c0fad
2 bugfixes
...
- Fixes FS-309 by checking if a material provided is actually a block before caging someone.
- Fixes a bug that causes the command to throw an ArrayOutOfBoundsException if one were to use a command like `/cage player1 block`.
2021-06-29 21:52:46 -06:00
Nathan Curran
d77f59435b
Use 'getPlayer()' to prevent NPE (FS-159) ( #87 )
...
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-26 15:06:15 +01:00
Video
a08fd2afb6
Adds /seed command (FS-225) ( #85 )
...
* Create Command_seed.java
* Addresses requested changes
* My IDE decided to try to "fix" things with *s in imports
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-26 14:25:08 +01:00
Ryan
a6ca6b122c
Merge branch 'development' into FS-239-to-FS-242
2021-06-18 13:24:15 +01:00
Video
064e73f58b
ez ( #77 )
2021-06-18 13:16:52 +01:00
Video
32138b2e59
Order of operations fix
2021-06-17 13:41:25 -06:00
Video
e1c3bad4d0
Even more punishment log types
...
Here's what I've changed in this commit:
- Adds /blockcmd to the punishment log (FS-239)
- Adds /blockedit and /blockpvp to the punishment log (FS-240)
- Adds /cage to the punishment log (FS-241)
- Adds /orbit to the punishment log (FS-242)
- Changes the order of operations in some commands to be a bit more consistent
2021-06-17 06:56:52 -06:00
Video
721f4f9fc3
Merge branch 'development' into FS-307
2021-06-17 05:56:56 -06:00
Video
c238f251f2
Merge branch 'development' into FS-201
2021-06-17 05:46:40 -06:00
Video
9550f54e2b
Merge branch 'development' into FS-199
2021-06-17 05:37:30 -06:00
Video
5b6d8b01a4
Merge branch 'development' into FS-24-Round-2
2021-06-17 05:25:42 -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
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
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
Nathan Curran
21af722e23
Name change for Fleek ( #64 )
2021-05-17 20:31:34 +10: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
Video
8a504bff07
Merge branch 'development' into FS-221
2021-05-03 22:15:20 -06:00
Ryan
9e73db0f24
Merge branch 'development' into FS-137
2021-05-03 19:46:59 +01:00
Ryan
579d3e0719
Merge branch 'development' into Elmon11-patch-2
2021-05-03 19:13:39 +01:00
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
