Commit Graph

903 Commits

Author SHA1 Message Date
Video
225ade8753
Merge branch 'development' into FS-7 2021-11-29 02:46:02 -07:00
Video
01fdf766ee
Merge branch 'development' into shitcan-savedflags 2021-11-23 09:28:48 -07:00
Video
afe755f5c1
Merge branch 'development' into FS-7 2021-11-23 09:26:59 -07:00
Video
5f97e68e0e fuck it, it works 2021-11-23 09:26:49 -07:00
Video
bb2ddf1129
Merge branch 'development' into FS-215 2021-11-23 03:31:19 -07:00
Video
58c21bb1aa
Merge branch 'development' into shitcan-savedflags 2021-11-23 03:30:48 -07:00
Video
abfa3b977c Whoops
This commit fixes 2 things:
1. A redundant check that was completely unnecessary
2. A loophole in my original bugfix commit I didn't initially discover until afterwards which enables players to do the same thing except with right clicking instead

The block inspector should be completely rewritten in the future, but for now it works.
2021-11-13 02:35:30 -07:00
Video
74a71b1843 Important bugfix
It appears someone had an extremely big brain moment.
2021-10-04 16:02:39 -06:00
Ryan
5a6a5ff75d
Merge branch 'development' into FS-7 2021-09-12 13:48:50 +01:00
Video
61857dd06f
Merge branch 'development' into shitcan-savedflags 2021-09-12 03:01:37 -06:00
Video
69f17ef2d7
Merge branch 'development' into FS-215 2021-09-12 02:01:56 -06:00
Ryan
2d18d461fe
Merge branch 'development' into shitcan-savedflags 2021-09-11 01:23:44 +01:00
Video
fedf80b834
Merge branch 'development' into FS-7 2021-09-10 01:39:16 -06:00
Video
2bdf14f38c
Merge branch 'development' into FS-215 2021-09-06 15:26:13 -06:00
Video
032e54e2d4 Multiple birds, one commit
Here's a list of things I've fixed/mitigated:
- Range bans in ban-related commands (FS-209)
- Bug in /tempban where the duration in the broadcast is always wrong
- Over-complicated handling of /tempban durations (instead of trying to process them and silently fail, it'll flat out say that an invalid duration is well, invalid)
- Inconsistent "player not found" messages in banning commands
- (Mitigates) weird issue with case-sensitive usernames in banning commands when the server has restarted since a player last joined
- (Mitigates) banned IPs being inaccurate when a player was banned offline whilst containing multiple IPs in their playerdata
- Redoing how MovementValidator handled positive and negative infinity exploit items, completely removing the need for Mojangson in the first place and allowing the plugin to run without Essentials once more in the process (related to FS-406)

Here is what I've done in addition:
- Merged /tban and /noob into /tempban, which now bans for 5 minutes by default (FS-205)
2021-09-06 04:44:39 -06:00
Video
54cb0cfac4
FS-409 (#124)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-09-05 14:51:43 +01:00
Ryan
a4c81f202c
Merge branch 'development' into shitcan-savedflags 2021-09-04 01:23:06 +01:00
Ryan
f6d46b6178
Merge branch 'development' into FS-215 2021-09-04 01:07:33 +01:00
Ryan
a2d11d4b93
Merge branch 'development' into FS-7 2021-09-04 01:07:28 +01:00
Ryan
23caa4e853
Dependency Fix & Improvements (#132)
* Upgrade Test

Going to see if switching to the new repo that went live 3 days ago and updating TFM to pull the latest version of Essentials is going to help things here. TFM is building locally so I haven't a fucking scooby doo why Github can't run the build because I've even tried dropping the M2 folder...

* Let's try again

Utter bullshit so far.

* Apparently we don't even use essentials...

No idea where the imports for EssentialsBridge are coming from...

* Various tweaks

Hopefully this might give some more joy, but if not it's removed a command I didn't want anyway and reduced our dependency tree.

I have also switched it to using the ATLAS Artafactory which will serve as an ongoing cache for dependencies and should start to speed up our Github builds as Maven is rubbish with many repo's.
2021-09-04 01:07:04 +01:00
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
Video
dc490659c1 Begins implementing FS-7
should be good enough, but feedback would be lovely
2021-09-03 00:07:20 -06:00
Video
e2ccd14eb3 Unsaves SavedFlags 2021-08-27 16:54:55 -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
Ryan
101987cc17
Merge branch 'development' into FS-381 2021-08-10 17:34:03 +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
Ryan
3be0ffba4e
Merge branch 'development' into FS-381 2021-08-10 17:31:26 +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
fc3fe871b3 FS-381 2021-08-05 00:43:01 -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