Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-10 02:17:38 +01:00
Code Issues Projects Releases Wiki Activity
5,788 Commits 10 Branches 68 Tags 436 MiB
ea4f5cf919
Commit Graph

5788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lax
e57d0e96e2 Proper version command. (#1838) 2018-02-10 21:45:25 -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
Trent Hensler
37dfd81cc9 EssentialsX invite link 2018-02-05 21:00:36 -07: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
k-jiang
d581f48cd1 Detect and update the old config.yml. Fixes #1783. (#1784) 2018-01-28 14:24:30 +00:00
md678685
752565b8f1 Add nickNamesOnlyColorChanges to messages files 2018-01-24 19:23:00 +00:00
md678685
8e61753894 Format prefixes and suffixes properly in Chat 
Related: #1792
 2018-01-23 08:32:55 +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
k-jiang
938f94e130 Upgrade to GeoIP2, add db update. (#1748) 2018-01-20 19:29:48 +00:00
delbertina
cfcdb47529 One last tweak. New line at the end of the fr file. 2018-01-18 22:04:35 -06:00
delbertina
76f845f5f4 More tweaks. Newlines and ordering switches. 2018-01-18 22:02:39 -06:00
delbertina
c65b7b6462 Fixed error in sorting with number in message name and newlines at end of files. 2018-01-18 21:52:30 -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
delbertina
67528b25a8 Sorted messages files with the -f option 2018-01-18 15:18:22 -06: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
delbertina
9e2bb0b277 Rebase with sorted messages 2018-01-16 19:27:45 -06: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
CreedTheFreak
081c6f0263 Update plugin.yml mute command usage 2018-01-16 17:48:11 -06:00
delbertina
fc590f82a2 Added check to display mute reason when notifying 2018-01-16 17:48:10 -06:00
delbertina
729af4bb4d Added mute format to all msg files 2018-01-16 17:48:09 -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
1f0f77ff72
Merge pull request #1757 from SupaHam/fix-metaitemstack-keyword-replacer 
Allow KeywordReplacer to input replacements with underscore spacers.
 2018-01-16 15:12:45 -08:00