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
5489 commits 5 branches 46 tags 420 MiB
Commit graph

3263 commits

Author SHA1 Message Date
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
delbertina
ff37ef3bc5 Added reason stuff to msg command and deleted reference line in seen command. Oops! 2017-12-24 00:03:36 -06:00
Ali Moghnieh
d16e67c51e
Remove debug message. 2017-12-22 20:01:58 +00:00
Ali Moghnieh
5fa2ce7d9e
Consume everything after lore as lore in MetaItemStack. Fixes #1722. 2017-12-22 19:50:33 +00:00
delbertina
3d33bbc33d Added 8 new messages for "...Reason" versions of mute messages and implemented em. 2017-12-20 00:35:51 -06:00
Trent Hensler
ea36ee37a2 Use correct value 2017-12-19 00:22:00 -08:00
md678685
a907dab432 Show tempban expiry on join. Fixes #1680 
Outputs a different message with the expiry included.

Add unlocalised tempbanJoin to locale files

Outputs a different message with the expiry included.
 2017-12-19 00:08:42 -08:00
delbertina
e3ee9cb4c7 Fixed logic error in hasMuteReason and errors being thrown from seen and whois. 2017-12-18 20:37:34 -06:00
delbertina
afe0ff0ca7 Added space before reason when a muted player tries to talk. 2017-12-17 01:46:43 -06:00
delbertina
034ffbd0bc Added space when adding reason to string. 2017-12-17 00:16:06 -06:00
delbertina
127a7bb2ce Merge branch 'mutes385' of https://github.com/delbertina/Essentials into mutes385 
Updated local copy
Conflicts:
	Essentials/src/com/earth2me/essentials/commands/Commandafk.java
	Essentials/src/com/earth2me/essentials/commands/Commandmail.java
	Essentials/src/com/earth2me/essentials/commands/Commandme.java
	Essentials/src/com/earth2me/essentials/commands/Commandr.java
	Essentials/src/com/earth2me/essentials/commands/Commandseen.java
	Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
 2017-12-17 00:02:52 -06:00
delbertina
e8bfac0790 Added space when adding reason to string. Dirty :/ 2017-12-16 23:26:09 -06:00
Trent Hensler
1a820ad9b7 Initial removal of item IDs. 
We do not rely on Bukkit's item ids anymore, though we still support them in commands via a mapping built off of the items.csv.
 2017-12-12 22:06:25 -08:00
md678685
dcbc106e62
Fix powertools when clicking in air (#1657) 
Should restore behaviour prior to #1534 and fix #1622.
 2017-12-06 08:37:52 +00:00
delbertina
849b329213 Changed if else blocks to ternary operators. Not sure if way to avoid weird empty string usage. 2017-12-02 20:35:44 -06:00
delbertina
d555c1b081 Added method hasMuteReason in UserData. 2017-12-02 19:46:46 -06:00
delbertina
43cbab37f0 Changed muteFormat to muteReason. 
Removed space at beginning of muteReason.
 2017-11-26 01:32:22 -06:00
delbertina
6f7af90488 Fixed easy style issues. 2017-11-26 00:55:05 -06:00
md678685
3a6f04e461
Fix Commandclearinventoryconfirmtoggle class 2017-11-15 18:17:29 +00:00
Ali 'SupaHam' M
f8ddb50140
Rename Commandclearconfirmtoggle.java to Commandclearinventoryconfirmtoggle.java 2017-11-13 12:46:15 +00:00
Ali 'SupaHam' M
be076509f2
Implement clear confirmation (#1623) 
Introduces:
- `clearinventoryconfirmtoggle` command with shorter aliases
- `confirmClear` boolean in UserData
 2017-11-12 16:44:53 +00:00
Minecrell
73457453bb Avoid using reflection for things SnakeYAML supports directly now (#1634) 
Fixes #1631 properly.

e7ebc94a9e added a workaround to the
SnakeYAML constructor to avoid errors when unknown properties are
used in the storage files. Back then, it was necessary to copy the
method to catch the exception thrown when an unknown property was
encountered.

However, SnakeYAML 1.12 (included in Spigot 1.6.2+) added a method
to ignore missing properties without overriding parts of the
SnakeYAML implementation.

Delete the old workaround and make use of
PropertyUtils.setSkipMissingProperties(true) to achieve the same
effect.
 2017-11-10 18:01:29 +00:00
Ali 'SupaHam' M
c14d565b56
Support mail chat formatting via essentials.mail base permission. (#1611) 
`essentials.mail.url`, `essentials.mail.color`, etc.
 2017-10-29 01:16:04 +00:00
Azewilous
a8d9139b6c
[Feature] Added new property 'socialSpyMsgFormat' 
This feature allows the user to alter the format in which a socialSpy direct messages is seen.
 2017-10-22 14:32:17 +01:00
Andronachi Marian
e6fc459080 Update player activity on PlayerInteractEvent. 2017-10-22 10:25:49 +01:00
Minecrell
2c4ff35796 Ensure LOGGER is not equal to plugin logger before setting parent (#1570) 2017-09-30 16:51:32 +01:00
Taylor
1664da55a4 Merge pull request #10 from CreedTheFreak/commit_squashing 
Final Implementation and the squasing of many commits
 2017-09-17 16:55:14 -05:00
CreedTheFreak
f8ea7f5e1f Implemented the ability to add a reason while muting a 
player. The form of the mute is /mute [Player] [Time] [Reason] or /mute
[Player] [Reason] or /mute [Player] [Time] or /mute [Player]. These are
the various forms of the mute command and acts exactly like the old
command just with a reason.

The final adjustments to the MuteReason
 2017-09-16 22:27:34 -07:00
md678685
ed5aa1f469 Alter config options for EssentialsX Spawn listeners (#1491) 
* Add spawn-join-listener-priority setting
* Make "none" an option for priority settings
* Register each listener with separate priorities
* Add note to spawn-join-listener priority
    Warns about effect on spawn-on-join
 2017-09-16 15:23:56 +01:00
Josh
b34697040a Update spawner blockstates (#1536) 
Fixes #1525.
 2017-09-14 07:36:39 +01:00
delbertina
b0205b9499 Added check to display mute reason when notifying 2017-09-03 23:02:56 -05:00
CreedTheFreak
f10a766442 fixed some wonky commit thing that happened, thus the following modifications are brought to you by Delbertina. 2017-09-03 19:49:57 -07:00
CreedTheFreak
4ff9fe8666 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. 2017-09-03 14:41:32 -07:00
CreedTheFreak
3512c4c8e6 Started work on implementing the mute reason, and decided to write it to the UserData just like the Ban and TempBan reasons 2017-09-02 20:04:25 -07:00
Luck
430f08b25f Add LuckPerms to "specialCasePlugins" in SuperpermsHandler (#1518) 2017-08-27 22:20:48 +01:00
md678685
a049a03faa Catch NullPointerExceptions in SLPE (#1463) 
* Catch NullPointerExceptions in SLPE
* Use the caught NPE's stacktrace
    Makes thrown exception actually useful
 2017-08-21 10:40:23 +01:00
Ali Moghnieh
365ae356bd
Format currency correctly by placing negative sign at beginning. 
This is forcefully placed at the beginning of the formatted currency because of how `currency` message is customisable. Until a better solution arises this shall stay.
 2017-08-19 20:11:21 +01:00
flcmc
91b2622ba2 Turn off god mode on login if player doesn't have the permission (closes #1445) (#1475) 2017-08-13 16:42:59 +01:00
flcmc
eb341c0704 Make {player} referencing powertools activate only when the user has powertools enabled (#1474) 2017-08-13 16:03:46 +01:00
flcmc
1562a8f3ca Implement tab completion for seen and whois. (#1440) 2017-08-12 14:42:57 +01:00
Ashazi
13fbd31124 Prevent flaming arrows damage from vanished and godmode players. (#1462) 2017-08-12 14:27:51 +01:00
Ali Moghnieh
e5c7ba72e5
Add custom join ban messages. #420 
blaze it
 2017-08-12 13:46:27 +01:00
Ali Moghnieh
203d6561ac
Allow unbreakable to not take any arguments, defaulting to true. Fixes #377 2017-08-07 14:05:20 +01:00
md678685
7958cd0b88
Add ability to click helmet slot to equip item. #960 2017-08-04 17:24:43 +01:00
Ali Moghnieh
51f2a04958
Fix import errors. 2017-08-04 16:26:57 +01:00
md678685
a27eb17684 Merge remote-tracking branch 'upstream/2.x' into 2.x-upstream 2017-08-04 12:09:03 +01:00
md678685
05d2b6ccda Fix 1.12.1+ NSME in /lightning 2017-08-04 12:08:55 +01:00
md678685
ec61ffcaad Fix 1.12.1+ NoSuchMethodError in /break (fixes #1438) 2017-08-04 12:08:40 +01:00
md678685
ed0ad87632 Use Paper's new ServerListPingEvent methods if present (#1436) 
* Use Paper's new ServerListPingEvent methods if present
 2017-08-04 12:00:25 +01:00
Kaleb M
8796dbeb56 [Fix] Essentials signs validity (#1402) 
* [Fix] Essentials signs validity

Any sign in the format of &1[...] was a valid sign according to essentials, but 3rd party plugins with the same sign format would be treated equally (cancelling nearby explosions, etc)

Valid signs after this fix are:
- In the format of &1[...] as before
- Are essentials signs and enabled in the essentials config

* Revert "[Fix] Essentials signs validity"

This reverts commit 60d95b6585184051124cd32358401653042edd18.

* [Fix - v2] Essentials signs validity

Any sign in the format of &1[...] was a valid sign according to essentials, but 3rd party plugins with the same sign format would be treated equally (cancelling nearby explosions, etc)
 2017-08-04 00:09:12 +01:00
Florian CUNY
fd63a7df4e [Feature] Added an option to spy chat messages from muted players (#1430) 
Related to https://github.com/drtshock/Essentials/issues/1420
 2017-08-04 00:04:42 +01:00
md678685
7fbc721db6 Fix usage of deprecated getTargetBlock (#1435) 2017-08-03 23:33:55 +01:00
Ali Moghnieh
210494d0d1
Support EntityPickupItemEvent. 2017-07-28 20:13:59 +01:00
md678685
50f2e7a95f Add a delay for sending the MOTD (#1396) 
* Add delay-motd setting
* Move MOTD to Runnable
* Refactored according to comments
* Delay motd loading as well as sending
 2017-07-28 19:20:44 +01:00
md678685
d7685dc1bc Add UUID to /whois (#1394) 
* Add UUID to /whois

* Add untranslated English messages

I'm not sure whether "UUID" necessarily needs translating for most languages, but I've put it in all of them so that they can be translated if needed.

* Hi there o/
 2017-07-15 18:38:09 +01:00
md678685
301a3a72df Check for essentials.warp.list permission on /warp tab complete (#1378) 2017-07-10 23:07:54 +01:00
CreedTheFreak
518a43db9c [Fix] Disallow muted players to use /r (#1375) 2017-07-09 15:17:07 +01:00
Ali Moghnieh
243e69649f
Be more verbose in handleCrash(Throwable). 2017-07-03 14:24:43 +01:00
Ali Moghnieh
781204aa20
Trim comma separation in items.csv parsing. 2017-07-03 14:23:36 +01:00
Ali Moghnieh
12930cfce4
Return online players instead of nothing when tab completing. (Fixes #1331) 2017-06-29 03:41:13 +01:00
Ali Moghnieh
298c292ffb
Amend items.csv to support potions in all items. 
This commit makes use of 3fba6e9a which implements the ability to parse NBT in `items.csv`.
 2017-06-29 03:30:35 +01:00
NJDaeger
341263b934 Removed null value from AbstractVaultHandler (#1327) 
I'm in the process of writing a permissions plugin, and every time I try to talk it threw an error. The error was caused by this null value that was existing. I removed it and changed it to get the Player's world name. This should fix my error.
 2017-06-24 15:41:51 +01:00
Ali Moghnieh
11a03bbce9
Add notify-player-of-mail-cooldown config option. 
This feature allows for the ability to specify a cooldown for how often individual players are notified of their outstanding unread mails.
 2017-06-22 22:54:51 +01:00
Ali Moghnieh
3831464665
Fix /condense functionality after 1.12. (#1298) 
Prior to this commit `/condense` would return the first best item to condense an ItemStack into, with no consideration of better forms of condensation.

This commit adds a local variable `bestRecipes` which stores all the valid recipes and sorts through them for the best, then picks out the best. The best recipe is defined by a compare(o2, o1) where o1 and o2 are integers of the SimpleRecipe's input ItemStack amount.
 2017-06-22 22:21:42 +01:00
Ali Moghnieh
2fe05b4ff4
Fix silent error when creating signs. 
If the signFormatSuccess message is empty an error occurs silently that prevents the sign from being created from Essentials behalf. This commit tackles that issue by creating `getSuccessName(IEssentials)` and invoking it where possible to notify the console when this error occurs.
 2017-06-19 05:18:33 +01:00
Ali Moghnieh
ec3dc50e20
Fix typo in OfflinePlayer#setBanned(boolean). 2017-06-18 21:32:24 +01:00
Ali Moghnieh
171b2b6a37
Capitalise Parrot in Mob. 2017-06-18 21:00:02 +01:00
Ali Moghnieh
14a02c0602
Update to 1.12. :D 
To the best of my knowledge ;)
 2017-06-18 19:54:04 +01:00
Ali 'SupaHam' M
3fba6e9ad0 Add NBT support in items.csv (#1276) 
This commit adds a new 4th column reading in `items.csv` to enable the ability to specify NBT data for newly constructed items.
 2017-06-18 16:30:54 +01:00
Ali 'SupaHam' M
bbe0ca9302 Implement tab completion for all commands. (#1282) 
List of supported commands:
```
/afk
/balance
/balancetop
/ban
/banip
/bigtree
/book
/broadcastworld
/burn
/clearinventory
/condense
/delhome
/deljail
/delwarp
/eco
/enchant
/enderchest
/essentials
/exp
/ext
/feed
/fireball
/firework
/gamemode
/getpos
/give
/hat
/heal
/help
/helpop
/home
/ignore
/invsee
/item
/itemdb
/jump
/kick
/kill
/kit
/lightning
/list
/mail
/me
/msg
/mute
/near
/nick
/nuke
/pay
/potion
/powertool
/ptime
/pweather
/recipe
/remove
/repair
/sell
/showkit
/skull
/speed
/tempban
/thunder
/time
/togglejail
/tp
/tpa
/tpaall
/tpahere
/tpall
/tphere
/tpo
/tpohere
/tppos
/tree
/warp
/weather
/world
/worth```
 2017-06-11 01:17:43 +01:00
Ali Moghnieh
e572788a8c
Disable /recipe for 1.12 until duplication bug can be fixed. #1289 2017-06-09 15:02:56 +01:00
Pokechu22
4c0857fbb5
Implement tab completion framework (#1203) 2017-06-06 01:31:41 +01:00
Ali Moghnieh
8fd532c648
Translate now instead of static "now" in DateUtil. 2017-06-04 20:57:06 +01:00
Ali Moghnieh
7c0fa46b4d
Add playtime to /whois. #1212 Courtesy of @molor. 2017-06-03 09:31:53 +01:00
md678685
3ecebdc758 Add missing enable and disable functions to Metrics class (#1270) 
* Replace mcstats with bStats

Won't show up on the bStats website, until @drtshock or someone else signs up and creates a Bukkit plugin named "EssentialsX" on the bStats website. If you want to test, you can change `pluginName` to `"EssXmdtest"`, or any other value as desired.

* Add missing enable and disable functions to Metrics class
 2017-05-31 11:31:08 +01:00
md678685
f13e355010
Replace mcstats with bStats 
Won't show up on the bStats website, until @drtshock or someone else signs up and creates a Bukkit plugin named "EssentialsX" on the bStats website. If you want to test, you can change `pluginName` to `"EssXmdtest"`, or any other value as desired.
 2017-05-31 03:50:01 +01:00
Ali Moghnieh
c28d749548
Create /tpacancel. 
`/tpacancel` allows tp requesters to cancel sent requests before the target client can accept them. This aids in combatting long-lived tp requests in PvP environment.

`/tpacancel <player>` cancels all a tp request sent to <player> only.
 2017-05-31 03:30:05 +01:00
Ali 'SupaHam' M
d0760ddd04 Register SWEEPING_EDGE enchantment. Resolves #1263 2017-05-25 01:36:33 +01:00
Ali Moghnieh
af5d2c2fca
Remove Supervisor support. 
This reverts commit 442d97a1b1, fcbd3deb6b, and 6231a25413.

Due to the lack of proper dependency deployment and availability users are unable to build EssentialsX without doing some manual installations. Until issue is resolved Supervisor support is dropped.
 2017-05-04 13:55:18 +01:00
Ali Moghnieh
4bfabaa1d3
Check if getTeleportRequest() is null in /tpdeny. Fixes #1229. 2017-05-04 13:46:31 +01:00
Maxetto
78b710dc22 Set PORTAL as an Unsafe Destination 2017-01-20 09:17:11 -06:00
vemacs
7973f544ff Revert "Fix broken add-prefix-in-playerlist behavior", as it seems to break more things for other users 2017-01-20 09:08:36 -06:00
md_5
705c1c60c8 Fix erroneous usage of setAmount(0) on mirrored ItemStacks 2017-01-17 21:49:05 -06:00
vemacs
abfec5a60f Revert "Fix getItemInMainHand behavior breaking /worth (#1053)" 2017-01-17 21:46:04 -06:00
vemacs
ca28d8aa84 Fix getItemInMainHand behavior breaking /worth (#1053) 2017-01-05 12:13:08 -05:00
Maxetto
198d852995 Fix broken add-prefix-in-playerlist behavior 2017-01-04 11:48:01 -05:00
Ali Moghnieh
5f83766dc1
Implement player based toggle for pay confirmation prompts. Fixes #1032 
This commit adds a new `/payconfirmtoggle` command with `/payconfirmon` and `/payconfirmoff` as well.
 2016-12-25 18:08:16 +00:00
Ali 'SupaHam' M
dadc6b2d3a Implement confirmation dialogue for /pay. (#1002) 2016-12-18 15:03:03 +00:00
Ali Moghnieh
6231a25413
Initial implementation of Supervisor. 
EssentialsReportContext provides all online players' userdata files if report level is 400 or higher, as well as config.yml if report level is over 200.
 2016-12-18 15:00:22 +00:00
Ali Moghnieh
bc08b11011
NOOP sendTitle in OfflinePlayer. 2016-12-18 14:17:16 +00:00
vemacs
36b08e9b1d Fix compile 2016-12-12 10:09:43 -06:00
vemacs
d73ec779e0 Fix #1015 2016-12-09 19:11:04 -06:00
Ali Moghnieh
6bc9f2140c
Catch Exception in Commandpay for payUser call. 2016-12-03 15:23:53 +00:00
Luke Anderson
a6f1e305ef
[Fix] When the minimum pay amount is zero, users are unable to pay zero. 2016-12-03 14:32:50 +00:00
vemacs
c919eba206 Fix missing setVillager call 2016-11-28 17:25:29 -06:00
vemacs
61b3ca531c Fix build 2016-11-28 17:20:24 -06:00
vemacs
96164f5851 Restore basic pre-1.11 compat 2016-11-28 17:13:36 -06:00
Ali Moghnieh
3c18efc4a6
Fix /tpaccept timing out requests too soon. 2016-11-23 13:41:11 +00:00
Ali Moghnieh
ad94cca95b
Check for timeout in /tpa and /tpaccept. Fixes #818. 
This commit adds a method called hasOutstandingTeleportRequest() in IUser - implemented fully in User.
 2016-11-22 20:39:31 +00:00
Ali Moghnieh
6ade8132af
Implement NOOP openMerchant(Merchant, boolean) in OfflinePlayer. 2016-11-21 18:11:40 +00:00
Ali Moghnieh
e5b5994593
Disallow negative number input for /pay. 2016-11-21 18:05:17 +00:00
Ali Moghnieh
944ddf8d70
Further changes for 1.11 update. 
- Dropped usage of deprecated methods for a cleaner future.
- Zombies no longer throw errors in SpawnMob due to setVillager(false).
- Removed MobData where they have been replaced with actual entities.
 2016-11-20 20:23:01 +00:00
Ali Moghnieh
8b0659a2b4
Update to 1.11. 
- Support new enchantments.
- Support new mobs.
- Rename MobData WHITHER_SKELETON to WITHER_SKELETON.
- implement NOOP methods of new API methods for fake classes.
- Amend item dictionary.
 2016-11-20 16:03:56 +00:00
Ali Moghnieh
27ab90ab2a
Improve spawn-on-join with ability to specify groups. 2016-10-30 13:29:21 +00:00
vemacs
d41af02ade Fix cache invalidation when resetting user 2016-10-14 08:25:53 -04:00
vemacs
e0a578d06c Fix #857 2016-10-12 12:35:25 -05:00
md678685
1fed66d652 Remove extraneous + in Commandfly 2016-08-27 10:01:26 +01:00
Faris Rehman
f42904e5ae Add FlyStatusChangeEvent (#835) 2016-08-26 21:45:38 -05:00
Ryan
58828d7924 Don't force player out of vehicle on teleport. Fixes #582 (#833) 2016-08-26 21:29:22 -05:00
md678685
ee64f7c4ff [Fix] Remove vanished players from server list ping (#837) (#841) 
Add listener for ServerListPingEvent and remove any vanished players.
Also refactored EssentialsPluginListener serverListener to
pluginListener
 2016-08-26 21:27:52 -05:00
Ryan
dd226dfdcf Implement MuteStatusChangeEvent. Fixes #819 (#832) 2016-08-20 21:13:26 -04:00
Ryan
16e05cc17b Remove double locale set call. (#826) 2016-08-19 09:23:44 -04:00
Ali Moghnieh
03c652cd55
Fix command cooldowns command matching. 2016-08-07 15:58:34 +01:00
Ali Moghnieh
00301b26e6
Add debug for command cooldowns. 2016-08-06 17:53:24 +01:00
Ali Moghnieh
611429b6f6
Use afk player-list name in User#setDisplayName(). 2016-08-06 17:45:54 +01:00
Ali Moghnieh
5187be5d02
Set default currency-symbol-format-locale to US locale. 2016-08-04 16:38:31 +01:00
Ali Moghnieh
8927fe9ea9
Remove isHidden() check for idling kick. Resolves #773 2016-07-28 19:58:04 +01:00
Ali Moghnieh
63b5cb9ec7
Add prefix/suffix toggle for playerlist. Resolves #771 
This commit adds two new configurable options:
- `add-prefix-in-playerlist`: enable prefix in playerlist
- `add-suffix-in-playerlist`: enable suffix in playerlist

These were added to prevent very long names in the playerlist.
 2016-07-28 17:17:26 +01:00
Ali Moghnieh
30d5fbdf8d
Revert "Add mending enchantment to serializer." 
This reverts commit 743ac51c4c.
 2016-07-28 16:57:06 +01:00
Ali Moghnieh
5960f55339
Fix banner/shield deserializer with PatternType. 2016-07-26 22:03:33 +01:00
Ali Moghnieh
743ac51c4c
Add mending enchantment to serializer. 2016-07-26 22:02:50 +01:00
Ali Moghnieh
2493c655f8
Create /paytoggle command. Resolves #413 2016-07-26 16:23:34 +01:00
Ali Moghnieh
f1d9cda5eb
Create allow-bulk-buy-sell config option. Resolves #765. 2016-07-26 12:25:20 +01:00
Ali Moghnieh
a76b20f1b5
Display time since AFK in /whois. Resolves #761. 
This commit adds a getAfkSince() method to IUser.

This commit adds a whoisAFKSince message which is sent when a player is AFK, it follows the same format as whoisAFK which is still used. whoisAFK remains unchanged but is sent only when the player is not AFK.
 2016-07-26 01:36:29 +01:00
Ali Moghnieh
017082c07a
Check recipient socialspy exempt during PMs. Resolves #166 2016-07-25 13:10:06 +01:00
Ali Moghnieh
352c92b880
Implement Shield item serialization. 2016-07-25 12:06:24 +01:00