Olof Larsson
3c60f75bbd
Rethinking power calculation some.
2013-04-23 12:14:36 +02:00
Olof Larsson
6b7312bcf8
Move deny commands from ConfServer to UConf.
2013-04-23 09:17:30 +02:00
Olof Larsson
90d819ab18
Allergy reaction kicked in. This commit removes the Spout features. I have nothing against spout but if we are going to have them we should do them properly. They should be coded in such a way that they could be in an external plugin alltogether. Also removed netbeans stuff from IDE that should not be in the github repo.
2013-04-22 21:00:00 +02:00
Olof Larsson
bc194efc9b
more variable renames for FPlayer --> UPlayer
2013-04-22 19:57:11 +02:00
Olof Larsson
19f9834210
Starting to rename fplayer --> uplayer since we will need an mplayer.
2013-04-22 17:59:51 +02:00
Olof Larsson
e30c652759
Moving the power configuration from MConf to UConf.
2013-04-22 17:20:34 +02:00
Olof Larsson
9a324d572e
Try moving some core configuration over to UConf.
2013-04-22 16:58:22 +02:00
Olof Larsson
6d2db1930c
We need UConf as well as MConf.
2013-04-22 16:26:44 +02:00
Olof Larsson
26fa7e8b95
Minor startup fixes
2013-04-22 15:05:00 +02:00
Olof Larsson
390ad76fa6
Patched away the errors with ugly meassures.
2013-04-22 14:16:07 +02:00
Olof Larsson
61e8730495
Quickfixed everything easy.
2013-04-22 13:03:21 +02:00
Olof Larsson
9fc75b1fcf
Halfway through adding in universe support
2013-04-22 12:26:13 +02:00
Olof Larsson
de703d3461
The Derpy overrides are MConf for sure.
2013-04-22 10:43:40 +02:00
Olof Larsson
c43bfbe537
Moving stuff around in ConfServer and adding properm methods to the enums for DefaultDefaults.
2013-04-22 10:37:04 +02:00
Olof Larsson
e901cae995
Moving more stuff and removing useless lwc integration config option.
2013-04-22 10:05:03 +02:00
Olof Larsson
b0871b0ee6
Moving prefixes and chat from ConfServer to MConf
2013-04-22 09:51:19 +02:00
Olof Larsson
ec8be2d2c0
Moving colors to MConf
2013-04-22 09:41:48 +02:00
Olof Larsson
41bb3f6e05
Moving files around
2013-04-22 09:37:53 +02:00
Olof Larsson
ae61ef4c37
Testing the new money interface
2013-04-19 18:34:21 +02:00
Olof Larsson
d1cebc351e
Rename mods --> officers in souce code and minor touches to the economy integration.
2013-04-19 15:51:41 +02:00
Olof Larsson
2299949a4a
Fix a couple of old cases where it said Admin instead of Leader.
2013-04-19 15:32:16 +02:00
Olof Larsson
c2063a47b2
Some indent style and comment management.
2013-04-19 15:01:53 +02:00
Olof Larsson
afe944d3c4
For some reason I like ...Change events. The power loss event is now converted to a power change event.
2013-04-19 14:40:28 +02:00
Olof Larsson
9770cb8983
Minor messaround with land claiming.
2013-04-19 14:24:35 +02:00
Olof Larsson
c6739c4aa9
More econ event moves
2013-04-19 14:08:45 +02:00
Olof Larsson
f22ea3300f
Move the temporary spout stuff to a temporary listener like we did with Econ.
2013-04-19 12:48:29 +02:00
Olof Larsson
87ee57e004
Achieve some minor symmetry increase and use listener for the home command.
2013-04-19 12:44:28 +02:00
Olof Larsson
61baf70ed1
Major messaround with the internal events and payForCommand logic. Not done just yet though.
2013-04-19 12:27:39 +02:00
Olof Larsson
d3488311de
It makes no sense to charge for purely informational commands does it? If it does we can add them in later again. Also adding in a in progress listener to show how internal events should be used for integration with other plugins
2013-04-19 10:07:53 +02:00
Olof Larsson
2f8f0713e8
Minor touches to the Econ integration
2013-04-19 09:50:33 +02:00
Olof Larsson
1df5638903
Adding in friend-state into the Rel enum and removing the config option.
2013-04-19 08:20:38 +02:00
Olof Larsson
bf22f9e289
I think this rename makes sense.
2013-04-18 21:03:38 +02:00
Olof Larsson
18da8c1250
Moved canCombatDamageHappen logic to the main listener.
2013-04-18 21:00:46 +02:00
Olof Larsson
f70cc283db
Fixing some NPE and similar small issues.
2013-04-18 20:28:12 +02:00
Olof Larsson
5ddfb19861
Make some notes in the source saying that we should use event based integration.
2013-04-18 17:47:42 +02:00
Olof Larsson
26a59fb01c
Clean up some LWC stuff.
2013-04-18 17:42:49 +02:00
Olof Larsson
ede66bac6b
Move out and clean even more listener content.
2013-04-18 17:20:42 +02:00
Olof Larsson
7c2dacce7c
Some more work to the potion damage checker. Moved stuff to MCore infact.
2013-04-18 17:12:46 +02:00
Olof Larsson
5f18ef6d0c
Clean up the denyCommands logic.
2013-04-18 16:35:45 +02:00
Olof Larsson
3ac432ac3d
Clean up the Monsters flag logic.
2013-04-18 16:11:45 +02:00
Olof Larsson
86b143573d
Working on the listeners some more.
2013-04-18 15:59:20 +02:00
Olof Larsson
9e6006e7d6
These should in no way be required anymore
2013-04-18 15:44:47 +02:00
Olof Larsson
1ee9f2bba3
Modernizing the Herochat integration, it may still be outdated with newer Herochat versions though.
2013-04-18 15:40:58 +02:00
Olof Larsson
5e481d4120
Only handle faction tags. No standard ones.
2013-04-18 15:31:05 +02:00
Olof Larsson
e9b2b4ee66
Adding in chat listener content.
2013-04-18 15:18:47 +02:00
Olof Larsson
170edc5811
Pass 1 at adding in better chat formating
2013-04-18 14:57:56 +02:00
Olof Larsson
c098171759
Decouple and put all exploit fixes in their own listener.
2013-04-18 14:02:39 +02:00
Olof Larsson
af094b6647
Make the recurring tasks non-tps-dependent.
2013-04-18 13:36:52 +02:00
Olof Larsson
1c5c5557b0
Yeah, all the stuff in Factions.java at the bottom is related to invalid task-logic. This is what I should fix next.
2013-04-18 12:39:20 +02:00
Olof Larsson
bc0a8da76f
Remove LazyLocation and declare that Tasks are not Utils.
2013-04-18 12:29:56 +02:00
Olof Larsson
9a8f2071e0
Removing the feature where there is no PVP for a few seconds after login. We do not handle teleportation which could also be a form of suprise-attack. For this reason more complex logic should be implemented in a sepparate plugin. Not in Factions.
2013-04-18 12:25:05 +02:00
Olof Larsson
8c00268015
A few I missed
2013-04-18 11:11:18 +02:00
Olof Larsson
9e6904b564
Make use of ignoreCancelled = true
2013-04-18 11:09:31 +02:00
Olof Larsson
2b11bc1042
Working on the player listener slightly and trying to figure out how to handle the lastLoginMillis through Mixin instead of locally stored.
2013-04-18 11:02:58 +02:00
Olof Larsson
2ddef9f499
Recode the fplayer power calculation
2013-04-18 10:35:40 +02:00
Olof Larsson
10455c7acd
Remaking PR 229 by squidicuzz
2013-04-18 08:00:18 +02:00
Olof Larsson
3938c92740
Merged block listener into main listener
2013-04-17 16:21:25 +02:00
Olof Larsson
003afbf108
Add in some ASCII-art and make sure the adapters have premade instances.
2013-04-17 15:49:29 +02:00
Olof Larsson
f4d799e978
Starting to clean up FPlayer
2013-04-17 15:30:21 +02:00
Olof Larsson
6ad243c014
Optimized indexer but that was not enough. Added back the cached index again but with new technology.
2013-04-17 14:44:08 +02:00
Olof Larsson
0776e5ae55
Fixing faction permOverides and making use of a predictate to send faction messages.
2013-04-17 13:16:22 +02:00
Olof Larsson
818c051ae1
Write some comments and reorder fields
2013-04-17 12:08:30 +02:00
Olof Larsson
109d6059ce
Get rid of Essentials integrations, use MCore teleporter for now and PS homes. As for chat I need to rewrite the chat system. Essentials integration can be readded later if needed.
2013-04-17 11:47:48 +02:00
Olof Larsson
4449b56246
MCore use CommandSender above Player. Adhere to this standard.
2013-04-17 10:41:38 +02:00
Olof Larsson
299316a915
Use FPerm for invite and deinvite as opposed to checking ranks.
2013-04-17 10:34:48 +02:00
Olof Larsson
2689bad8a0
Messing around with Faction source code style and default values.
2013-04-17 10:22:51 +02:00
Olof Larsson
1ccefc93b5
Removing player index to reduce complexity since I doubt its required. Decouble and nullify faction descriptions.
2013-04-17 08:55:08 +02:00
Olof Larsson
6ef15bc2db
Fixing the comparator and starting to use the standardized version command.
2013-04-16 13:17:42 +02:00
Olof Larsson
4b9bdf0d94
No compiletime errors anymore, how kewl. Let's test.
2013-04-16 12:04:12 +02:00
Olof Larsson
97a2ed1fd8
No More ZCore
2013-04-16 11:27:03 +02:00
Olof Larsson
e874ea60df
Even more command fixes.
2013-04-16 11:05:49 +02:00
Olof Larsson
a84582ba21
More work at streamlining the command constructor content
2013-04-16 10:30:21 +02:00
Olof Larsson
4c0adc523a
Fixing adding aliases to commands.
2013-04-16 10:11:59 +02:00
Olof Larsson
3d9847e4a6
Starting to convert the faction commands.
2013-04-16 09:48:57 +02:00
Olof Larsson
03c058483c
MCore Change
2013-04-16 09:28:07 +02:00
Olof Larsson
958155e43c
This would be all ArgReaders?
2013-04-16 08:35:20 +02:00
Olof Larsson
4e9d963c67
added FPerm arg reader.
2013-04-16 07:45:20 +02:00
Olof Larsson
96954e4eb2
Fixing some comments.
2013-04-14 21:20:34 +02:00
Olof Larsson
c8d60a8298
Remove three commented out rows.
2013-04-13 11:28:14 +02:00
Olof Larsson
ba88f34ef9
Let's use UUID instead.
2013-04-12 15:10:11 +02:00
Olof Larsson
0402d4456a
Migrate the auto increment id as well.
2013-04-12 10:42:37 +02:00
Olof Larsson
cfd172b7b9
Remove a comment we no longer need.
2013-04-12 09:52:23 +02:00
Olof Larsson
f2b24003bf
Do use the faction id constants
2013-04-12 09:51:14 +02:00
Olof Larsson
3036b0a157
Moved Faction entity to useage of MStore as well.
2013-04-12 09:47:43 +02:00
Olof Larsson
76f3f044ca
Possible converted FPlayer
2013-04-12 08:56:26 +02:00
Olof Larsson
3e68c38861
Group up the transient FPlayer fields.
2013-04-12 08:11:11 +02:00
Olof Larsson
7693ac2010
Some minor changes before making bigger ones.
2013-04-12 07:21:38 +02:00
Olof Larsson
ea7d0f8305
Adding in future load method.
2013-04-11 12:32:38 +02:00
Olof Larsson
6f897e15ff
Starting to preparation of Faction entity.
2013-04-11 12:22:35 +02:00
Olof Larsson
e45592432a
rename getOpen --> isOpen and remove old money migration code.
2013-04-11 11:44:55 +02:00
Olof Larsson
bdd71fa86e
Remove unused import
2013-04-11 11:33:10 +02:00
Olof Larsson
75a5764b4f
Rename .getLastLocation --> .getCurrentChunk
2013-04-11 11:27:04 +02:00
Olof Larsson
a34e2be362
Getting rid of FLocation all together.
2013-04-11 11:18:04 +02:00
Olof Larsson
4a63d50cbb
Use PS instead of FLocation in a few places.
2013-04-11 11:11:31 +02:00
Olof Larsson
4cc36b8d96
Creating a BoardMapAdapter as well to fix the GSON handling of Baord keys.
2013-04-11 10:11:14 +02:00
Olof Larsson
18b38d4320
First draft at migration routine.
2013-04-11 09:50:48 +02:00
Olof Larsson
2c12fb7739
Make an adapter for the board to serialize the one and only inner map only
2013-04-11 09:38:08 +02:00
Olof Larsson
1ebb6a3f69
Make both Board and BoardColl implement the same BoardInterface.
2013-04-11 09:25:26 +02:00
Olof Larsson
b06d5f5e55
Working some on the new Board system. Far from done.
2013-04-11 08:49:14 +02:00
Olof Larsson
926f6e7e9c
Add in collection names in Const
2013-04-11 07:04:45 +02:00
Olof Larsson
9d347715d5
Rename Board --> BoardOld
2013-04-11 07:01:30 +02:00
Olof Larsson
828c149cb0
Adding a ReqRoleIsAtLeast for future use.
2013-04-10 13:33:17 +02:00
Olof Larsson
01585801b9
Rename command files
2013-04-10 13:12:22 +02:00
Olof Larsson
75c6257000
Rename CmdCape --> CmdCapeAbstract
2013-04-10 13:01:41 +02:00
Olof Larsson
c4868935ed
Dont confuse constants and configuration options.
2013-04-10 12:52:22 +02:00
Olof Larsson
44493bbea3
Removing chached plugin refferences and got rid of another listener.
2013-04-10 12:32:21 +02:00
Olof Larsson
75ec92fb7d
Add main listener and move the first listener content into it.
2013-04-10 12:25:46 +02:00
Olof Larsson
fc64136380
Some more edits to the config.
2013-04-10 11:07:47 +02:00
Olof Larsson
bd69e854eb
Another file not required.
2013-04-10 10:55:03 +02:00
Olof Larsson
24270e7929
Geting rid of persist and prepare ConfServer for SimpleConfig usage.
2013-04-10 10:53:53 +02:00
Olof Larsson
262ec248f5
More Txt.
2013-04-10 10:45:47 +02:00
Olof Larsson
f6aa6f63ac
Remove some unused zcore files.
2013-04-10 10:35:35 +02:00
Olof Larsson
3b61a2be9b
Using MCore DiscUtil is easy enough since it was backported.
2013-04-10 10:34:12 +02:00
Olof Larsson
61b526e387
First pass at using Txt.
2013-04-10 10:32:04 +02:00
Olof Larsson
433d45ae4c
Add MCore as a dependency, remove CraftBukkit and use Bukkit. MCore and Bukkit libs should be manually maintained for now.
2013-04-10 10:18:34 +02:00
Olof Larsson
c6ea2016cb
Instance and construct pattern for Colls does not seem to work before full mcore migration.
2013-04-10 10:10:28 +02:00
Olof Larsson
879e8b4170
Taking a look in FCommand.
2013-04-10 10:00:40 +02:00
Olof Larsson
14715d1cfc
Rename adapter classes.
2013-04-10 09:54:42 +02:00
Olof Larsson
3ef3492c68
Fix indentation style and note invalid approach in EconLandRewardTask.
2013-04-10 09:47:32 +02:00
Olof Larsson
d2e261a275
Get rid of old CB refference trick to get creature type.
2013-04-10 09:44:15 +02:00
Olof Larsson
57f5372d43
Removing some deprecated stuff and fixing some ASCII art.
2013-04-10 09:40:39 +02:00
Olof Larsson
27cee7d6f7
Event cleanup pass 1.
2013-04-10 09:34:14 +02:00
Olof Larsson
363a63bf3a
No outer API plox. The inner classes should be improved to be good enough.
2013-04-10 08:56:10 +02:00
Olof Larsson
6d75465938
Remove warning since it won't be required after MCore introduction.
2013-04-10 08:51:37 +02:00
Olof Larsson
56ae5b9c70
Move the adapter to the adapter folder.
2013-04-10 08:48:21 +02:00
Olof Larsson
1f303aef91
More minor tweaks to TerritoryAccess
2013-04-10 08:47:52 +02:00
Olof Larsson
ab498b9f60
Use .get() method always.
2013-04-10 08:40:41 +02:00
Olof Larsson
00774087d3
Some minor cleanup to TerritoryAccess source code.
2013-04-09 14:05:00 +02:00
Olof Larsson
a891fc8a0a
Decouple TerritoryAccess and it's adapter.
2013-04-09 13:53:37 +02:00
Olof Larsson
936c28d5a9
Move all in the struct package to main package.
2013-04-09 13:24:55 +02:00
Olof Larsson
a726e1c49f
Rename FPlayers --> FPlayerColl
2013-04-09 13:22:23 +02:00
Olof Larsson
e3d6a4ec8e
Put instance and construct logic in the top of ConfServer.
2013-04-09 13:18:05 +02:00
Olof Larsson
1b0c0a4b72
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
Olof Larsson
c8870d10d4
MCorify the MPlugin class Factions slightly.
2013-04-09 13:12:13 +02:00
Olof Larsson
ecefb44d10
Remove CAPI integration since that plugin is abandoned.
2013-04-09 13:03:47 +02:00
Olof Larsson
f119fbb6f6
Remove old Essentials chat integration features.
2013-04-09 13:02:40 +02:00
Olof Larsson
c88847bd3e
Rename P --> Factions.
2013-04-09 13:00:09 +02:00
Olof Larsson
8a4b26cbd9
Rename Factions --> FactionColl
2013-04-09 12:58:39 +02:00
Olof Larsson
ff4b85fcf4
Add in comment sepparators like in other MCore based plugins.
2013-04-09 12:57:33 +02:00
Olof Larsson
971d2004f2
Renaming Permission --> Perm and moving to main package.
2013-04-09 12:56:29 +02:00
Brettflan
4e6c12d995
New permission factions.claim.radius (granted to all players by default), which is now required in order to specify a radius with the claim command.
2013-01-29 19:21:33 -06:00
Brettflan
15024bf880
Added missing new permissions, and minor cleanup; switched Rel enum values back to previous values, for the sake of other plugins which might check against the actual enum value (for better compatibility with both 1.6.x and 1.7.x+ versions)
...
IMPORTANT NOTE:
Existing plugin users who are upgrading to this version will likely need to grant default permissions for recruits, like so:
f config factionPermDefaults door recruit
f config factionPermDefaults button recruit
f config factionPermDefaults lever recruit
f config factionPermDefaults build recruit
2013-01-26 20:38:04 -06:00
Brett Flannigan
5da296e8ca
Merge pull request #207 from jastice/recruit-pr
...
Add recruit role for factions
2013-01-26 18:25:03 -08:00
Brettflan
8fdd07b08f
minor cleanup; made econLandReward default to 0, disabled
2013-01-26 19:59:00 -06:00
Brett Flannigan
204c78886f
Merge pull request #193 from AEtherSurfer/land_reward
...
Land reward
2013-01-26 17:54:09 -08:00
Justin Kaeser
4743c1821a
Add recruit role for factions
...
The recruit role's goal is to enable factions to invite new members without being afraid of getting griefed instantly.
Adds a configuration option "factionRankDefault" for default rank of newly joined faction members. By default this is RECRUIT, but it can be set to any supported rank.
Adds the /f promote and /f demote commands, which leaders and officers can use to increase or decrease the rank of a faction member by one level, up to officer, or down to recruit.
This version of the recruit feature preserves the /f officer command for backward compatibility.
2013-01-06 21:44:29 +01:00
Brett Flannigan
755a957b12
Merge pull request #200 from blha303/master
...
Closed a possible resource leak (in currently unused code), updated README.md to point to DBO instead of Github's deprecated downloads section
2013-01-04 08:11:29 -08:00
Brett Flannigan
04d808e54d
Merge pull request #201 from jastice/econfix
...
Handle EconomyResponse objects from Vault on all transactions.
2013-01-04 07:48:10 -08:00
Brettflan
21409a05bb
tiny performance optimization to last commit
2013-01-04 09:13:27 -06:00
Brettflan
fb2a5a9a44
Update to our obsidian generator exploit prevention code (via config option "handleExploitObsidianGenerators") to address newer method involving tripwire strings instead of redstone
2013-01-04 09:06:56 -06:00