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

727 Commits

Author SHA1 Message Date
Brettflan
24e85e0e77 Faction homes are now un-set if the territory they are set in is lost (unclaimed, or claimed by another faction), but only when someone tries to /f home or dies and would normally respawn there 2011-06-30 05:17:34 -05:00
Brettflan
8f9de1d2d5 New conf.json option "homesRespawnFromNoPowerLossWorlds" (defaults to true) to go with Oli's recent commit, so server owners have an option whether or not players should respawn to faction homes when they die in "worldsNoPowerLoss" worlds 2011-06-30 05:15:16 -05:00
Brettflan
86112380da fix for StringIndexOutOfBoundsException caused by overlong string passed to titleize(String str) 2011-06-30 01:46:12 -05:00
Oli
8ff84019ee Made faction home respawning obey the 'worldsNoPowerLoss' config 2011-06-29 14:45:51 +01:00
Brettflan
69d1427552 after testing, found that these changes cause encoding problems on some setups when the JSON files are read; tried for a bit to find a solution, but gave up since I was having to test on my live server (test VM server was working fine) 
so, reverting for now
 2011-06-28 22:43:28 -05:00
Brettflan
a8c84c5d6d tweaked hook functions a bit more, de-crapped server log messages for faction chat 2011-06-28 20:00:08 -05:00
Brettflan
24362d38e9 moving additional JAR contents into src folder, adding my complete NetBeans project files so others have an easier time working with the source 2011-06-28 18:49:42 -05:00
Brettflan
b66b102333 New conf.json option "homesTeleportCommandEnabled" which can be used to disable the /f home command, while possibly leaving faction homes enabled for the "homesTeleportToOnDeath" functionality 2011-06-28 18:29:14 -05:00
Brettflan
a9619a73c0 some changes to the file reading routine, to speed it up and also to hopefully be more tolerant of user changes to file encoding (intentional or more likely unintentional) from the default UTF-8 encoding 2011-06-28 18:27:35 -05:00
Brettflan
c80f6d803c one more hookable utility function for other plugins to use, to determine the support version for the hook functions (will increment whenever new hooks are added) 2011-06-28 18:25:00 -05:00
Brettflan
f79831d3d6 added another simplified function for chat plugins to hook, ShouldLetFactionsHandleThisChat(PlayerChatEvent event) to see if chat event is a special case which should be left alone for Factions to handle (Faction Chat enabled player, or factions f command without slash used) 2011-06-27 12:25:02 -05:00
Brettflan
a7676429fe removed "preloadChatPlugins" option and related code, since that method could cause problems and since we've switched to using softdepend in the plugin.yml for preloading plugins 2011-06-27 03:06:09 -05:00
Brettflan
071e8b7b6b further improved hookable functions for use by other plugins, added softdepends for appropriate chat plugins 2011-06-22 20:12:37 -05:00
Brettflan
094486676a Added conf.json option "noPVPDamageToOthersForXSecondsAfterLogin" (defaults to 3 seconds) which keeps players from being able to do PvP damage for a few seconds after logging in (to counteract the exploitable 3-second PvP protection given to players when they log in); Fix for "claimsMustBeConnected" bug which prevented factions from making their initial first claim 2011-06-22 20:10:42 -05:00
Brettflan
6035b204dc updating built-in GSON to 1.7.1 release 2011-06-22 18:40:56 -05:00
Brettflan
55dd858be9 A bit of cleanup and odds and ends, adding missing @Override annotations and such 2011-06-21 00:38:31 -05:00
Brettflan
60227b6dc4 Added option "considerFactionsReallyOfflineAfterXMinutes" (default 0.0, immediately) which makes all "Offline" options still consider the faction as having members online until X minutes after the last one logs off 2011-06-21 00:20:36 -05:00
Brettflan
8880d503e2 added option "claimsMustBeConnected" (defaults to false) which requires all faction claims beyond the first to be connected to each other; support for "{FACTION_TITLE}" in chat messages 2011-06-20 21:15:41 -05:00
Brettflan
56cbf54c98 Added options to require faction homes to be set only inside the faction's own territory ("homesMustBeInClaimedTerritory", default is true) and to optionally prevent teleporting to the faction home if the player is in enemy territory ("homesTeleportAllowedFromEnemyTerritory", default is true thus not prevented) 
Made commands which reference player names (like /f admin <name>) allow for partial name matches
Optimized a couple of things, and updated help text to indicate /f unclaim works for safe/war zones
 2011-06-19 03:56:21 -05:00
Brettflan
768f96bf9b added option "disablePVPForFactionlessPlayers" to disable PvP damage to/from players who are not in a faction 2011-06-19 03:49:46 -05:00
Brettflan
e886cef9aa Fix for DenyUsage checks in safe zones and war zones not being handled properly 2011-06-16 02:37:05 -05:00
Brettflan
db0e89fb11 Disband command got missed for being added to help pages 2011-06-16 02:34:56 -05:00
Brettflan
4da15abb06 fix for "No Faction" player count always returning 0 2011-06-16 02:33:41 -05:00
Brettflan
cddaa73948 Added another hook, handleFactionTagExternally, for chat plugins to indicate they're handling faction tag insertion into chat 2011-06-11 19:02:57 -05:00
Brettflan
6c37f4cbe1 added functions to main class for other plugins to potentially hook into, targeted at chat plugins at the moment: isPlayerFactionChatting to see if player has faction chat enabled, and getPlayerFactionTag and getPlayerFactionTagRelation to get the player's uncolored or relation-colored faction tag 2011-06-11 17:29:24 -05:00
Brettflan
3f0d330d6e fix for /f disband causing NPE if you provided a bad (nonexistent) faction tag 2011-06-11 17:01:06 -05:00
Brettflan
4cc13707cc Added further "offline" options for preventing the 3 explosion types in faction territory; also fix for safe zone and war zone autoclaim bug 2011-06-10 18:47:39 -05:00
Brettflan
e023e9de91 a few minor speed enhancements 2011-06-10 18:45:11 -05:00
Brettflan
1af166b1c2 fix for /f save causing NPE when run from console 2011-06-10 14:26:30 -05:00
Brettflan
097b555466 new autoclaim commands for faction claims, safe zone claims, and war zone claims, which claim land as you walk around 2011-06-10 14:26:12 -05:00
Brettflan
2e1d7da50f /f lock command can now be used through console; fix for /f reload command causing NPE if run from console 2011-06-10 14:22:29 -05:00
Brettflan
f9de4171d4 special case added to block placement check, so flint&steel isn't prevented due to placing fire (as Bukkit sees it) 2011-06-10 14:16:14 -05:00
Brettflan
7ab0d700cc Added new "territoryDenyBuildWhenOffline" option to go with other two new offline prevention options by thomastanck; slight speed improvement for offline check 2011-06-10 14:14:02 -05:00
Brettflan
cbd0ee42ba New conf.json option "warZoneFriendlyFire", defaults to disabled; if enabled, allies and fellow faction members can hurt each other in war zones 2011-06-10 07:38:14 -05:00
Brettflan
19b1ceabdd changed /f home enemy distance check to use simpler box shaped detection area instead of diamond shaped 2011-06-08 20:33:12 -05:00
Brettflan
85fd5eb04d Fix for options which disable wilderness explosions (TNT, creepers, fireballs) not actually disabling them; player->player damage is now also prevented if attacker is in a safe zone and defender is not (attacking from safety that way was exploity) 2011-06-08 16:22:19 -05:00
Brettflan
d0a405ff95 reload and save commands now don't require it to be a player executing them 2011-06-08 16:19:02 -05:00
Brettflan
3b5471d465 Merge branch 'master' of https://github.com/oloflarsson/Factions 2011-06-05 22:04:08 -05:00
Brettflan
7ef01ef84c don't add tag padding if player has no faction 2011-06-05 22:03:58 -05:00
Thomas Tan
a1e89457ff Change-Id: Ibaa6d8c7eba4fe616faa5e78d946c9495d252fde 2011-06-04 18:14:39 +08:00
Thomas Tan
999be49f5c Forgot offline block protection. Added now. 
Change-Id: Ib4e8866e5da655e01bdbb64f61d2130c664bc241
 2011-06-04 17:59:35 +08:00
Thomas Tan
5ddc24f855 Added offline protection using the new configs 
Change-Id: I93c5122bce09a3bd760fcd18d4dd0801a3548af9
 2011-06-04 17:36:28 +08:00
Thomas Tan
24a4da6d2e Added configs for protection for offline factions 
Change-Id: I2351b74144195d7b068b65b218732fdbd0fc3bef
 2011-06-04 17:36:03 +08:00
Thomas Tan
d793b718aa Removed unused import and unused private variable "lock" 
Change-Id: I6356e9cbcdfef78639d2571c39ae6c9ff9415bab
 2011-06-04 16:59:11 +08:00
Brettflan
b1b96a4c1b Bugfix release 1.2.2: Preload of EssentialsChat had problems if Essentials core wasn't loaded yet; added Essentials to preload list 2011-06-03 19:17:34 -05:00
Brettflan
0859854af0 New chat tag placement options to have it replace a specified string (such as the default "{FACTION}"), put the tag before or after a specified string (such as "<" or ">"), and whether to pad the front or back of the tag with an extra " ". 2011-06-03 13:06:41 -05:00
Brettflan
be177902fd People hit in a safe zone no longer get spammed with "PlayerX tried to hurt you" messages; only the idiot trying to hit someone else in a safe zone gets spammed. 2011-06-03 13:02:24 -05:00
Brettflan
35e17f3ec5 ability to specify a single file with /f reload (i.e. /f reload conf), so you don't have to reload all 4 of them 
also a trivial typo fix
 2011-06-03 13:00:16 -05:00
Brettflan
6f0dcf4b29 people with bypass permission can build in wilderness regardless of wilderness settings 2011-06-01 23:01:51 -05:00
Brettflan
85d055739d Added in options to protect all wilderness (unclaimed) areas, in case that's your sort of thing. Also lowered default "territoryShieldFactor" from 0.5 to 0.3, since it seemed a bit overpowered at 0.5. 2011-06-01 18:32:09 -05:00
Brettflan
3a3b09da61 New "territoryDenyBuild" and "territoryDenyUseage" options, so block protection and interaction prevention can be disabled on faction claimed land. Also added trap doors to the default "territoryProtectedMaterials" list. 2011-06-01 18:13:56 -05:00
Brettflan
996acdc4fb Added powerRegenOffline option for those who for whatever reason want player power to regenerate even when they are offline; increased default power loss from death from 2 to 4 2011-06-01 06:54:00 -05:00
Brettflan
29469b0d27 Preload some chat plugins before Factions to prevent conflicts 2011-06-01 06:39:25 -05:00
Brettflan
f9cffebe27 quick typo fix, "chainged"->"changed" (thanks Deathfromance) 2011-05-29 17:19:46 -05:00
Brettflan
654e3b159b New option to disallow players from leaving, joining, or being kicked from a faction while they have a negative power level - code by sp1ky, adapted from a pull request 2011-05-29 16:41:50 -05:00
Brettflan
b490c5f196 Laundry list of changes for 1.2.0 release: 
/f map now has a nifty faction name key  (LexManos)
There are now War Zones; these work similar to Safe Zones, except PvP is enabled and monsters are not blocked  (Brettflan)
Players now only regenerate power while actually online  (Brettflan)
New command available to prevent power loss in specific worlds  (Brettflan)
New command available to prevent faction land claims in specific worlds (doesn't affect safezone and warzone claims)  (Brettflan)
New command to unclaim all safezone areas  (Brettflan)
Players are now prevented from using /f home if an enemy is nearby, and the players isn't in a safezone or their own faction territory  (Brettflan)
New option to make membership default to closed for newly created factions  (Brettflan)
When an admin has bypass mode enabled (/f bypass), they can now unclaim any faction land they're standing on  (Brettflan)
 2011-05-29 16:28:29 -05:00
Brettflan
edd36519e4 Should be a proper fix for "Could not pass event ENTITY_DAMAGE to Factions" exception caused by NPC mods which tie into Player entities 2011-05-12 00:52:17 -05:00
Andy Buchholz
a709e9c7b3 * commit forgotten files 2011-05-10 19:18:35 +02:00
Andy Buchholz
516a98c970 * added command to disband a faction (/f disband <tag>) 2011-05-08 17:44:00 +02:00
Andy Buchholz
bffa9df8f7 * added lock switch to all write actions 
* added saveall command to save everything to disk
* added reload command to reload everything from disk
 2011-05-08 17:16:43 +02:00
Brettflan
a02fcca54d Updates in preparation for 1.1.7 release: 
* /f map has been updated to fit inside the new Bukkit line-width limits (39 tiles wide instead of 49)
* Players who aren't currently in a faction should no longer get "Person left your faction" messages when others join a faction
* Attempt at simple workaround for error related to NPCs from Citizens plugin
* Placement and removal of paintings is now prevented if you're in another faction's territory
 2011-04-28 15:45:43 -05:00
Brettflan
8a4463b599 Added check to make sure chatTagInsertIndex is valid, to prevent triggering an exception, commented out a bit of debug output 2011-04-25 20:29:47 -05:00
Olof Larsson
3820b53d29 Added a radius to safe claim 2011-04-08 21:01:46 +02:00
Olof Larsson
e4d798e9d6 New command unclaim all 2011-04-08 16:22:00 +02:00
Olof Larsson
6e00b16f38 Changed name for no faction to wilderness 2011-04-08 16:09:08 +02:00
Olof Larsson
724ce03a40 Removed Help plugin support as that plugin is not updated. Minor bugfixes and refactoring 2011-04-08 16:03:04 +02:00
Olof Larsson
443fac354a Fixed the package structure 2011-04-08 15:51:07 +02:00
Brettflan
26c708b65e changes AdminBypass permission to enable new "bypass" command which toggles admin bypass mode on or off, defaults to off 
added tracking for the SaveTask() and shutdown of it when the plugin is disabled
 2011-04-06 05:04:57 -05:00
Brettflan
542ad4a6a0 Widened the exception catching nets for loading and saving all data (IOException -> Exception, etc.), so loading and saving problems don't wipe out unrelated plugin data 2011-04-06 04:08:08 -05:00
Brettflan
12bc5d9d74 Add in exception catching to MyLocationTypeAdapter, seems to finally be handling all problems without crash 
Added 1.1.5b release with this fix
 2011-04-04 12:26:48 -05:00
Brettflan
204f67c43b fix for left-clicking wooden doors not being prevented; as a minor side-effect, left-clicking on other blocks in the territoryProtectedMaterials list pops up the "you can't use that" message 
Releasing 1.1.5 for this quick fix
 2011-04-04 08:34:32 -05:00
Brettflan
7ffc4962b8 Fix for null faction home location, added "factions.adminBypass" permission which will allow players with that permission to bypass the building/destruction and usage limitations inside faction territory. 2011-04-04 07:16:53 -05:00
Brettflan
5fa0103c9e Subversion seems to handle merges better than Git, but that's not saying much :-P 
Committed change not exactly related, just a casualty of the should-have-been-a-simple-merge-and-not-conflicting craziness
 2011-04-04 06:47:18 -05:00
Brettflan
2ec8437c35 Merge branch 'master' of https://github.com/oloflarsson/Factions 2011-04-04 06:37:15 -05:00
Brettflan
b912b49289 New boolean config options territoryBlockTNT (default false), safeZoneDenyBuild (default true), safeZoneDenyUseage (default true), safeZoneBlockTNT (default true). territoryBlockTNT prevents TNT explosions inside faction territory, which defaults to false (same as before). It prevents TNT cannons from being a viable tactic, and I think for most people it would be an undesirable option. safeZoneBlockTNT prevents TNT explosions inside safe zone areas, which defaults to true (new behavior). I think most server operators would prefer safe zones to be safe from TNT, from TNT cannons or otherwise. safeZoneDenyBuild prevents players from building inside safe zone areas, which defaults to true (same as before). This option is added for server admins who, for whatever reason, want to let their players build and break inside safe zone areas. safeZoneDenyUseage prevents players from using items in the territoryDenyUseageMaterials list, which defaults to true (new behavior). This will (with the default list) prevent players from dumping/using buckets inside safe zone areas. 2011-04-04 06:33:40 -05:00
Olof Larsson
c3c69a30dd Warning fixes 2011-03-31 15:13:02 +02:00
Brettflan
e3ad9cf509 strip all color tags from faction-tagged chat messages before sending them to console/log, to de-cruft them 2011-03-30 05:11:06 -05:00
Brettflan
bddcc798ce For some reason onPlayerInteract() doesn't always detect bucket usage if it's about 2-3 blocks away from you, so I added monitoring of PLAYER_BUCKET_EMPTY and PLAYER_BUCKET_FILL events which seem to always fire correctly without fail 2011-03-30 04:23:20 -05:00
Brettflan
8970de026b don't try sending a message to a player who isn't online; NPEs suck 
removed instaDestroyMaterials since it is no longer needed
 2011-03-30 04:20:24 -05:00
Brettflan
e429bc8020 Initial update for RB 600... bucket use still not prevented properly yet though, needs a bit more work before release 2011-03-29 23:37:32 -05:00
Brettflan
ebde7bcc1a attempt to handle an NPE someone has been getting in MyLocationTypeAdapter.serialize() 2011-03-28 14:38:07 -05:00
Brettflan
dc7935ee3e Added ability to load old pre-1.1 data files (board, factions, followers) if they exist and new files don't. 
Also made 1.1.2 release with this update.
 2011-03-26 09:01:48 -05:00
Olof Larsson
b2a76e2b24 Added some missing instaDestroyItems 2011-03-24 19:05:45 +01:00
Olof Larsson
d71c0e86d7 bugfix - admins could not place signs etc in safezones 2011-03-24 15:49:33 +01:00
Olof Larsson
48ede9d7bf Removed autoLeaveImmunity due to missdesign in the Permissions plugin. 2011-03-24 00:26:01 +01:00
Olof Larsson
b0f09db054 Safe zones and faction homes :D :D 2011-03-23 17:39:56 +01:00
Olof Larsson
9d4aaeae6c reworked the board 2011-03-23 12:45:21 +01:00
Olof Larsson
bee15556c9 Some case insensitivity fixes 2011-03-23 12:00:38 +01:00
Olof Larsson
8bab4540cd Better save system 2011-03-22 22:31:04 +01:00
Olof Larsson
39a02f0fd4 New auto leave on anactivity feature. 2011-03-22 20:36:33 +01:00
Olof Larsson
27d414ffc4 Fewer runtime errors... 2011-03-22 19:25:11 +01:00
Olof Larsson
1c062c9c79 Now it compiles. Time to fix runtime errors... 2011-03-22 18:48:09 +01:00
Olof Larsson
4e964ba194 Fewer and fewer errors... 2011-03-22 17:20:21 +01:00
Olof Larsson
d7c1d0fce3 More refactoring... the commands are refactored now :) 2011-03-22 15:45:41 +01:00
Olof Larsson
0b96a821ce More refactoring 2011-03-19 13:00:03 +01:00
Olof Larsson
1da8b6b30a Started the refactoring 2011-03-18 17:33:23 +01:00
Brettflan
2f4e487cb6 cutting down of crops and sugar cane are now prevented if you are in another faction's territory 2011-03-17 18:04:45 -05:00
Brettflan
d5308bc75d Added config option territoryBlockFireballs, defaults to false; if enabled, prevents destruction of blocks by Ghast fireballs inside faction territory... note that this only works in CB build 557 and higher, where fireball detection was added 2011-03-17 18:02:29 -05:00
Brettflan
45162a3444 minor spelling and grammar fixes 2011-03-10 22:14:39 -06:00
Brettflan
2ca8e4b9af Fix for player right-clicking in the air causing an NPE due to target block being null 2011-03-09 18:21:17 -06:00
Brettflan
5ab5ef6724 check for special block destruction cases which previously were incorrectly allowed in other faction's territory: torch, redstone torch (on & off), repeater (on & off), redstonewire, sapling 
Paintings still can't be prevented from destruction, sadly
 2011-03-08 06:42:48 -06:00
Brettflan
a7fede9c13 Now preventing placement/use of these items inside another faction's territory: redstone wire, signs, flint&steel, beds (not detected properly by Bukkit yet), buckets (empty, water, and lava), repeaters 2011-03-08 06:06:52 -06:00
Brettflan
2016f232ef Fix for enemy attacks healing people in their own territory, instead of correctly just giving reduced damage. 
The problem is that Bukkit reports the amount of damage before armor calculations are made, so the actual damage will be less if the target is wearing armor.
So, I switched it to using setDamage instead of healing the target.
 2011-03-06 21:13:27 -06:00
Brettflan
1d26e18916 Added option ("territoryBlockCreepers") to prevent creepers from destroying blocks if they explode inside faction owned territory, which defaults to disabled; if enabled, it prevents griefing by way of luring creepers into a faction's territory 
note that creepers will still explode and hurt nearby players and mobs, they just won't destroy blocks
 2011-03-06 14:13:48 -06:00
Olof Larsson
429e86fd4b Beta6. Supports CB493 2011-03-05 11:39:14 +01:00
Olof Larsson
afde3e188b Type safety and warning fix. 2011-03-05 10:53:08 +01:00
Brettflan
6c971742d0 comment out debug messages shown on plugin startup, was a bit too spammy 2011-03-04 21:40:49 -06:00
Brettflan
74a823be88 Added pagination and sorting of faction list, sorted primarily by which faction has the most users online and secondarily by how many total members the faction has 2011-03-04 21:40:40 -06:00
Brettflan
986461a098 streamline rebased Gson into source; rebase was done to prevent conflict with other plugins (like upcoming WorldGuard release) which also use Gson; Bukkit doesn't yet handle such conflicts properly 2011-03-04 10:48:56 -06:00
Brettflan
df75afef08 handle a few random errors that popped up in my server log 2011-03-04 10:48:43 -06:00
Brettflan
775f3a00d5 Update for latest CraftBukkit 2011-03-04 10:48:32 -06:00
Olof Larsson
9404eb77ff Fixed block break protection. Removed grief info messages for now 2011-02-26 10:33:31 +01:00
Olof Larsson
d3c5868ca4 beta4 2011-02-26 09:33:25 +01:00
Olof Larsson
478116c418 A color format fix and clas not found def fix 2011-02-13 17:02:51 +01:00
Olof Larsson
fb1305f97a Default faction tag rules are now more permissive 2011-02-13 16:37:21 +01:00
Olof Larsson
09bc3df841 Better way to remove faction from boards implemented. Also prevents orphaned foreign key errors. 2011-02-13 15:18:23 +01:00
Olof Larsson
19e0628f27 Multiworld support 2011-02-13 11:18:08 +01:00
Olof Larsson
4316469ec1 Arrow attacks are now included in the friendly fire filter 2011-02-13 09:33:42 +01:00
Olof Larsson
14ad1299b2 Faction chat is now something you turn on and off 2011-02-13 09:08:20 +01:00
Olof Larsson
156e939d18 C:/Program Files (x86)/Git/f show command now displays relations to other factions. 2011-02-12 18:52:45 +01:00
Olof Larsson
88ff88103e Better faction listing 2011-02-12 18:19:51 +01:00
Olof Larsson
da89ff4ecd Better chat integration with other plugins. In fact the whole chat system has been reprogrammed. Fix ascii compass typo. Fix claim at the border of enemy territory bug. New faction chat. Some refactoring 2011-02-12 18:05:05 +01:00
Olof Larsson
46a814a11e This would be v1.0 beta2. Just live testing on mcteam.org left to do. 2011-02-07 21:42:14 +01:00
Olof Larsson
eeb9061d26 First relase: 1.0 beta1 2011-02-06 17:45:48 +01:00
Olof Larsson
db03d466ba A deinvite bugfix and some color formating misses 2011-02-06 16:07:10 +01:00
Olof Larsson
bcd52a1fbd Fixed version number and version command. Updated folder structure for easier working with eclipse 2011-02-06 15:30:41 +01:00
Olof Larsson
b3ac8f8614 what? 2011-02-06 13:36:11 +01:00