Commit Graph
100 Commits
Author SHA1 Message Date
VideoandGitHub aa20a6e579 Merge pull request #129 from AtlasMediaGroup/FS-7
Allow players to pay other players coins [FS-7]
2021-11-29 06:23:57 -07:00
VideoandGitHub 1ecfb0b066 Merge branch 'development' into FS-7 2021-11-29 03:01:22 -07:00
VideoandGitHub 706229004c Merge pull request #131 from AtlasMediaGroup/FS-273
Moves /rainbowtrail to the shop (FS-273)
2021-11-29 03:00:15 -07:00
VideoandGitHub a4adfa9bee Merge branch 'development' into FS-273 2021-11-29 02:46:41 -07:00
VideoandGitHub 225ade8753 Merge branch 'development' into FS-7 2021-11-29 02:46:02 -07:00
VideoandGitHub a42cb6aff9 Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
Shitcans SavedFlags
2021-11-29 02:41:34 -07:00
VideoandGitHub 01fdf766ee Merge branch 'development' into shitcan-savedflags 2021-11-23 09:28:48 -07:00
VideoandGitHub 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
VideoandGitHub 1b5bbd1c05 Merge branch 'development' into FS-273 2021-11-23 09:16:21 -07:00
VideoandGitHub 2ecfb88604 Merge pull request #130 from AtlasMediaGroup/FS-215
Makes [Discord] a hyperlink (FS-215)
2021-11-23 09:15:16 -07:00
Video 8356e831a5 Redundancy fix and better protection system 2021-11-23 09:11:16 -07:00
VideoandGitHub ab00cb840f Merge branch 'development' into FS-273 2021-11-23 03:31:45 -07:00
VideoandGitHub bb2ddf1129 Merge branch 'development' into FS-215 2021-11-23 03:31:19 -07:00
VideoandGitHub 58c21bb1aa Merge branch 'development' into shitcan-savedflags 2021-11-23 03:30:48 -07:00
VideoandGitHub 42143c1163 Merge pull request #168 from AtlasMediaGroup/main
merge down into development
2021-11-22 12:35:18 -07:00
Video 1e1367d08f Bump to RC03 2021-11-13 02:58:36 -07:00
VideoandGitHub 3f690e2ca1 Merge pull request #167 from AtlasMediaGroup/whoops
Fixes an oopsie I made whilst sleep deprived
2021-11-13 02:48:51 -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
VideoandGitHub ecce62f6b4 Merge branch 'development' into FS-273 2021-10-09 00:01:22 -06:00
VideoandGitHub cf9fdc6fe4 Merge branch 'development' into FS-215 2021-10-08 01:43:33 -06:00
Video 74a71b1843 Important bugfix
It appears someone had an extremely big brain moment.
2021-10-04 16:02:39 -06:00
VideoandGitHub 912bc1a1e4 Merge pull request #154 from AtlasMediaGroup/development
Development
2021-10-03 07:02:37 -06:00
VideoandGitHub a598c933ec Merge pull request #151 from AtlasMediaGroup/FS-421
Two fixes (FS-421)
2021-10-03 06:52:45 -06:00
Video 936f0b621e Stupid simple fix
Fixes an oopsie I made and an oopsie someone else made which broke the entire plugin.
2021-10-03 06:45:02 -06:00
VideoandGitHub 387ea6f71e Merge branch 'development' into FS-215 2021-10-01 00:35:12 -06:00
VideoandGitHub 61857dd06f Merge branch 'development' into shitcan-savedflags 2021-09-12 03:01:37 -06:00
VideoandGitHub bd647afe92 Merge branch 'development' into FS-215 2021-09-12 02:50:39 -06:00
VideoandGitHub 69f17ef2d7 Merge branch 'development' into FS-215 2021-09-12 02:01:56 -06:00
VideoandGitHub aebe1acec2 Merge pull request #136 from AtlasMediaGroup/multiple-birds-one-stone
Multiple fixes, one commit
2021-09-12 01:57:32 -06:00
VideoandGitHub 938b3aa630 Merge branch 'development' into multiple-birds-one-stone 2021-09-11 20:53:16 -06:00
VideoandGitHub fedf80b834 Merge branch 'development' into FS-7 2021-09-10 01:39:16 -06:00
VideoandGitHub 2bdf14f38c Merge branch 'development' into FS-215 2021-09-06 15:26:13 -06:00
VideoandGitHub b1062fbb6c Merge branch 'development' into FS-273 2021-09-06 14:39:32 -06:00
VideoandGitHub f00f075551 Merge branch 'development' into multiple-birds-one-stone 2021-09-06 14:38:42 -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 f69feed469 fixed 2021-09-06 01:14:21 -06:00
VideoandGitHub 8253f94ac4 Merge branch 'development' into FS-273 2021-09-06 01:12:00 -06:00
54cb0cfac4 FS-409 (#124)
Co-authored-by: Ryan <[email protected]>
2021-09-05 14:51:43 +01:00
Video a51f5c9bbf FS-273 2021-09-03 13:53:33 -06: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
VideoandGitHub 0582c2e5be Merge pull request #94 from AtlasMediaGroup/FS-381
Enables Lava Damage by default (FS-381)
2021-08-10 22:38:24 -06:00
VideoandGitHub 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
VideoandGitHub c8a4382a7b Merge pull request #96 from AtlasMediaGroup/FS-218
Adds functionality for a one-time message to be sent to new players (FS-218)
2021-08-10 07:41:42 -06: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
VideoandGitHub 4ac9844534 Merge branch 'development' into FS-309 2021-07-12 22:53:44 -06:00
VideoandGitHub 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
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 <[email protected]>
2021-06-26 14:25:08 +01:00
VideoandGitHub f57fc56f4a Merge pull request #83 from AtlasMediaGroup/FS-239-to-FS-242
Logs even more punishment types (FS-239, FS-240, FS-241, FS-242)
2021-06-19 03:20:47 -06:00
VideoandGitHub 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
VideoandGitHub 4e78027f0c Merge pull request #79 from AtlasMediaGroup/FS-307
Fixes the EntityWiper not toggling properly (FS-307)
2021-06-17 06:12:26 -06:00
VideoandGitHub 721f4f9fc3 Merge branch 'development' into FS-307 2021-06-17 05:56:56 -06:00
VideoandGitHub 24ad2611a9 Merge pull request #81 from AtlasMediaGroup/FS-201
Admins can now see commands of everyone, regardless of rank (FS-201)
2021-06-17 05:54:10 -06:00
VideoandGitHub c238f251f2 Merge branch 'development' into FS-201 2021-06-17 05:46:40 -06:00
VideoandGitHub 02848e3439 Merge pull request #82 from AtlasMediaGroup/FS-199
Prevents entities of type PLAYER from being purged in /entitywipe (FS-199)
2021-06-17 05:46:28 -06:00
VideoandGitHub 9550f54e2b Merge branch 'development' into FS-199 2021-06-17 05:37:30 -06:00
VideoandGitHub 39dade78e3 Merge pull request #80 from AtlasMediaGroup/FS-24-Round-2
Code quality improvements (FS-24)
2021-06-17 05:35:55 -06:00
VideoandGitHub 5b6d8b01a4 Merge branch 'development' into FS-24-Round-2 2021-06-17 05:25:42 -06:00
VideoandGitHub 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
VideoandGitHub 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
VideoandRyan 53c5991971 Addresses FS-224 (#70) 2021-06-07 16:26:15 +01:00
VideoandRyan 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 <[email protected]>
2021-06-07 16:26:15 +01:00
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 <[email protected]>
Co-authored-by: Nathan Curran <[email protected]>
2021-06-07 16:26:15 +01:00
VideoandRyan f85f3e32ea Fixes FS-137 2021-06-07 16:26:15 +01:00
VideoandRyan 57b3351047 ok, done (FS-156) 2021-06-07 16:26:15 +01:00
VideoandRyan dd10eb3f5e Update Command_ride.java 2021-06-07 16:26:15 +01:00
VideoandGitHub 8c7bf365a0 Addresses FS-224 (#70) 2021-05-26 19:55:49 +10:00
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 <[email protected]>
2021-05-09 16:42:31 +01:00
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 <[email protected]>
Co-authored-by: Nathan Curran <[email protected]>
2021-05-04 13:31:55 +01:00
VideoandGitHub 8a504bff07 Merge branch 'development' into FS-221 2021-05-03 22:15:20 -06: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
VideoandGitHub debb95fb4c video dev man (#51) 2021-04-24 13:03:11 +10:00
VideoandGitHub 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
d5238150d0 Curse be gone (#47)
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Nathan Curran <[email protected]>
2021-04-13 14:13:47 +10: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
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
VideoandGitHub 48ee7b0e6d Inconsistency and Ridiculous Bug Corrections (#189) 2020-03-16 17:58:44 -07:00