Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
869 Commits 1 Branch 5 Tags 71 MiB
25984f19de
Commit Graph

644 Commits

Author SHA1 Message Date
Olof Larsson
80eb506499 Fixing one typo and a minor bug. 2013-04-24 16:50:19 +02:00
Olof Larsson
0992c403b5 minor stuff 2013-04-24 16:40:35 +02:00
Olof Larsson
7e33bd0bf1 Add an intermediate Colls class for that shared universe-get logic. 2013-04-24 16:27:47 +02:00
Olof Larsson
643d6ba3c7 Adding TRAPPED_CHEST to the set of container materials 2013-04-24 16:12:55 +02:00
Olof Larsson
9b932cb1c6 Permission node cleanup and removal of the commented out deprecated API. 2013-04-24 16:10:16 +02:00
Olof Larsson
da2cc0f052 Whatever, lets just move the last listener stuff over 2013-04-24 15:37:17 +02:00
Olof Larsson
8fce53b4fc Recruits should per default not be allowed to build 2013-04-24 15:30:08 +02:00
Olof Larsson
521218cd6d Chunk change logic is now good enough. Moving it to the MainListener. 2013-04-24 15:19:49 +02:00
Olof Larsson
aa989db8f7 Working on auto claim 2013-04-24 15:14:15 +02:00
Olof Larsson
f6da2d397b Specifying meanings for null in Faction fields and removing the getAccountId method alltogether. 2013-04-24 14:42:52 +02:00
Olof Larsson
6846c426c4 Minor touches to player defaults. 2013-04-24 14:31:10 +02:00
Olof Larsson
0eb121c444 The Special Factions are now unique per universe. 2013-04-24 13:50:02 +02:00
Olof Larsson
e0c6e71b91 Removed WorldGuard integration. Can be readded later in a proper manner if anyone need it. Also moved some more Econ stuff to the listener. 2013-04-24 13:26:59 +02:00
Olof Larsson
bd8d945c7b Decoupled LWC integration. This is a good example of what integrations should look like. We are using events only. For this reason the LWC integration could be placed in another plugin and this is good practice. Im not saying we should move the LWC integration to another plugin but its good practice that its possible. 2013-04-24 11:30:00 +02:00
Olof Larsson
05da06594a Unifying, simplifying and messing around with land claiming and the related costs. 2013-04-24 11:16:37 +02:00
Olof Larsson
8ac19453b6 MCore change 2013-04-24 08:59:43 +02:00
Olof Larsson
cb1926c5c1 Rename task classes to correspond to config values and use minutes as the unit for human readability and thinking. 2013-04-24 08:48:35 +02:00
Olof Larsson
825d937c84 Moved the last stuff away from ConfServer. 2013-04-24 08:39:26 +02:00
Olof Larsson
d9a23241ec Move some more stuff from ConfServer --> UConf 2013-04-24 07:51:48 +02:00
Olof Larsson
3dc2691bea Moving home config from ConfServer --> UConf 2013-04-23 18:07:17 +02:00
Olof Larsson
29e05fd54d Introducing a power Mixin since Bukkit does not allow permissions for offline players and we want to know for offline players. Servers wanting individual power rules can implement and inject this mixin. 2013-04-23 17:01:43 +02:00
Olof Larsson
f802307056 Messing arund a bit with defaults 2013-04-23 14:00:18 +02:00
Olof Larsson
f8c3c6a911 Dynamic event priority. Thanks @riking. 2013-04-23 12:54:34 +02:00
Olof Larsson
ea18f1dd0d Refactor denied commands 2013-04-23 12:31:51 +02:00
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