Commit Graph

857 Commits

Author SHA1 Message Date
Video
ee804d52ff Makes [Discord] a hyperlink (FS-215)
I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily.
2021-09-03 12:52:15 -06:00
Ivan
f380898bb7
yo remove my name (#123)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-08-26 16:22:08 +01:00
Video
6874b2ce13
Fixes /setlevel by completely removing it (FS-82) (#95)
To quote Ryan:
> If /exp works (and we've said it has) then the scope of this ticket will be to just go remove the TFM command...

This does exactly that.
2021-08-10 17:33:48 +01:00
Video
3f89f3f48e Shut the fuck up Codacy 2021-08-10 06:58:04 -06:00
Video
871acc2eeb Actually, let's make it possible to disable it if needed 2021-08-10 04:13:23 -06:00
Video
a9c9979b1c FS-218 2021-08-10 04:06:41 -06:00
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