Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-09 20:41:23 +01:00
Code Issues Projects Releases Wiki Activity
4,214 Commits 10 Branches 68 Tags 427 MiB
3f35a6b59c
Commit Graph

447 Commits

Author SHA1 Message Date
Necrodoom
0bfb079cbb Update EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java 2012-12-25 18:11:10 +02:00
snowleo
9097bef728 Merge branch 'refs/heads/groupmanager' into 2.9 2012-12-20 09:55:26 +01:00
snowleo
68e401821f Fix gm builds 
Change craftbukkit.jar -> bukkit,jar
 2012-12-20 09:36:35 +01:00
KHobbits
8b4273cbd1 Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-12-16 12:12:23 +00:00
ElgarL
1151f1a29c Fix recursive error detection when partial mirroring the main world 2012-11-20 14:55:06 +00:00
ElgarL
269cf85457 Update bukkit.jar to #1593 in lib so we can reference the new 
interfaces.
 2012-11-13 10:17:15 +00:00
ElgarL
a7aa8be37a Prevent GM commands from being used on CommandBlocks. 2012-11-11 20:56:07 +00:00
ElgarL
237c896fff Add support for Rcon. 2012-11-11 20:39:03 +00:00
KHobbits
f52e0ae7a8 Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-11-11 14:54:19 +00:00
ElgarL
a370a8e01c Merge pull request #194 from necrodoom/patch-19 
correct spaces at plugin.yml
 2012-11-09 05:51:52 -08:00
ElgarL
5e38a2180c Merge pull request #193 from necrodoom/patch-18 
GroupManager typo fix
 2012-11-09 05:51:15 -08:00
Necrodoom
ba0db53c44 correct spaces at plugin.yml 2012-11-08 16:35:57 +02:00
Necrodoom
ef98a6b54c GroupManager typo fix 2012-11-08 16:31:49 +02:00
Necrodoom
296af1069e Update EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java 2012-11-02 18:21:26 +02:00
Alexander Schepp
4d4779ecdc Use the class, not the interface 
This code will be changed later, once Elgarl updates the gm branch to 1.4
 2012-10-31 20:06:32 +01:00
Alexander Schepp
1c25d317dd Quickfix to prevent GM commands from being called by BlockCommandSender. 2012-10-31 19:44:13 +01:00
ElgarL
778f5649c8 allWorldsDataList now returns fully mirrored worlds whihc are not 
identical mirrors (fixes the /manselect list).
 2012-10-01 12:05:49 +01:00
ElgarL
920e1a3b1f Update users.yml to follow new ordering. 2012-09-25 20:41:16 +01:00
ElgarL
353253b9c5 No need for a new array. 2012-09-25 20:39:24 +01:00
ElgarL
1438230b70 Add alphabetically sorted user lists. 2012-09-25 13:23:19 +01:00
ElgarL
d4e2ed782e Change order of data in Users.yml to [name, Group, SubGroup, 
Permissions, Info nodes].
 2012-09-25 13:09:26 +01:00
ElgarL
f025cd9d2f Commenting 2012-09-25 11:27:36 +01:00
ElgarL
1ff7082892 Fix javadocs 2012-09-25 11:25:19 +01:00
ElgarL
15fa10dd29 Minor typo fix - Necrodoom 2012-09-25 11:15:28 +01:00
ElgarL
dfb81dd50f Update warning in GlobalGroups - Necrodoom. 2012-09-22 19:51:38 +01:00
ElgarL
567d52459b - Fix Synchronization on adding subgroups (thanks snowleo). 
- Remove info node support from GlobalGroups. It should not have them
as GlobalGroups are only permission collections.
 2012-09-22 19:18:51 +01:00
md_5
fd61cd1750 Merge remote-tracking branch 'origin/groupmanager' into 2.9 2012-09-16 23:02:56 +10:00
ElgarL
75f7b06a23 Remove unused imports. 2012-09-11 11:12:19 +01:00
snowleo
60142d872f Missing final 2012-09-10 20:53:25 +02:00
snowleo
1cf0ebbd7f Thread safety for GM 2012-09-10 20:49:07 +02:00
snowleo
736a6d273a Revert bad synchronization 
This reverts commit 96ab1b4533.
 2012-09-10 19:06:17 +02:00
ElgarL
71179e3dfd Synchronize the world data holder. 2012-09-10 17:46:01 +01:00
ElgarL
96ab1b4533 Change to Hashtables to reduce the chance of a 
ConcurrentModificationException pulling group/user data in an Async
thread.
 2012-09-10 00:15:42 +01:00
KHobbits
0a09b355b2 Update some of the example permissions files for the perm changes. 2012-09-08 23:00:57 +01:00
KHobbits
b1cfc8a8ed Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-08-31 22:28:21 +01:00
ElgarL
79c70b1f65 Include the GM version when logging errors. 2012-08-31 21:56:46 +01:00
ElgarL
cfe634e8f7 Give a better error when a subgroup is null. 2012-08-31 21:47:35 +01:00
Necrodoom
25d51cd79e clear whitespace in globalgroups.yml 2012-08-31 16:40:25 +03:00
KHobbits
f55316281c Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-08-28 03:12:16 +01:00
ElgarL
d588c3f271 iacc's anal 2012-08-21 21:28:26 +01:00
ElgarL
979da6e713 No more null errors from corrupt config.yml's. 2012-08-19 14:49:16 +01:00
ElgarL
84f7859ca9 Fix an error with Logging set to 'OFF' triggering a cast exception. 2012-08-14 13:26:02 +01:00
snowleo
738b895cba Merge branch 'refs/heads/groupmanager' into 2.9 2012-08-07 20:13:27 +02:00
ElgarL
72aeec58ed Better error report on malformed GlobalGroups. 2012-08-07 17:58:57 +01:00
necrodoom
30d5468be0 update with new workbench node 2012-08-07 11:07:52 +03:00
snowleo
92267fa7f8 Merge branch 'refs/heads/groupmanager' into 2.9 2012-08-06 18:25:55 +02:00
ElgarL
3c5f9e1616 Fix GlobalGroups not loading permission nodes. 2012-08-06 17:15:56 +01:00
KHobbits
9b39a227c9 Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-08-06 09:17:19 +01:00
ElgarL
a7a06963ac Ignore stupid plugins which add empty permission nodes. 2012-08-06 07:05:20 +01:00
ElgarL
73fb2d3735 Fix mirroring now we are not using any Bukkit methods. 2012-08-03 11:15:14 +01:00
ElgarL
7b482b612e Stop using the YamlConfiguration in bukkit for our config handling. We 
can now support periods in world names.
 2012-08-03 10:36:26 +01:00
ElgarL
6064b9760b Fix a cases sensitivity bug in world loading. 2012-08-03 08:54:06 +01:00
snowleo
7802192faa Netbeans 7.2 changes 2012-08-03 09:45:44 +02:00
ElgarL
76717350d6 Fix a typo because Necrodoom is anal. 2012-07-13 16:22:52 +01:00
ElgarL
b71a6ac5e1 Change to our own Yaml parsing for globalgroups instead of using the 
YAMLConfiguration class in bukkit.
 2012-07-13 13:38:53 +01:00
ElgarL
1eac05799f If a permission is found return the correct node for mangcheckp (not 
null).
 2012-07-10 14:35:08 +01:00
ElgarL
8fac5f6beb Merge branch 'groupmanager' of 
https://ElgarL@github.com/essentials/Essentials.git into groupmanager

Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
 2012-07-10 14:27:50 +01:00
ElgarL
a46497255e Stop force removing attachments and let Bukkit handle it's own mess. 2012-07-10 14:10:13 +01:00
Matt Baxter
ed668fcac4 Fix critical flaw in permissions removal. 
Potential for removing the removal entirely but this can be figured out later.
 2012-07-10 06:24:17 -03:00
ElgarL
72015d42fc Throw a better error than 'null' when someone removes all groups from a 
yml.
 2012-07-06 08:33:57 +01:00
ElgarL
24ec84730e Ignore any sub folders in the Worlds folder which start with a period 
(fix for storing data in svn respoitories).
 2012-07-04 11:32:17 +01:00
KHobbits
b1c7004d7e Update 2.9 2012-07-01 16:40:48 +02:00
ElgarL
51d61e7a91 Fix loading users with only numerals in their names to be seen as 
strings.
 2012-06-24 13:10:22 +01:00
ElgarL
656f25dc97 Only output a Data update message if something has changed. 2012-06-22 15:44:04 +01:00
md_5
f1a7be09c2 Merge remote-tracking branch 'origin/groupmanager' 2012-06-21 18:27:21 +10:00
ElgarL
5683ea35fc Better update for the User object player reference. 2012-06-16 19:12:54 +01:00
ElgarL
78d4987d5d Clear the player reference on logout so it's refreshed upon a reconnect. 2012-06-16 19:04:40 +01:00
snowleo
3a60191a9d Merge branch 'refs/heads/groupmanager' 2012-04-26 10:42:48 +02:00
ElgarL
06247732da Allow 'manucheckp' to notify when superperms reports false but it is 
really negated.
 2012-04-22 12:12:50 +01:00
ElgarL
fc7689354f Fix forgetting sub groups on a manload. 2012-04-21 16:58:22 +01:00
ElgarL
4e10470acd Remove unneeded dependency of craftbukkit (Eclipse building) 2012-04-21 02:32:02 +01:00
ElgarL
cd7bf5eff2 Prevent null perms getting past the GlobalGroups loader. 2012-04-18 22:22:35 +01:00
KHobbits
00c87c0e60 Merge remote branch 'remotes/origin/groupmanager' 2012-04-18 00:39:14 +01:00
ElgarL
6ac8abdac8 Fix a couple of perms in GlobalGroups 2012-04-17 18:57:11 +01:00
ElgarL
da857895fc Re-initialize the WorldsHolder on a reload, as un-registering and 
re-registering a new holder means all plugins have to check for the new
service on every quiery.
 2012-04-16 23:54:33 +01:00
KHobbits
6dc2e96509 Few missing default permissions. 2012-04-15 22:02:08 +01:00
KHobbits
26a0cd0761 Merge remote branch 'remotes/origin/groupmanager' 2012-04-15 19:41:06 +01:00
ElgarL
1599a36642 Correct formatting in command list. 2012-04-13 23:56:50 +01:00
ElgarL
1e30f23ca6 Finally remove all deprecated methods. 2012-04-13 15:16:08 +01:00
ElgarL
2f74510cce Code tidy 2012-04-13 15:00:55 +01:00
ElgarL
08bff3ea5f Stop using our own deprecated methods as we tell others to do. 2012-04-13 14:57:23 +01:00
ElgarL
a028abe036 Update all code formatting to use tabs for indentation. 2012-04-13 14:40:26 +01:00
ElgarL
677534c0b7 Fixed the 'last' nested throw/catch and rework all user and group 
reading to be certain to trap all errors.
 2012-04-13 13:58:05 +01:00
snowleo
d9ee666770 Merge branch 'refs/heads/groupmanager' 2012-04-12 04:27:04 +02:00
ElgarL
9f744beb13 Unregister the worldsHolder as a service on a reload/shutdown instead of 
the whole plugin.
 2012-04-12 03:21:38 +01:00
ElgarL
62a297ec6d Fix silly nested throw/catch statements. Errors are now correctly 
generated when reading yml's.
 2012-04-12 01:21:22 +01:00
snowleo
3f9e19d279 Merge branch 'refs/heads/groupmanager' 
Conflicts:
	EssentialsGroupManager/src/globalgroups.yml
 2012-04-11 21:57:58 +02:00
ElgarL
25759064ff Expand GlobalGroups.yml and groups.yml to cover the VanishNoPacket 
plugin. Demonstrating how to negate and add nodes when using the '*'
permission with inheritance.
 2012-04-11 19:10:28 +01:00
ElgarL
cd24ffbada Fix 'manuadd' to use the default or selected world (via 'manselect'), if 
the world is not specified in the command.
 2012-04-10 20:48:34 +01:00
ElgarL
cdae0898c7 Stop the error on shutdown if GM failed to load at startup. 
GroupManager will now generate it's own log (in the GM folder) to
keep things tidy, but also to account of those players unable to
find/access their server.log.
Startup errors will now lock out ALL commands other than '/manload'
 2012-04-10 20:40:04 +01:00
ElgarL
f02691863b Properly fix concurrent modification when removing all attachments. 2012-04-10 17:02:50 +01:00
ElgarL
ec4f5cc34d Added missing confirmation message on '/manload'. 2012-04-07 21:30:49 +01:00
ElgarL
e8a42e3947 Better handling of errors in user and group yml's. 2012-04-07 19:24:46 +01:00
ElgarL
e8dd963545 Fix a concurrent modification error when removing all attachments. 2012-04-07 17:21:48 +01:00
ElgarL
1c0a5c49a5 Expand 'manwhois' to also list a users subgroups. 2012-04-07 11:47:07 +01:00
ElgarL
25bd91eb80 Remove all permission attachments when performing a manload or restart. 2012-04-06 12:53:36 +01:00
ElgarL
bd7af593e7 Don't throw errors when attempting to remove permission attachments 
(bukkit will have already removed it).
 2012-04-05 21:06:48 +01:00
snowleo
f73a5d0e8d Merge remote-tracking branch 'origin/groupmanager' 2012-04-05 17:05:43 +02:00
ElgarL
f7bc04bc34 Fix an error I caused trying to modify an unmodifiable list when parsing 
'*' permissions.
 2012-04-05 15:02:08 +01:00
ElgarL
381886245b Update to 2.0 
Fix GM reporting of permission inheritance to retain the correct order.
Lower inheritance groups can no longer negate a higher groups
permissions.
 2012-04-05 12:54:26 +01:00
ElgarL
183602ac28 Prevent Null entries in group inheritance from throwing errors. 2012-04-03 14:30:27 +01:00
ElgarL
e2e51c9c95 Added a new permission node 'groupmanager.op'. This will cause players 
with this node to be treated as op's when using GroupManager commands
(they will still require each commands
permission node to use them).
 2012-04-02 21:12:19 +01:00
ElgarL
3f73272524 Force remove player attachments on disconnect, and tidyup during player 
join in case of any errors. Fixes a bug of losing permissions.
 2012-04-01 03:44:37 +01:00
KHobbits
7a249abc67 Update default permissions. 2012-03-29 18:14:24 +01:00
ElgarL
9dbeb1407c Catch errors caused by bad indentation in yml's. 2012-03-29 14:02:53 +01:00
ElgarL
1ef8ab70d1 Stop attempting to push empty permissions when players edit the yml's 
incorrectly.
 2012-03-29 13:41:59 +01:00
ElgarL
b8453ac792 Update GlobalGroups.yml for new/changed Towny permission nodes. 2012-03-27 10:14:53 +01:00
ElgarL
fe7f479e63 Auto rename all case sensitive world folders to lower case (if 
possible).
 2012-03-26 20:06:59 +01:00
ElgarL
50ea442bf0 Treat all world names as lower case for file handling (please check in 
your worlds folder. You should have no folders with upper case letters
from now).
 2012-03-26 19:18:19 +01:00
ElgarL
9570e5cfd9 Correct Grammar 2012-03-22 17:54:59 +00:00
Michael Bonney
bcd4fd9bff Removed Portuguese text, and added English replacements. Made more sense of the sentences, and also changed an incorrect message to it's proper form. 2012-03-21 16:13:34 +00:00
ElgarL
6476158462 Don't remove an attachment on a player leaving as Bukkit never forgets 
it. This fixes non mirrored permissions being messed up if a player
relogs.
 2012-03-17 15:56:40 +00:00
ElgarL
b72083fb18 Removed some debug spam. 2012-03-17 12:37:23 +00:00
ElgarL
a8937f7bf0 Fix a globalgroup inheritance in groups.yml 2012-03-12 22:18:25 +00:00
ElgarL
19d233454e change []<> for optional command components 2012-03-06 16:23:57 +00:00
ElgarL
1f761ee1cb Expanded '/manuadd'to accept an optional variable for the world (eg 
'/manuadd <player> <group> <world>').
 2012-03-06 11:02:48 +00:00
ElgarL
7ba49afa0b Better reporting when a users.yml is failing to load. 2012-03-04 10:39:39 +00:00
ElgarL
c33499797e Minor change to globalgroups 2012-03-03 14:03:52 +00:00
ElgarL
6efd3eaa27 Fix a silly logic error when testing bukkit perms 2012-03-03 13:47:59 +00:00
ElgarL
d2d8d191da Minor optimization when checking bukkit permissions. 2012-03-03 13:00:17 +00:00
ElgarL
3823e7a108 Make 'manload' reload the config correctly. 2012-02-28 10:46:10 +00:00
ElgarL
50bd5869bf Prevent promoting players to, and demoting to GlobalGroups. 2012-02-25 09:29:54 +00:00
ElgarL
fa49fc91d2 Prevent adding inheritances to globalgroups. These are permissions 
collections, not player groups.
 2012-02-25 09:22:54 +00:00
ElgarL
9c68cbae72 Removed BukkitPermsOverride as this is now the default with bukkit 
handling child nodes.
 2012-02-21 18:40:54 +00:00
ElgarL
c0df771539 Update for Bukkit R5 compatability. 
Removed some unused variables.
 2012-02-21 18:38:08 +00:00
snowleo
cf7da7a83f Merge branch 'refs/heads/groupmanager' 2012-02-21 17:34:45 +01:00
snowleo
f46948249e Updated Essentials to work with R5 2012-02-21 17:33:46 +01:00
ElgarL
3d1c0fd157 A command of '/manload' with no world arguments now performs a full 
reload of GM.
 2012-02-18 09:05:28 +00:00
ElgarL
3fc6bb4e4f comment name change 2012-02-15 06:16:33 +00:00
ElgarL
59679e0423 Depreciate PlayerTeleportEvent, PlayerRespawnEvent and PlayerPortalEvent 
as it's all handled in PlayerChangedWorldEvent.
This also means we no longer update permissions before we change
worlds.
 2012-02-15 06:15:31 +00:00
ElgarL
4a5c431163 Depreciate PlayerTeleportEvent as it's all handled in 
PlayerChangedWorldEvent.
 2012-02-14 13:01:39 +00:00
ElgarL
c0517c1203 Change Service registration to register WorldsHolder instead of 
AnjoPermissionsHandler. This is the correct entry point for all data.
 2012-02-11 10:36:55 +00:00
ElgarL
97bd49e598 Add some commenting 2012-02-05 16:41:34 +00:00
ElgarL
e93e50f6d2 Fix world mirroring so it correctly creates data files and data sources 
for partially mirrored worlds.
Fixed world mirroring so it returns the correct data for the
requested world
 2012-02-05 16:30:58 +00:00
ElgarL
76ba5caeec Prevent getAllPlayersPermissions() processing a group more than once. 
Improves performance when using complex inheritance structures.
 2012-02-02 18:10:35 +00:00
ElgarL
a0103afde3 fix setGroup to only block superperms update if update is false. 2012-02-02 02:41:10 +00:00
ElgarL
dbf30740fb Fix a bug with getWorldData return the main world data for all mirrors, 
instead of the worlds parent data.
 2012-02-02 02:01:04 +00:00
ElgarL
3f02bcd702 Catch all errors in badly formatted groups. 2012-01-31 03:16:34 +00:00
ElgarL
fe050dd725 Track the 'onPlayerChangeWorld' event as some teleports seem to not be 
triggering a world move.
 2012-01-30 17:08:55 +00:00
ElgarL
5b4966c888 Auto sort permissions on load to speed up population of superperms. 
Negating a parent node after adding all nodes with * will now
correctly remove all child nodes of that parent before populating
superperms.
	  eg.
	      - '*'
	      - -vanish.*
	      - vanish.standard
 2012-01-30 14:41:19 +00:00
ElgarL
2c8aa20542 .project change for Eclipse Build tool 2012-01-29 21:37:50 +00:00
KHobbits
d0a5656fa4 Merge remote branch 'remotes/origin/groupmanager' 2012-01-29 20:57:54 +00:00
ElgarL
95885e46c9 Fix players retaining permissions when demoted. 2012-01-29 10:54:24 +00:00
KHobbits
8f0350570e Merge remote branch 'remotes/origin/groupmanager' 2012-01-29 01:45:03 +00:00
ElgarL
3deff2afe7 silly formatting change to test gitbot 2012-01-28 18:01:17 +00:00
KHobbits
c6aa34076a Merge remote branch 'remotes/origin/groupmanager' 2012-01-28 12:58:37 +00:00
ElgarL
92f83dfe73 fix for an iterator error if there is only one element in the array. 2012-01-28 11:59:54 +00:00
ElgarL
00057eaca4 Fixed a bug when pushing superperms in the wrong order. 2012-01-28 11:47:39 +00:00
KHobbits
5137502646 Switch website URL's to point at wiki. 2012-01-28 00:20:46 +00:00
ElgarL
9ff8b69282 Properly fix inherited negated nodes. 2012-01-27 13:09:11 +00:00