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

3607 commits

Author SHA1 Message Date
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
Francois Robinson
9a3b4db387 Added quotes to afk-list-name (#1696) 
The custom text may not parse properly if the quotes are missing. By adding them to the default config, just like on lines `443` & `447`, it will discourage making the typo by mistake.
 2017-12-18 16:40:59 +00: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
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
Marten
d36f6e45de Added 4 messages to messages_NL (#1629) 
Added 4 missing messages to the language file.
Only did those that were also found in the EN file.
 2017-11-14 10:49:45 +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
João Paulo
5136eb84f4 Update messages_pt_BR.properties (#1616) 2017-11-01 22:03:37 +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
Jacek Maciejak
703186e931 Update messages_pl.properties (#1493) 2017-10-22 10:28:49 +01:00
Andronachi Marian
e6fc459080 Update player activity on PlayerInteractEvent. 2017-10-22 10:25:49 +01:00
Francois Robinson
90feb9941f Fixed 'sumbol' typo in config.yml 2017-10-22 10:04:54 +01:00
Minecrell
2c4ff35796 Ensure LOGGER is not equal to plugin logger before setting parent (#1570) 2017-09-30 16:51:32 +01:00
Platinteufel
13ccabecf2 Update messages_de.properties (#1520) 
* Update messages_de.properties

* Update messages_de.properties
 2017-09-27 12:16:29 +01:00
CreedTheFreak
910ef26c79 Update plugin.yml mute command usage 2017-09-17 15:36:06 -07: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
Taylor
e05796f80e Merge pull request #4 from delbertina/msgs385 
Added mute format to all msg files
 2017-09-03 22:10:19 -05:00
delbertina
a70fa78267 Added mute format to all msg files 2017-09-03 22:03:17 -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
md678685
e4fbe28f95 Add EssX version 2017-08-18 11:32:04 +01:00
md678685
1bc0768683 Fix version replacement in item map and messages 2017-08-18 11:24:29 +01:00
md678685
1f42e1e2c1 Add version to newly created config files 2017-08-18 11:24:04 +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