TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity
5519 commits 5 branches 46 tags 420 MiB
Commit graph

3288 commits

Author SHA1 Message Date
triagonal
3d004d2a81 change config setting name 2018-12-31 16:42:42 +11:00
triagonal
42714ff8af implement config toggle for afk users bypassing sleep 2018-12-30 20:38:34 +11:00
md678685
0202271f00 Add missing FakeWorld methods 2018-12-29 21:16:17 +00:00
md678685
55074872fe Add setting to enable item ID recognition on signs 
Item IDs can now be enabled for existing signs by manually changing a config option, but there is no facility to create new signs with item IDs.
 2018-12-23 23:02:36 +00:00
md678685
28559dda3a Lowercase the provided ID in FlatItemDb#get 2018-12-23 19:45:23 +00:00
md678685
a9ad440860 Overhaul AbstractItemDb.serialize to use MaterialUtil methods 2018-12-23 19:32:10 +00:00
md678685
5104463593 Add MaterialUtil.getColorOf 2018-12-23 19:31:33 +00:00
md678685
4b1c51c21d Reword IItemDb#serialize docs 2018-12-23 18:02:38 +00:00
pop4959
64930e3771 Fix messages & add warning 2018-12-21 01:58:44 -08:00
pop4959
16381234e0 Implement tpauto command 2018-12-19 02:50:30 -08:00
md678685
492005d00a Fix LegacyItemID method override 2018-12-15 19:11:41 +00:00
md678685
149d9b61cc Add methods to facilitate conversion from IDs to new Materials 2018-12-15 18:54:01 +00:00
md678685
77ffb6a3d5 Slightly simplify FlatItemDb 2018-12-15 18:53:06 +00:00
md678685
d95b632884 Merge branch '2.x' into 1.13 2018-12-11 14:31:42 +00:00
md678685
579f554edb Update nickname again after toggling AFK status 2018-12-11 13:26:15 +00:00
md678685
050287f306 Add 1.13 enchantments 
Fixes #2254.
 2018-12-11 10:04:38 +00:00
md678685
dafe156212 Merge branch '2.x' into 1.13 2018-12-09 15:25:31 +00:00
md678685
769dbe8852 Fix BukkitVersion's toString and equals 2018-12-09 15:16:44 +00:00
md678685
89d592ce43 Improve item-spawn-blacklist load logging 2018-12-09 14:58:56 +00:00
md678685
c06dda886d Actually use the force-enable-recipe option from the config 2018-12-09 14:58:36 +00:00
md678685
5922b85290 Move SHIELD to from MetaItemStack to MaterialUtil 2018-12-09 13:47:52 +00:00
md678685
814e5a643e Add SIGNS and SPAWNER to MaterialUtil 2018-12-09 13:47:22 +00:00
md678685
2d703fbc80 Add damage value support to FlatItemDb 
...in case you wanted to give players broken swords, or something?
 2018-12-09 13:04:21 +00:00
md678685
1206178eca Use utility methods in MetaItemStack 2018-12-09 12:17:13 +00:00
md678685
3df3f8a812 Add several cross-version item type checks to MaterialUtil 2018-12-09 12:17:13 +00:00
md678685
7049952b07 Load forceEnableRecipe during Settings.reloadConfig 2018-12-09 12:17:13 +00:00
Mark Vadeika
a18ce40921 Hiding display names (#2248) @AllTheMegahertz 
Prevents a user's nickname from appearing if they are hidden, if `hide-displayname-in-vanish: true` in the config. Closes #2221.

* Does not return display name if user is hidden

* Added hide-displayname-in-vanish field

* Added hideDisplayNameInVanish()

* Changed to only hide display name if specified in config

* Changed hideDisplayNameInVanish to default to false if not specified in config.yml
 2018-12-09 11:02:45 +00:00
md678685
6a6383462d Allow admins to force enable /recipe if they want 
Add `force-enable-recipe`, which allows server admins to manually enable `/recipe` despite potential duplication exploits. Use this at your own risk!

Related: #1397
 2018-12-08 16:41:24 +00:00
md678685
44301fae4f Fix Worth.setPrice on 1.13+; add Javadocs to Worth 2018-12-08 16:32:09 +00:00
md678685
6ee84510ea Update bStats-Metrics 2018-12-06 17:49:08 +00:00
md678685
6ecdc8d7fc Enu-moo-til 2018-12-06 17:44:22 +00:00
md678685
35a2a4d803 Add several version warning messages 2018-12-06 17:41:32 +00:00
md678685
7b67b3b858 Don't send empty line join/quit messages 
GitHub meta: fixes #991 fixes #2289
 2018-12-06 14:06:25 +00:00
md678685
4011810536 Correctly use LegacyItemDb after detecting version < 1.13 2018-11-19 22:51:07 +00:00
md678685
85ea07c97e Fix VersionUtil regex matching and BukkitVersion.toString 2018-11-19 22:48:33 +00:00
md678685
41b2449cdd Change /enchant's default level from -1 to 1 2018-11-19 21:11:25 +00:00
md678685
ded6f06ed2 Merge remote-tracking branch 'origin/2.x' into 1.13 2018-11-19 19:48:38 +00:00
md678685
2605e050a0 Deduplicate ItemDb code 2018-11-19 19:41:01 +00:00
md678685
19b1e19e42 Remove extraneous imports 2018-11-19 19:30:35 +00:00
md678685
f7a1149cac Port old ItemDb back 2018-11-19 14:13:05 +00:00
md678685
7dd52dab32 Add non-NMS VersionUtil 
*Should* work on Glowstone. TODO: use this instead of ReflUtil where appropriate.
 2018-11-19 14:12:10 +00:00
md678685
ffc80d61af Implement missing FakeWorld and OfflinePlayer methods 2018-11-19 11:26:05 +00:00
md678685
ba959586e2 Merge remote-tracking branch 'games647/java9' into 1.13 2018-10-31 14:53:49 +00:00
md678685
4c07e584b7 Default to max stack size 2018-10-31 14:47:45 +00:00
Banbeucmas
280d1215de Adding EssentialsWarpEvent (#1921) @Banbeucmas 
* Adding EssentialsWarpEvent for checking if player is wrapping

* Spacing

* Adding Trade parameter

* Refactoring

* Adding #setWarp() to the Event

* Spacing

* Documenting the purpose of the Event

* Javadoc?
 2018-10-28 18:53:52 +00:00
md678685
22538ba7c9
Merge branch '1.13' into 2.x_feature_jail_no_teleport 2018-10-28 18:46:53 +00:00
montlikadani
a2a95ed840 Added acacia and dark oak tree types (#2001) @montlikadani 
* Update Commandbigtree.java

* Update Commandbigtree.java

* Update Commandtree.java
 2018-10-28 18:41:46 +00:00
md678685
9576ea25a6
Use reflection-based detection for pickup listener in player listener (#2151) 
Allows the plugin to start up on Glowstone correctly.

Tested on Spigot 1.12.2, Spigot 1.9.4 and Glowstone 2018.7.0, works correctly on all.
 2018-10-27 15:37:29 +01:00
md678685
a7fcafb245 Filter out comment lines when loading items.json 2018-10-27 15:00:04 +01:00
md678685
0a90d76493 Remove item IDs from Worth 2018-10-15 13:56:36 +01:00
md678685
010981d3c8 Remove ID-based charges in /repair 2018-10-15 13:51:04 +01:00
md678685
3353061e76 Remove ID-based permission checks in /more 2018-10-15 13:49:16 +01:00
md678685
79bc34047b Allow multiple item names in /clearinventory 
Allow a comma-separated list of item names in /clearinventory.
 2018-10-15 13:46:12 +01:00
md678685
60c90408e7 Remove ID-based permission checks in /give and /item 2018-10-15 13:16:10 +01:00
md678685
1218c3e226 Merge branch '1.13' into 1.13-items 2018-10-13 18:23:58 +01:00
md678685
a05fc9d08e Remove duplicated OfflinePlayer method 2018-10-13 17:14:10 +01:00
md678685
6906ef2154 Merge branch '1.13' into 1.13-items 2018-10-13 16:59:57 +01:00
md678685
2f66a866d8 Implement missing FakeWorld and OfflinePlayer methods 2018-10-13 16:55:42 +01:00
md678685
4cd8a6636b Log invalid JSON entries 2018-10-13 16:44:50 +01:00
md678685
5c7fc763fc Formatting 2018-10-13 16:44:24 +01:00
md678685
1e381a59be Throw meaningful exception when item not found 2018-10-13 16:32:21 +01:00
md678685
85111f25cb Use ItemData#equals when finding item name 
Avoids accidentally causing an NPE while comparing potion data.
 2018-10-13 16:09:45 +01:00
md678685
f78887a02e Remove item IDs from /itemdb 2018-10-13 15:59:25 +01:00
md678685
feba535637 Actually assign the ManagedFile to file 2018-10-13 15:38:45 +01:00
md678685
18feb7967a Implement missing FakeWorld and OfflinePlayer methods 2018-10-13 15:26:58 +01:00
md678685
e9b1511117 Remove item ID support in Worth 2018-10-12 17:26:41 +01:00
md678685
177e5f62f7 Remove providers; move JSON support into ItemDb 2018-10-12 17:26:22 +01:00
mathias
a9fe842242 Use chat instead of dispatchCommand 2018-09-18 16:39:58 +03:00
md678685
cdba518bae Revert "Implement 1.13 item support (#2153)" 2018-09-09 16:35:20 +01:00
md678685
320bc25d94
Implement 1.13 item support (#2153) 
Uses two distinct providers to support items on 1.13 while falling back to `items.csv` for previous versions of Minecraft.
 2018-09-05 14:23:16 +01:00
pop4959
33ae9a2597 Fix TropicalFish spawning (#2159) 
The name can't have a space in it or it won't be matched by any commands.
 2018-09-05 13:26:33 +01:00
pop4959
19913d3612 Implement abstract method Entity::getFacing in OfflinePlayer (#2157) @pop4959 
Allows EssentialsX to compile against the latest Spigot version.

Reference: [8ab814cd5c)
 2018-09-05 11:00:27 +01:00
pop4959
0432546746 use less dependencies 2018-09-04 16:53:01 -07:00
pop4959
3395bab928 Sort /near by nearest player. 2018-09-02 23:09:22 -07:00
pop4959
a3eb58724f Add a way to use unsafe nicknames (#2152) @pop4959 
Pretty much what the title says. Closes #1630.

This is a fun little feature that I'm sure many people have always wanted. I can understand that the original authors of Essentials were probably concerned about users entering names that cannot display correctly in the chat, and that is understandable.

I have added a new permission "essentials.nick.allowunsafe", which must be given to anyone who is allowed to use characters outside of the alphanumeric set. The name of the permission is inspired from "essentials.enchantments.allowunsafe", which allows unsafe enchantment levels to be applied to items without guaranteed behaviour. Similarly, the permission "essentials.nick.allowunsafe" allows unsafe characters to be entered for the user's nickname without making any guarantee that those characters will show up in chat correctly.
 2018-09-02 12:14:26 +01:00
md678685
102cb6d949 Merge branch '1.13' into 1.13-items 2018-09-01 10:46:27 +01:00
md678685
6c9c9ad42a Use enum methods throughout plugin for cross-version enum lookups 2018-09-01 10:35:08 +01:00
md678685
acbc96fd55 Add enum utility helpers for Statistic and Material 2018-09-01 10:34:11 +01:00
md678685
d74f19970b Strip out legacy ItemDb code, pt 1928371236123897 2018-08-27 21:19:15 +01:00
md678685
7608b7d658 Merge branch '1.13' into 1.13-items 2018-08-27 20:01:48 +01:00
md678685
d1d5ae814f Merge branch '2.x' into 1.13 2018-08-27 20:01:01 +01:00
md678685
4ea71ae88e Implement missing methods in FakeWorld 2018-08-27 14:10:06 +01:00
md678685
e3c726b8f6 Log total loaded items on reload 2018-08-27 13:06:27 +01:00
md678685
634d62f9ef Fix typo in /kickall 2018-08-27 10:30:29 +01:00
md678685
2806156cf4 Add "allow-world-in-broadcastworld" option 
Allows players to send broadcasts to a specified world by running `/broadcastworld [world] <message>` if enabled.

This is disabled by default in old configs to avoid confusion between updates.
 2018-08-27 10:26:54 +01:00
md678685
e642192461 Kick players in /banip 
The four-year-old to-do has finally been done!

Closes #2143.
 2018-08-26 22:54:00 +01:00
md678685
959c788f22 Don't kick exempt players when running /kickall 2018-08-26 21:03:17 +01:00
montlikadani
cda520589a Revert "Doesn't kick all players if the player has permission (#2145) @montlikadani" 
This reverts commit 5c1db129d3.
 2018-08-26 20:59:46 +01:00
montlikadani
5c1db129d3 Doesn't kick all players if the player has permission (#2145) @montlikadani 
So, if a player has permission (eg, an operator or more), they will not kick them out because of permission.
 2018-08-26 20:13:05 +01:00
Xeyame
f97c5fc1ff Make /realname configurable (#1952) @Xeyame 
Closes #1810.

@md678685: I've added colour codes to the `realName` messages by default, which was not originally part of this PR.
 2018-08-26 15:39:37 +01:00
montlikadani
81397d98b8 Added editable messages (#2072) @montlikadani 
**If it is accepted then I will add it to the other message files.**
 2018-08-26 15:17:07 +01:00
md678685
c79db98978
Add more debug logging to Settings (#2140) 
Adds debug logging for `getChatFormat` and `getCommandCooldownEntry`, which makes it much easier to track down issues with group formats in EssentialsX Chat and command cooldowns respectively.
 2018-08-25 18:09:08 +01:00
Max Roncace
935b5cfe0f Fix unbreakable attribute for kits (#2071) @caseif 
This PR fixes the `unbreakable` attribute on kit items. Previously, Essentials was exclusively using an internal Spigot method to set this on `ItemMeta` objects; however, this solution seems to be non-functional on more recent Spigot builds (1.12.2).

I have altered the `MetaItemStack#setUnbreakable` method to use the native Bukkit method, available for [some time now](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/d986a3f), by default. Essentials will still use the old solution as a fallback in case of an older Bukkit version which does not have native support for the attribute.
 2018-08-25 11:33:17 +01:00
md678685
bad02729db Allow /eco take to subtract a user's exact balance 2018-08-24 15:42:17 +01:00
md678685
80f7ded687
SPECTATOR mode is safe for teleporting everywhere. (#2049) 
Teleporting in spectator mode is as safe as creative mode for every target.
 2018-08-24 15:24:26 +01:00
Max Lee
f569b89d8f Round down balance when converting to double (#2135) 2018-08-21 23:45:58 +01:00
md678685
718d9d9d3a Initialise provider and file during first reload 2018-08-19 21:55:29 +01:00
md678685
b27a6b5b8e Add additional timer marks 2018-08-19 21:11:51 +01:00
md678685
98809fafd7 Strip out legacy ItemDb code, pt 4 2018-08-19 21:10:54 +01:00
md678685
de2298cf0a Strip out legacy ItemDb code, pt 3 2018-08-19 20:58:23 +01:00
md678685
9b39509e88 Misc changes 2018-08-19 18:30:44 +01:00
md678685
9da58dde5c Strip out legacy ItemDb code, pt 2 2018-08-19 18:04:13 +01:00
montlikadani
3c6a869336 Fix iron armor bug (#2054) 2018-08-19 16:57:14 +01:00
Ali Moghnieh
4dc1d2c50e
Merge branch '2.x' into 1.13 2018-08-16 17:47:37 +01:00
Aerodog
ed72d117a5 Add {ONLINE} variable to custom join message (#2043) 2018-08-16 17:42:14 +01:00
md678685
659f1a271a Merge branch '1.13' into 1.13-items 2018-08-15 19:51:35 +01:00
md678685
3fb4b7958d Strip out legacy ItemDb code, pt 1 2018-08-15 19:50:15 +01:00
md678685
340baa9703 Add IEssentials#getItemDbProvider method 2018-08-15 19:40:35 +01:00
md678685
04feed8524 Add 1.13+ spawn egg provider 
Not sure how necessary this is, but I've done it anyway
 2018-08-15 17:46:55 +01:00
md678685
773979cb37 Provide ItemDb provider with other providers 
Provide providers to the provider that needs the providers. Provider provider provider provide provider.
 2018-08-15 16:56:46 +01:00
md678685
c27d05fd4b Fix dependency on IdProvider 2018-08-15 16:40:01 +01:00
md678685
52d814f2cc Properly fix inaccurate playtime measurement 
b848d8ce63
 2018-08-15 15:26:11 +01:00
md678685
5009b3b545 Revert "Fix playtime calculation" 
This reverts commit 4e165d375c.
 2018-08-15 15:15:30 +01:00
md678685
4e165d375c Fix playtime calculation 2018-08-14 19:29:28 +01:00
md678685
306f7a7872
Merge pull request #2119 from lagnat/1.13 
Add missing methods for OfflinePlayer, FakeWorld, and FakeServer.
 2018-08-14 19:20:21 +01:00
md678685
6c11569ac9 Merge branch '2.x' into 1.13 2018-08-14 18:58:06 +01:00
Steve Green
a1e98f898b Add missing methods for OfflinePlayer, FakeWorld, and FakeServer. 2018-08-14 08:35:33 -04:00
md678685
c5376d3088 Implement ItemDbProviders, pt 1 2018-08-10 22:07:02 +01:00
md678685
b8a8232bc3 Wrap all constructScalar calls with reflection 
Allows configs to function with both SnakeYAML 1.19 and 1.21.
 2018-08-06 18:19:30 +01:00
md678685
504a7aef0f Add 1.13 mobs 2018-08-06 17:09:50 +01:00
md678685
1ddb1822ef Merge branch '2.x' into 1.13 2018-08-05 23:02:11 +01:00
md678685
d3cd4e356d Add missing OfflinePlayer 1.13 methods 2018-08-05 20:51:39 +01:00
md678685
bef440760a Remove deprecated economy libs and support 
None of these economy plugins are supported any more, and removing these allows EssentialsX to be used as a dependency without locally `mvn install`ing the plugin.
 2018-08-05 20:51:19 +01:00
Ali Moghnieh
768b92749f
update bukkit to 1.13-R0.1-SNAPSHOT. 
This commit just fixes compilation errors.
 2018-07-29 17:39:32 +01:00
md678685
a44775cafb
Prevent users being duplicated in the ignore list 
Fixes #2064, as well as alleviating the issue encountered in kangarko/ChatControl-Pro#627 for EssentialsX users.
 2018-07-17 07:33:14 +01:00
Brokkonaut
aa622f8d27 SPECTATOR mode is safe for teleporting everywhere. 2018-06-18 23:38:54 +02:00
md678685
849efa9756 Merge branch '2.x' of https://github.com/EssentialsX/Essentials into 2.x-upstream 2018-06-15 19:44:45 +01:00
md678685
8aa764f69f Check whether nick equals "off" before formatting 
Fixes #1910.
 2018-06-15 19:41:56 +01:00
md678685
4873beb100
Allow updating the compass target to be optional (#1937) 
If `compass-towards-home-perm` is enabled in the EssentialsX config, then the permission `essentials.home.compass` is checked before changing the player's compass target.

Closes #1918.
 2018-06-15 19:20:06 +01:00
md678685
27d9f3725a
Wrap constructScalar for SnakeYAML 1.21 (#2040) 
In theory, fixes #1974, fixes #1975 and fixes #1976, and also means that
Spigot are free to upgrade SnakeYAML to 1.21 again when ready.
 2018-06-15 19:18:55 +01:00
md678685
16b2c3dee3
Reset pending confirmations on login (#2033) 
On login, resets any pending confirmations for the user. Fixes #2021,
closes #2023.
 2018-06-15 19:09:27 +01:00
md678685
3d60aa1747 Fix build errors (#2018) 
Fixes build errors caused by the warp owner PRs (#1961 and #2017)
 2018-05-28 12:21:23 -07:00
FlashLight34
967bb44d94 Update IWarps.java (#2017) @FlashLight34 
Maybe the compilation fails because that :P
 2018-05-27 07:33:37 +01:00
Xeyame
7298393ec9 Add permission to bypass other's msgtoggle (#1955) @Xeyame 
* Add permission to bypass other's msgtoggle

Also thanks to MD for helping me with the code :)

* Correct comment

* Remove checking for console in favour of the already existing IUser check

* Fix comments, again

* Re add isIgnoreMsg() check

Accidently removed it, sorry

* Combine 2 checks
 2018-05-26 20:43:31 +01:00
FlashLight34
817caf299f setwarp owner uuid in yml file (#1961) @FlashLight34 
* Update Warps.java

its not a real change i dont know if user.getuuid() exist or onother possible cmd maybe

* Update Warps.java

* Update Commandsetwarp.java

* Update Warps.java

* Update Warps.java

* Update Commandsetwarp.java

* Update Warps.java

* Update Warps.java

* Update Commandsetwarp.java

* Update Warps.java
 2018-05-26 20:42:51 +01:00
montlikadani
2ff29dab80 Update Commanddeljail.java (#2002) @montlikadani 
When the user entered a word to delete the jail, deleted it, but removed anything because no jail existed.
 2018-05-26 20:40:45 +01:00
Brokkonaut
030eb3375b Block ignite only for PvP, not for PvE (#1967) @Brokkonaut 
Players with god mode enabled could not ignite mobs with bows while only igniting players should be blocked.
 2018-05-26 20:34:31 +01:00
Joseph Hirschfeld
b29f98c525 [Feature] Add world specific /back dest. perms (#1948) @Ichbinjoe 
Adds world specific perms for whether a player may use /back to teleport
back to a given world. Adds logic to default
essentials.back.into.<world> permissions for loaded worlds to true to
maintain backwards compatibility.
 2018-04-29 15:49:49 +01:00
Joseph Hirschfeld
70387f73f6
[Feature] Add config optn. to disable jail free tp 
Adds the teleport-back-when-freed-from-jail configuration option. When
set to true (default), as with previous versions will teleport the
player which was jailed back to their previous position when freed. When
false, Essentials will not teleport the player anywhere, leaving them
where they are.

Closes #1947
 2018-04-03 01:27:09 -04:00
Xeyame
7adb931ea8 Expand /exp command 2018-04-02 14:29:43 +02:00
Rodrigo Aguilar
823f1c2ee3 cancel-afk-on-interact and cancel-afk-on-move are now separate settings (#1804) 2018-03-26 00:50:42 -07:00
Trent Hensler
7d7c58fa7c Merge branch 'SupaHam-default-confirm-command-prompt' into 2.x 2018-03-26 00:37:08 -07:00
Trent Hensler
a468ec5e08 Default setting to be enabled confirm commands by default with commented out list of possible options 2018-03-26 00:24:10 -07:00
Trent Hensler
ce1e584266 Merge branch 'default-confirm-command-prompt' of https://github.com/SupaHam/Essentials into SupaHam-default-confirm-command-prompt 2018-03-26 00:19:23 -07:00
Minecrell
ecd6c5f81a Avoid using ServerListPingEvent workaround on fixed Paper builds (#1925) 
Fixes #1924

PaperMC/Paper#884 has been fixed in recent Paper builds (1368+),
which means the workaround is no longer necessary. Disable it when
running a fixed build.
 2018-03-26 00:15:55 -07:00
md678685
61c1485083
Replace vanishedPlayers list with set (#1796) 
* Replace vanishedPlayers list with set

Not sure if there is any particular reason to keep it ordered, but for now I've used a LinkedHashSet.

* Change return of new method from Set to Collection

Also makes return of old method an unmodifiable list, but this is just as breaking as just changing the method return type as far as I can see
 2018-03-25 22:12:36 +01:00
games647
c7000846cd
Replace Reflection with setter implementation 2018-03-21 11:16:27 +01:00
Johnny Cao
d3c4c2ba6a Fixes #1866 (#1867) 2018-03-20 21:51:16 -07:00
Max Lee
95ac4a4853 Extra permissions for /seen and /whois information (#735) 
* Implemented separate permissions for seen extras

* Add an extra permission to the whois command too.
IPs are sensitive information that should only be accessible to an as small as possible amount of people
 2018-03-20 21:50:42 -07:00
Luck
0d5da063fb Upload createkit configs to hastebin instead of GitHub Gist (#1916) 2018-03-20 21:42:12 -07:00
games647
d24fbc9f55
Remove final modifier to fix illegal reflective access warning 
Java 9 runtimes report warnings for reflective access on JRE
classes (in this case Field.modifiers). Future versions of Java
may deny the access completely.

Since we access our own code here, we could just remove the final modifier.
With it's current visibility (of private) it's unlikely that it will be
modified from somewhere else except our Settings class.
 2018-03-13 16:46:25 +01:00
games647
7e40d13947
Update lombok and remove antrun to fix compiling with JDK9 
* Lombok: Older version resulted in NoSuchFieldEx: pid (fixed since 1.16.8)

* JDK9 no longer has a tools.jar because of it's modular system, but ant is
no longer required. It was introduced in 3e9a2377a8
for GroupManager. Now GM is no longer maintained and removed in
    * 5ca02e6596 (calling the build.xml)
    * fa0bbde236 (removing the remaining module)
 2018-03-13 16:06:39 +01:00
md678685
4e8e7bec3f Add /ess version subcommand (#1514) 2018-03-06 19:25:51 -08:00
md678685
fe7b6097c9 Fix kit reloading (#1855) 2018-02-17 09:42:58 -08:00
md678685
983f3a7935 Clear item in offhand slot in /clearinventory 
GitHub fancy things: Fixes #950. Fixes #1426. Fixes #1834.
 2018-02-10 16:03:56 +00:00
Lax
05400429db Cancel target event on vanished players. Fixes #1809 (#1829) 2018-02-03 19:26:43 +00:00
Johnny Cao
e4a8222d48 Fixes #1794: Hides error message if no MOTD present (#1811) 
* Fixes #1794
 2018-01-31 17:01:51 -08:00
Johnny Cao
fb5ebdb0c2 Fixes #1637: Correctly handle /mail permissions (#1743) @AgentTroll 
Fixes #1637

/mail stripped colors from the entire message before as reported by the issue. The desired fix was to only strip the color from the sent message rather than from the entire message format (e.g. prefixes coming before the message itself).

Fixed by formatting only the message before passing it to the localization.

Also had a minor issue with FormatUtil in which it failed to strip ampersand (&)-formatted color codes, which was amended by stripping both VANILLA_*_PATTERN as well as REPLACE_*_PATTERN in FormatUtil#formatString(...). It's not necessary to actualy strip any vanilla (i.e. section-prefixed) color codes since that's already done by FormatUtil#stripFormat(String), but I'd like to keep the changes as non-invasive as possible at the current moment.

Demo: git-Spigot-d20369f-7fc5cd8 (MC: 1.9) (Implementing API version 1.9-R0.1-SNAPSHOT)
https://streamable.com/umyi8

This is my first time contributing so please be gentle :)
 2018-01-29 18:01:20 +00:00
Ali Moghnieh
1ef1cd98db
Add default toggle for confirm commands in config.yml. 2018-01-28 17:23:43 +00:00
Trent Hensler
ba35efd021 Properly check for empty set 2018-01-22 16:38:01 -08:00
Trent Hensler
09af6ad186 Don't add itemflags if none are present 2018-01-22 16:37:01 -08:00
md678685
16a496c706
Fix args order in GodStatusChangeEvent (#1790) 
Fixes #1107
 2018-01-22 21:01:12 +00:00
MD678685
71d50f4e1e Properly rename CommandDisposal 2018-01-22 14:56:17 +00:00
md678685
8a815b42d3 Fix disposal command class name 
Fixes #1791.
 2018-01-22 14:16:11 +00:00
Mitchell Cook
d69e3a2f48 [Feature] Added disposal command. (#1729) @Mishyy 
Added a portable disposal menu.

Closes #1721, and also closes #310.
 2018-01-22 12:58:00 +00:00
md678685
e38b15531d
Add jailList and noJailsDefined to messages and Commandjails (#1732) 
* Add jailList and noJailsDefined to messages and Commandjails

* Sort message keys alphabetically
 2018-01-22 09:20:31 +00:00
U-NIFLHEIM\Lax
fcc7c3af78 Per-user toggles disabled by default 2018-01-21 18:40:13 -08:00
Taylor
5f7d226158
Merge pull request #17 from delbertina/mutes385test 
Sorted messages files with the -f option and other tweaks ...
 2018-01-21 17:02:26 -06:00
md678685
738efe8c50 Add Vault prefix/suffix support to EssXChat (#1663) 
* Add Vault prefix/suffix support to EssXChat

Includes an example of how to use it in the config.
 2018-01-21 01:37:30 -08:00
delbertina
0897ca57ff Removed redundant line in mute time try-catch. 2018-01-20 22:46:55 -06:00
Trent Hensler
ace361af60 Compile against 1.13 preview. 
Still a lot of work to do. One thing to note is that I used LEGACY materials in a few spots where I didn't know what the new ones are as I'm not very familiar with the 1.13 update and what it changes.
 2018-01-18 17:52:44 -08:00
Trent Hensler
d4138ce843 Match default to what's in the config. Resolves #1775 2018-01-18 10:34:02 -08:00
Trent Hensler
377c716d52 Add itemflag support to kits. Resolves #795. 
Syntax is "itemflags:HIDE_ATTRIBUTES,HIDE_ENCHANTS"
 2018-01-18 00:26:40 -08:00
Trent Hensler
cd43355d4c
Move kits to kits.yml (#1774) 
* Move kits to kits.yml
We will now use a separate kits.yml file.
Any kits that were defined in the config.yml will be migrated over to the kits.yml file automatically on startup.
 2018-01-18 00:25:00 -08:00
CreedTheFreak
b096ee9703 Merge remote-tracking branch 'delbertina/mutes385test' into final_mute_reason_issue#385 
Merged changes into local branch for pushing up to the pull request of
mute reason.
 2018-01-16 17:49:49 -08:00
CreedTheFreak
b8df59ae46 Updated the former pull request to include the specified formatting changes, and small edits to the hasMuteReason and Commandmute dealing with the muteReason. I also included the ability to see the mute reason from the seenOffline method which is identical to the seenOnline code. 2018-01-16 18:21:31 -06:00
delbertina
98f42c6974 Added reason stuff to msg command and deleted reference line in seen command. Oops! 2018-01-16 18:16:34 -06:00
delbertina
db19788e21 Added 8 new messages for "...Reason" versions of mute messages and implemented em. 2018-01-16 18:16:33 -06:00
delbertina
67d17472e0 Fixed logic error in hasMuteReason and errors being thrown from seen and whois. 2018-01-16 18:04:22 -06:00
delbertina
f68a6eb00d Added space before reason when a muted player tries to talk. 2018-01-16 18:04:22 -06:00
delbertina
b5a6df4fe2 Added space when adding reason to string. 2018-01-16 18:04:21 -06:00
delbertina
290379651d Added space when adding reason to string. Dirty :/ 2018-01-16 17:59:14 -06:00
delbertina
6ffbb86169 Changed if else blocks to ternary operators. Not sure if way to avoid weird empty string usage. 2018-01-16 17:54:50 -06:00
delbertina
d8b6f87087 Added method hasMuteReason in UserData. 2018-01-16 17:54:50 -06:00
delbertina
7aad95ec08 Changed muteFormat to muteReason. 
Removed space at beginning of muteReason.
 2018-01-16 17:54:49 -06:00
delbertina
574e1bc1e7 Fixed easy style issues. 2018-01-16 17:48:12 -06:00
delbertina
fc590f82a2 Added check to display mute reason when notifying 2018-01-16 17:48:10 -06:00
CreedTheFreak
c8cb9b3735 fixed some wonky commit thing that happened, thus the following modifications are brought to you by Delbertina. 2018-01-16 17:21:54 -06:00
CreedTheFreak
4f8ea06db1 We have added the ability for the Mute to contain a reason, which is stored for the duration of the mute in the user's data file. Currently we need to add in the mute reason code into some other commands such as /afk and /me and /seen ect. We will also need to fix a problem with the reason when we dont add in a time frame for the mute, which should mute the player indefinatly rather then cancelling the mute and throwing a DataFormat exception. 2018-01-16 17:21:53 -06:00
CreedTheFreak
9378df0ff2 Started work on implementing the mute reason, and decided to write it to the UserData just like the Ban and TempBan reasons 2018-01-16 17:21:52 -06:00
Trent Hensler
147c5e0ddf
Merge branch '2.x' into fix-metaitemstack-keyword-replacer 2018-01-16 15:11:05 -08:00
Johnny Cao
ef1e57f445 Performs pagination bounds check. Fixes #1509 (#1754) 
Adds pagination bounds check Fixes #1509
 2018-01-16 12:56:39 +00:00
Johnny Cao
87c6672212 Add ignore check for /me (#1768). Resolves #1767 2018-01-16 12:33:35 +00:00
Ali Moghnieh
b6aea0a5f8
Fix splash potion support for /potion. Resolves #1166 2018-01-07 02:22:31 +00:00
Drew Mitchell
50e2d27d5b Fix NPE in /clearinventory. Fixes #1755 (#1756) 
Issue was a NullPointerException due to senderUser not being null-checked. I opted to place the couple of lines of code into the sender.isPlayer() check as opposed to null-checking.
 2018-01-07 01:45:19 +00:00
Ali Moghnieh
f0bf359df3
Allow KeywordReplacer to input replacements with underscore spacers. 
Resolves #1725 and provides a less breaking fix for #1722.

----

Revert "Consume everything after lore as lore in MetaItemStack. Fixes #1722."

This reverts commit 5fa2ce7d9e.
 2018-01-07 01:22:42 +00:00
Dylan Keir
8f92e3f217 Fix JDK9 issue (#1713) 2017-12-29 14:46:09 +00:00
CreedTheFreak
822315a279 Updated the former pull request to include the specified formatting changes, and small edits to the hasMuteReason and Commandmute dealing with the muteReason. I also included the ability to see the mute reason from the seenOffline method which is identical to the seenOnline code. 2017-12-26 16:09:46 -08:00
CreedTheFreak
732da86710 Merge remote-tracking branch 'magnarisa/final_mute_reason_issue#385' into mute_reason_changes 
Updated a clean branch with the changes we have made so far.
 2017-12-26 08:23:53 -08:00
Drkmaster83
9dc58948b2 Implements PR#1516 - TPPos World-Teleport Permissions 
https://github.com/EssentialsX/Essentials/issues/1516
Considerations:
• TPPos on a target doesn't consider the target's world access permissions, reminiscent of the TP A to B command.
 2017-12-25 01:08:08 -06:00