Commit Graph

735 Commits

Author SHA1 Message Date
Brettflan
70af217de7 Merge branch 'master' of github.com:MassiveCraft/Factions 2012-01-28 12:11:52 -06:00
Brettflan
4348d2c35e Fix for storing player data in factions.json unnecessarily, and FPlayer add/remove methods are now marked as protected 2012-01-28 12:11:12 -06:00
Olof Larsson
87dc76716e deleted an unused import. 2012-01-28 19:09:50 +01:00
Brettflan
f0eae47164 Merge branch 'master' of github.com:MassiveCraft/Factions 2012-01-28 12:02:39 -06:00
Olof Larsson
8a13cd8cdc reverting the revert (sorry) 2012-01-28 19:00:13 +01:00
Brettflan
9a6c15edd1 New command /f powerboost <p|f|player|faction> <name> <#>, which will apply a permanent power bonus/penalty to a specified player or faction. When applied to a player, it will affect their max power and min power. When applied to a faction, it will be applied to current and max power levels. Whether it is a bonus or a penalty depends on whether the number you specify is positive or negative.
New permission factions.powerboost which is required to use the above command. This permission is added to the factions.kit.mod permission kit.

example usage:
/f powerboost p Player1 1.5  (give player "Player1" a bonus of 1.5 power)
/f powerboost faction SomeFaction -6  (give faction "SomeFaction" a penalty of -6 power)
2012-01-28 11:56:51 -06:00
Olof Larsson
ba760b69ae Reverting... wtf 2012-01-28 18:10:19 +01:00
Olof Larsson
c248d419bb Panic fix to remove infinite loop 2012-01-28 17:15:20 +01:00
Olof Larsson
7575cfcafc merege fix 2012-01-28 17:03:47 +01:00
Olof Larsson
dfb36a9e43 Noted a possible npe 2012-01-28 17:02:18 +01:00
Brettflan
30b3facc19 Players no longer regain power while dead; no more waiting to respawn in order to regain power
Also added AuthDB to softdepend list, so it has first shot at Factions commands in case it needs to cancel one
2012-01-28 05:59:07 -06:00
Brettflan
5ac0baf84a Fix for Vault economy integration bugging out if the target economy plugin loaded after Factions (really seems like a Vault issue, but we'll work around it)
Fix for users who have Vault but don't use economy getting an NPE
2012-01-28 05:24:39 -06:00
Brettflan
fb92fb7c68 Update to new Bukkit Event system
Also remove leftover TNT exploit prevention code which I missed earlier
2012-01-28 04:37:56 -06:00
Brettflan
1dc5a0f226 removed TNT exploit handling code, since they did finally fix the bug in the CraftBukkit 1.1-RC1 release 2012-01-28 04:07:21 -06:00
Brettflan
319be71102 Merge branch 'master' of github.com:MassiveCraft/Factions 2012-01-28 03:16:57 -06:00
Brettflan
7144da54c7 Workaround fix for half-step placement on existing half-steps not being prevented; it's caused by a CraftBukkit bug:
https://bukkit.atlassian.net/browse/BUKKIT-646

Fix for a potential NPE in FPlayer autoLeaveOnInactivityRoutine.

Added CaptureThePoints and CombatTag to our softdepend list so they can potentially cancel Factions commands.
2012-01-28 03:16:25 -06:00
Olof Larsson
92bddb0f9a Add optional essentials integration for /f home delay and cooldown (enabled by default). 2012-01-27 22:22:32 +01:00
Brettflan
ace3853694 Update Bukkit lib to 1.1-RC1 2012-01-26 22:20:42 -06:00
Brett Flannigan
370fd274d7 Merge pull request #84 from patrickfreed/master
Fixed NPE in LWCFeatures
2012-01-26 17:47:24 -08:00
Patrick
23e970bc60 Fixed NPE that occurs when a player is offline when chests are cleared. 2012-01-26 17:19:00 -05:00
Brettflan
1196d74140 Fix for error when deleting a faction if Vault wasn't present;
Fix for slashless Factions commands not working for player in faction chat or alliance chat modes
2012-01-20 11:19:34 -06:00
Brettflan
0209d69814 removed extra /f claim alias ("claim" was in there twice) 2012-01-19 00:41:10 -06:00
Brettflan
663a7e9454 New conf.json setting "permanentFactionMemberDenyCommands" (list, default empty), which can be used to prevent members of permanent factions from using specific commands.
Also, a minor fix for the help page regarding faction banks being shown if "bankEnabled" setting was enabled but "econEnabled" setting was false (economy as a whole disabled).
2012-01-18 23:31:33 -06:00
Brettflan
b4450b3bdb fix for factions-specific commands not being prevented properly if they were in "territoryNeutralDenyCommands" or "territoryEnemyDenyCommands"
also got rid of a command preprocess listener which is now unnecessary
2012-01-18 22:42:58 -06:00
Brettflan
960aca6240 fix for /f config not accepting values with spaces in them (i.e. "/f config territoryEnemyDenyCommands f home") 2012-01-18 22:24:12 -06:00
Brettflan
19b9bffc43 New conf.json setting "permanentFactionsDisableLeaderPromotion" (default false) which, if enabled, will circumvent the promotion routine for permanent factions so that they can exist without a faction leader, only regular members and/or officers. 2012-01-18 21:21:26 -06:00
Brettflan
a330931cd5 New conf.json setting "econClaimUnconnectedFee" (default 0.0), which can be set as an additional economic cost for claiming land which is not connected to existing claims. This additional cost is only added if the faction has at least 1 existing claim somewhere in the current world, and is added to the cost after all other calculations are done.
This fee is not refunded from unclaiming land or even considered in actual land values.
2012-01-18 21:10:40 -06:00
Brettflan
bc40f3b751 Server admins can now promote or demote any member of any faction to/from faction leader or officer using the existing /f leader and /f officer commands, with two new permissions added to allow that. A third permission is also added to allow server admins or moderators to join any faction without the need of /f bypass mode.
Also, a couple more minor bugfixes are included for /f home payment giving the wrong message, player/faction descriptions being wrong for console messages, and potential NPE in new faction leader promotion routine if faction was permanent with no current leader.

New permissions:
factions.leader.any - allows use of /f leader on any player in any faction
factions officer.any - allows use of /f officer on any player in any faction
factions.join.any - allows player to join any faction, bypassing invitation process for closed factions (the same as players with /f bypass enabled can do)
2012-01-18 06:01:50 -06:00
Brettflan
46d7e9f4c5 self-inflicted damage (such as ender pearl usage) is no longer prevented with a message like "you cannot hurt you" 2012-01-17 02:56:38 -06:00
Brettflan
8142e1c28f improved TNT exploit prevention
Now, canceled exploit attempts don't injure players or mobs as if the TNT had successfully exploded, and if it's the case of an existing TNT block which a redstone torch is attempted to be placed next to, it no longer drops a free TNT item. In that case, the existing TNT block is still destroyed itself, but... oh well, it's close enough to perfect.
2012-01-17 01:57:16 -06:00
Brettflan
2a9b475012 Economy integration is now handled through Vault instead of Register. You will need to download and install the Vault plugin now if you want to use any Economy-related features. If you're not using the Register plugin for anything other than Factions, it should be safe to remove it from your server.
Vault: http://dev.bukkit.org/server-mods/vault/

Note: for proper faction bank support, if you're using iCo5 or EssentialsEco, I recommend waiting for Vault 1.2.5 to be released which addresses faction account creation issues related to those.
2012-01-16 19:38:14 -06:00
Brettflan
de14985d1e (courtesy of patrickfreed) LWC Chest Protection Integration
When a claimed territory is captured by another Faction, all LWC chests that are not occupied by members of the person who is claiming the territory's faction lose their protection.
2012-01-15 12:41:33 -06:00
Brettflan
c19f3405bf when redstone torches or TNT were attempted to be placed in protected territory but prevented, it could previously still trigger a TNT explosion due to a longstanding unfixed CraftBukkit exploit. A workaround is now in place to prevent this, and any such attempts are logged and announced to everyone on the server.
For reference: https://bukkit.atlassian.net/browse/BUKKIT-89
2012-01-15 11:41:14 -06:00
Brettflan
e8baaa2460 Minor tweaks to chatspy, added it to /f help 2012-01-15 01:41:03 -06:00
Brett Flannigan
9ff68301e5 Merge pull request #60 from eXeC64/spy
Added chat spy feature for admins
2012-01-14 22:58:39 -08:00
Brettflan
8027e87078 Errors loading conf.json are handled better now, allowing Factions to continue on to loading board.json instead of losing it
Also, the bad conf.json file is backed up to conf.json_bad so it can potentially be recovered
2012-01-13 05:48:03 -06:00
Brettflan
47ba56de9e Optimization: Factions (as objects) now maintain a list of FPlayers in the faction for faster lookup
INTEGRATION NOTE: getFPlayers() and getFPlayersWhereOnline(boolean online) now return Set<FPlayer> instead of ArrayList<FPlayer>, so other plugins which hook into those methods will probably need to be updated.
2012-01-13 03:46:31 -06:00
Brettflan
4b4d26ed29 updated the map orientation to match the new compass north orientation 2012-01-13 03:18:34 -06:00
Brettflan
23f55ee753 /f list sorting method performance boost 2012-01-11 19:11:10 -06:00
Brettflan
78a62bc25c Updated /f map compass to use new official north 2012-01-11 18:19:31 -06:00
Brettflan
43a086d420 MCore lib also, needed by some capi lib references used in Factions 2012-01-11 17:08:16 -06:00
Olof Larsson
ea03124c31 Merge branch 'master' of github.com:MassiveCraft/Factions 2012-01-11 23:02:33 +01:00
Olof Larsson
ea80f325ec a' 2012-01-11 23:01:59 +01:00
Brettflan
65f16b74bd Players auto-removed due to inactivity or due to being banned now have their data deleted immediately; this should fix the log spam of the same players repeatedly being marked for deletion 2012-01-09 21:37:16 -06:00
Brettflan
1c918ad52e Merge branch 'master' of github.com:MassiveCraft/Factions 2012-01-07 15:57:01 -06:00
Brettflan
324455cdde fix for potential infinite loop when cleaning data
As reported:
at com.massivecraft.factions.Factions.get(Factions.java:99)
at com.massivecraft.factions.FPlayer.getFaction(FPlayer.java:43)
at com.massivecraft.factions.integration.SpoutFeatures.updateSingle(SpoutFeatures.java:218)
at com.massivecraft.factions.integration.SpoutFeatures.updateAppearances(SpoutFeatures.java:154)
at com.massivecraft.factions.FPlayer.resetFactionData(FPlayer.java:188)
at com.massivecraft.factions.FPlayer.resetFactionData(FPlayer.java:194)
at com.massivecraft.factions.FPlayers.clean(FPlayers.java:45)
<repeat>
2012-01-07 15:56:17 -06:00
Olof Larsson
f0627017b5 Found a bug I did NOT FIX. 2012-01-04 00:30:07 +01:00
Olof Larsson
81d24ecbc4 Leaders can now not be kicked by their officers. Improved leader command. 2011-12-23 01:13:55 +01:00
Olof Larsson
3dc70e82d9 Unused imports cause warings in eclipse. 2011-12-18 22:47:48 +01:00
Brettflan
c02c5702b4 Added soil to the default "materialsEditOnInteract" setting, so people who aren't allowed to build in a territory won't be able to trample crops in it (soil trampling is handled as an Interact event, for whatever reason)
For servers with existing conf.json files, you can use this command to update them: /f config materialsEditOnInteract SOIL
2011-12-18 08:28:28 -06:00