Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-14 06:36:40 +01:00
Code Issues Projects Releases Wiki Activity
4,875 Commits 10 Branches 68 Tags 427 MiB
53c604c1b5
Commit Graph

4875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CreedTheFreak
53c604c1b5
Merge pull request #14 from delbertina/mutes385 
Fixed spacing
 2017-12-18 18:53:57 -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
CreedTheFreak
bcd66fec39
Merge pull request #12 from delbertina/mutes385 
Address requested changes to formatting and logic
 2017-12-16 19:40:27 -08: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
CreedTheFreak
fcda6c3b3b Merge pull request #11 from CreedTheFreak/final_mute_reason_issue#385 
Update plugin.yml mute command usage
 2017-09-17 15:39:01 -07: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
e20693de60 Merge pull request #3 from CreedTheFreak/update_branch 
Modifications Brought To you by Delbertina
 2017-09-03 19:54:20 -07: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
86315fed8d Merge pull request #1 from CreedTheFreak/mute/jail_reason_issue#385 
Mute reason issue#385
 2017-09-03 14:46:40 -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
f85170eea3 "1.7.10 is no longer supported" in README (#1512) 2017-08-24 12:34:01 +01:00
Lax
5a0ec91159 Link to new support IRC channel (#1511) 2017-08-24 12:33:43 +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
04755cee33 Fix version replacements and add version to config (#1492) 
* Add version to newly created config files
* Fix version replacement in item map and messages
* Add EssX version number
 2017-08-19 10:47:47 +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
flcmc
eb341c0704 Make {player} referencing powertools activate only when the user has powertools enabled (#1474) 2017-08-13 16:03:46 +01:00
Leomixer17
09eecb1c3b Translated banJoin and banIpJoin (#1470) 2017-08-12 18:13:31 +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
Daniel Saukel
433ebe4a21 Fix a few GER translation issues (#1421) 2017-08-12 14:23:33 +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
Florian CUNY
117704b0bc Added missing translations to messages_fr.properties (#1444) 
Related to https://github.com/drtshock/Essentials/issues/1380
 2017-08-07 13:25:03 +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
Adam Williams
4802744ce7 Spacing for antibuild place message in German (#1175) 
#drtshock 2017-03-22 20:59:27 UTC
 2017-08-04 00:47:06 +01:00