EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
528 Commits 2 Branches 0 Tags 71 MiB
460d280387
Commit Graph

320 Commits

Author SHA1 Message Date
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
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
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
Brettflan
6ea54cb7ac When a faction leader is kicked from his faction for whatever reason (not logging in for too long, a server admin running the /f kick command on him, the player being banned from server), another player will now be promoted to faction leader in his place. If the faction has at least one officer, one of them will be chosen. Otherwise, a normal member will be promoted. If the faction leader was the last/only member, the faction will of course be disbanded. 
Also, players being kicked due to inactivity is now logged.
 2011-12-18 07:50:41 -06:00
Brettflan
bbc7c48408 Added new conf.json setting "powerPlayerStarting" (default 0.0) for the power level which new players will now start at; previously new players would start with max power, now it's configurable 2011-12-18 03:05:22 -06:00
Brettflan
07e2721ccd Merge branch 'master' of github.com:MassiveCraft/Factions 2011-12-18 02:38:09 -06:00
Brettflan
accf718120 New conf.json setting "removePlayerDataWhenBanned" (default true), which can be disabled to prevent Factions from deleting player data for players when they are banned from the server 2011-12-18 02:37:40 -06:00
Olof Larsson
0bbb7ddfdd Merge pull request #61 from sp1ky/master 
Power regeneration rate increase as power decreases
 2011-12-16 02:41:05 -08:00
Brettflan
e19b16931d Color tags shouldn't work in descriptions any more; no more purple "[SERVER]" description messages to impersonate the console 2011-12-16 04:21:21 -06:00
Brettflan
064abfe16c Added MagmaCube to monster list 2011-12-16 00:27:08 -06:00
Brettflan
a8ed55c215 fix for Spout faction labels not updating for players who have /f map on 2011-12-15 23:50:37 -06:00
Brettflan
f1114848ff fix for Spout's questionable new "no default height" warning for variable-sized text labels 
also updated Bukkit lib
 2011-12-15 23:48:15 -06:00
Olof Larsson
1e1925b43e Performance boost? And fixed capi integration once again. 2011-12-16 00:19:01 +01:00
Olof Larsson
2c5a8872f2 Fixed capi integration 2011-12-15 16:49:47 +01:00
Olof Larsson
e9c8988ec6 Fix for containers 2011-12-04 22:48:30 +01:00
Olof Larsson
d9bfd7d38b Protecting noteblocks and blocking warp command from enemy territory. 2011-12-04 19:49:50 +01:00
Olof Larsson
8661672f14 Adding jukebox as a container. 2011-12-03 22:30:49 +01:00
Harry Jeffery
5bf3161cf0 Added chat spy feature for admins 2011-11-29 22:40:16 +00:00
sp1ky
486fce400f Power regeneration rate increase as power decreases 2011-11-28 23:24:46 +00:00
Olof Larsson
3d929138a5 Removed debug output. 2011-11-27 23:52:15 +01:00
Olof Larsson
87e7dd52d7 Merge branch 'master' of github.com:MassiveCraft/Factions 2011-11-27 23:13:58 +01:00
Olof Larsson
b4ea5228ec Backwards compat for Dynmap-Factions 2011-11-27 23:13:43 +01:00
Olof Larsson
5db20e9625 Added radius claim 2011-11-27 22:47:40 +01:00
Brettflan
72d5a8ea59 Added new 1.0 monsters; still missing magma cube mob, which isn't in Bukkit CreatureTypes yet 2011-11-27 13:03:16 -06:00
Olof Larsson
bf2ff7f0ed Allies can build per default. 2011-11-27 19:21:24 +01:00
Olof Larsson
5b64a62f6b Added protection to cauldron and brewingstand. Updated bukkit library. 2011-11-27 19:18:00 +01:00
Olof Larsson
907492e8f7 MassiveCraftCore update 2011-11-25 21:09:03 +01:00
Olof Larsson
686986eeb9 Fixes to the show command. 2011-11-24 16:53:59 +01:00
Olof Larsson
fc6bfcf061 Merge branch 'master' of github.com:MassiveCraft/Factions 2011-11-24 16:27:23 +01:00
Olof Larsson
e935a56ff9 New SeeChunk command and cleanup of the show command. 2011-11-24 16:27:14 +01:00
Brettflan
101aa8cabe Hopefully fix a couple of economy integration problems 2011-11-23 00:11:30 -06:00
Brettflan
047a03af44 Modified description change message from being purple to yellow, to prevent exploit of color to spoof official server messages 2011-11-11 13:27:04 -06:00
Brettflan
95bdac3d86 Fix for command payment and land claiming/unclaiming payments not checking if faction banks are actually enabled, but instead only checking the individual bank-related settings; Fix for command costs being charged incorrectly based on "land costs" setting 2011-11-11 13:10:18 -06:00
Brettflan
e390c67bde formatting 2011-11-06 15:29:14 -06:00
Brettflan
dedb282498 Fix for minor NPE causes by null player when updating Spout-based appearances 
also updated Spout lib
 2011-11-06 15:27:18 -06:00
Olof Larsson
c43d34af79 Fix the nofaction wilderness invuln bug. 2011-11-06 09:20:03 +01:00
Olof Larsson
da15de2b52 moderator -> officer rename in messages in the officer command. 2011-11-06 09:12:38 +01:00
Olof Larsson
9c678965be The special factions must be closed. 2011-11-05 11:15:37 +01:00
Brettflan
d614dec781 Fix for faction chat referring to all speakers as "you" 
Fix for faction account being null from Register and triggering NPE with some economy plugins
Updated Register lib
 2011-10-27 08:48:14 -05:00
Olof Larsson
7ab784f02e Another reason to be saved 2011-10-26 14:50:34 +02:00
Olof Larsson
f76311c492 Claiming now works again :P 2011-10-25 22:18:54 +02:00
Olof Larsson
72db45e45e Updated readme, Fixed admin bypass command and corresponding permissions, Swapped colors for ally and truce, added new faction permissions, improved explosion protection and implemented firespread protection, fixed painbuild check order, flags can only be changed by server admins now and implemented type adapters for some enumerations for future changes to be non breaking. That it \:D / 2011-10-25 21:18:08 +02:00
Olof Larsson
57c4b70dad Merge with master 2011-10-25 17:52:14 +02:00
Olof Larsson
ee59a904a0 Removed line from help 2011-10-25 17:49:52 +02:00
Brettflan
d44ccda211 autoclaim will now cancel beforehand if player isn't able to claim land for the specified faction 2011-10-25 01:27:58 -05:00
Olof Larsson
451d9570e4 The friendlyfire flag now works 2011-10-24 14:54:37 +02:00
Olof Larsson
8eec55e37e asdf 2011-10-24 13:02:48 +02:00
Olof Larsson
5f437b1862 Changed permission view. Bank withdraw permission in the works 2011-10-24 11:56:41 +02:00
Olof Larsson
99e8acd79f Streamlined the faction arg descriptores 2011-10-24 11:11:53 +02:00
Olof Larsson
0c46809952 Some refactoring and better messages 2011-10-24 11:07:06 +02:00
Olof Larsson
bb5a676430 Changes to the ascii map and minor tweaking 2011-10-24 09:28:08 +02:00
Olof Larsson
1ec7842ed4 Removed the strange usage of selective saving and implemented a good simple one. 2011-10-24 03:15:08 +02:00
Olof Larsson
074be07510 Some dead code elimination 2011-10-24 03:02:25 +02:00
Olof Larsson
46161f61db Started to implement special faction behavior 2011-10-24 02:33:30 +02:00
Olof Larsson
e3821a8d4e REMOVED owned plots 2011-10-24 01:37:51 +02:00
Olof Larsson
958a1e0d9f Working permdelta parser 2011-10-23 23:38:26 +02:00
Olof Larsson
371261a07f Working on the faction perms as well now 2011-10-23 23:17:02 +02:00
Olof Larsson
21783ef9d4 Woop 2011-10-23 22:08:57 +02:00
Olof Larsson
ac6870b770 Merge with master 2011-10-23 20:53:56 +02:00
Olof Larsson
98c5230655 Wheeerp 2011-10-23 20:50:49 +02:00
Brettflan
136b69b07f Swapping money commands back to using EconomyParticipator instead of Faction/FPlayer 2011-10-23 13:14:51 -05:00
Brettflan
f8f3704cd4 Additional logging, with new conf.json settings to enable/disable logging of specific events: 
"logFactionCreate": true,  - log faction creation
"logFactionDisband": true,  - log factions being disbanded, by command or by circumstance
"logFactionJoin": true,  - log player joining a faction
"logFactionKick": true,  - log player being kicked from a faction
"logFactionLeave": true,  - log player leaving a faction
"logLandClaims": true,  - log land being claimed (including safe zone and war zone)
"logLandUnclaims": true,  - log land being unclaimed (including safe zone and war zone)
"logMoneyTransactions": true,  - log money being deposited, withdrawn, and otherwise transferred in relation to faction banks

Also a fix for a potential NPE from players logging out and Spout appearance handler referencing them afterwards
 2011-10-23 12:50:02 -05:00
Olof Larsson
842844969b Merged Relation and Role into one enum 2011-10-23 17:55:53 +02:00
Brettflan
46cae5a664 Updating help info a bit 2011-10-23 10:41:47 -05:00
Olof Larsson
e6ff84ad9a Merge branch 'master' into seven 2011-10-23 17:31:30 +02:00
Olof Larsson
d280f9409d In the middle of refactoring to merged role and relation as one enum 2011-10-23 17:30:41 +02:00
Brettflan
83f690c9c5 Fix for unclaimall command not working if Economy was disabled 2011-10-23 10:04:36 -05:00