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

951 Commits

Author SHA1 Message Date
Olof Larsson
858b4e5fd1 1.7.9 Support 2014-05-14 15:27:27 +02:00
Tibo442
9efbd5dfc6 Update UConf.java More essentials aliases 2014-04-12 11:03:36 +02:00
godgodgodgo
46517e71e5 Add tpyes and etpyes aliases for accepting a tpa 
Adds commands to block tpaccept aliases that not many people know of.
 2014-04-04 01:34:23 +01:00
Olof Larsson
6bd4581d80 Compat with ProjectileSource 2014-03-27 00:13:41 +01:00
Tibo442
d0253ac676 Add Essentials e+(command) to UConf 
Fixes a bug.
 2014-01-25 20:35:20 +01:00
Olof Larsson
6d1d232d0c Merge pull request #527 from Tibo442/patch-1 
Update CmdFactionsName.java
 2014-01-25 02:41:40 -08:00
Tibo442
41870a73c6 Fix "The faction %s<i> was disbanded." colors 2014-01-22 20:10:29 +01:00
Tibo442
68192ff8b8 Update CmdFactionsName.java 
Without this, a hacker/troller could "/f name (some random stuff)" spam, without the owner/admins know WHO did it.
With this, everyone knows who changed the "/f name".
 2014-01-21 20:39:30 +01:00
Olof Larsson
ddb1e1f3f4 Protect against ItemFrame item removal. Fixes #501 2014-01-05 12:20:41 +01:00
Olof Larsson
b951493ea1 MCore change and disable name change broadcasting per default 2014-01-05 11:55:45 +01:00
Olof Larsson
1101f3c399 Shh no spells. Only tears now. 
![Featured Image](https://www.massivecraft.com/wp-content/uploads/2013/12/shhh-no-spells-only-tears-now.jpg)
 2013-12-07 11:47:52 +01:00
Olof Larsson
5d35754ed6 Money param reorder 2013-12-03 20:19:55 +01:00
Olof Larsson
efa9d6cb59 Treat a move as a move instead of a despawn+spawn. 2013-12-03 18:02:15 +01:00
Olof Larsson
05aaa8140d This constant could be useful to other plugins. 2013-12-03 17:16:41 +01:00
Olof Larsson
20659b6086 MCore change related to universed money. 2013-12-03 12:59:46 +01:00
Olof Larsson
1a63c59c54 This is 2.2.2 2013-11-11 09:31:04 +01:00
Olof Larsson
fa0c8686c1 MCore change 2013-10-18 14:52:32 +02:00
Olof Larsson
2a6937554e Cache explosion allowed results. Fixes #423 2013-09-22 11:34:21 +02:00
Olof Larsson
d945d2f947 Slightly better class desc 2013-09-21 11:43:11 +02:00
Olof Larsson
06df4dc499 Use the already casted attacker when possible. Add a line break. 2013-09-21 11:39:08 +02:00
Olof Larsson
2d9daa517e Add pvp dissalowed event. Adds #421 2013-09-21 11:32:39 +02:00
Olof Larsson
a5f4781f7b Avoid some magic values and suppress warnings for the rest. 2013-09-20 12:50:32 +02:00
Olof Larsson
5a7024db4c Fix deprecated warnings related to int vs double damage. 2013-09-15 01:08:20 +02:00
Olof Larsson
34681c7340 Remove the implementation specific customData. It's now added to all entities in Mcore. 2013-09-10 03:34:54 +02:00
Olof Larsson
b484b6bb38 Add in a place for people to store their custom data. 2013-09-10 02:40:16 +02:00
Olof Larsson
43f9f304a6 The enum sets are no longer final constants. Thus we should use camel case instead. 2013-08-29 10:48:17 +02:00
Olof Larsson
a72bebecb6 Fix power removed twice upon death sometimes with McMMO. 2013-08-27 10:56:47 +02:00
Olof Larsson
35af6ac0ea Swap format argument order. Fixes #376 2013-08-27 07:21:07 +02:00
Olof Larsson
549aaaf494 Adding in offline explosion protection per default. 2013-08-23 10:45:27 +02:00
Olof Larsson
fa0a2fb90a Move enum sets to mconf instead of hardcoding them. This way perhaps other server mods can add in stuff that's useful to them. 2013-08-23 10:14:39 +02:00
Olof Larsson
844dc6c420 Consider deactivating admin mode each time we check it. Fixes people getting stuck in admin mode that no longer has permissions for it. 2013-08-23 08:10:44 +02:00
Olof Larsson
04aca214e1 This approach is hopefully better. 2013-08-22 13:37:08 +02:00
Olof Larsson
c5be1754c4 Performance improvement as suggested by md_5, thanks. 2013-08-21 10:02:40 +02:00
Olof Larsson
a71b3a19f3 Add in optional relcolor parsing. Since it rarely may break other advanced chat plugins it can be opted out from in the mconf. Enabled by default. 2013-08-21 09:51:43 +02:00
Olof Larsson
faa61345df Fix a bug pointed out by Riking. 2013-08-12 06:48:12 +02:00
Olof Larsson
df9b10e074 Make world sets case insensitive so people can WrItE HoWeVeR tHeY WaNt. 2013-08-09 10:06:28 +02:00
Olof Larsson
66cdb21215 Note the possible NPE for further investigation. 2013-08-08 09:28:39 +02:00
Olof Larsson
32e060c2c3 Handle entity attacks without attackers. Fixes #332. 2013-08-07 07:52:26 +02:00
Olof Larsson
9aaa6de945 Avoid NPE that could arrise due to NPC plugins etc. 2013-07-31 14:50:28 +02:00
Olof Larsson
9f5753a682 Merge pull request #295 from AEtherSurfer/fix_chunk_change_event_bug 
Fix chunk change event bug
 2013-07-27 00:47:50 -07:00
Olof Larsson
ea5c5ce81e Untested re-added teleport to faction home on death feature. 2013-07-24 18:29:55 +02:00
ÆtherSurfer
3c13235365 fix indent 2013-07-20 19:34:18 -04:00
ÆtherSurfer
bbc77790da fix FactionsEventChunkChange bug, tryClaim changes the board in between the time it instantiates this event and it calls getType 2013-07-20 19:29:21 -04:00
Olof Larsson
428f1a18e7 This is 2.0.2_dev 2013-07-02 10:44:03 +02:00
Olof Larsson
e5e87c9359 Ooops. Missed out the recipient limits when re-deobfuscating. 2013-06-28 07:44:00 +02:00
Olof Larsson
e0729fbeb0 Add in a new tag {factions_roleprefixforce} 2013-06-27 11:42:02 +02:00
Olof Larsson
1952cd2999 Update HeroChat integration to version #214 2013-06-27 11:03:08 +02:00
Olof Larsson
6339861819 Fix bug where data migration from 1.8 would fail. 2013-06-27 10:06:15 +02:00
Olof Larsson
2172ef79c8 Removing debug code thats no longer required. 2013-06-20 09:59:36 +02:00
Olof Larsson
a85e0eccdf and again ... 2013-06-18 10:24:20 +02:00
Olof Larsson
2dd0c8e4a9 And again ... 2013-06-18 10:13:31 +02:00
Olof Larsson
25984f19de More reorder 2013-06-18 09:59:26 +02:00
Olof Larsson
42937a497d Reorder commands. 2013-06-18 09:34:46 +02:00
Olof Larsson
677a9f1a86 MCore update, bug fix and some debug output that should be removed not just yet. 2013-06-18 09:07:05 +02:00
Olof Larsson
66991fba02 Fix a bug where you could not claim a startingpoint for your base in another world 2013-05-29 14:31:09 +02:00
Olof Larsson
34d2dcb97b Ugly NPE evasion. Solves the issue probably but why did it turn null even in the first place? 2013-05-28 09:10:24 +02:00
Olof Larsson
ac95004450 Fix permision to withdraw money and chunk border/connected checking. 2013-05-17 08:37:32 +02:00
Olof Larsson
a79577a355 Another modification to the claim rights checking 2013-05-17 08:10:46 +02:00
Olof Larsson
81d79775f8 Attempt 1 at fixing the claim permission bug. 2013-05-13 07:21:11 +02:00
Olof Larsson
509e7c1711 Remove useless super() call 2013-05-13 07:06:55 +02:00
Kane York
aec60b0bea Wrong MConf value in FListenerExploit 2013-05-09 09:29:35 -06:00
Olof Larsson
7c10a6c83f MCore changes 2013-05-03 09:58:43 +02:00
Olof Larsson
cf03bd5b8a Fixing one permission check bug and adding some debug output in hope to find that bug. 2013-04-29 16:29:10 +02:00
Olof Larsson
709c1fe80d Work on TerritoryAccess and permissions. 2013-04-29 12:48:11 +02:00
Olof Larsson
3a6bca872f Allow people with permission to manage access to deny themselves access. How else should these people feel confident they can setup the access correctly? Personally my reaction was to try to deny myself and I was confused when I couldnt. 2013-04-29 10:42:33 +02:00
Olof Larsson
cea9a85f2b Fix an nPE 2013-04-29 10:35:35 +02:00
Olof Larsson
1d951fb5cf Let's allow the allowed people 2013-04-29 10:26:15 +02:00
Olof Larsson
66b4eb4b92 Pass 1 at reworking the Territory Access system. 2013-04-29 10:23:39 +02:00
Olof Larsson
03684c78f1 Testing out the new PSFormat called HumanSpace. 2013-04-26 20:22:12 +02:00
Olof Larsson
3d50e84360 Improvements to info commands. 2013-04-26 17:54:06 +02:00
Olof Larsson
1609a7cfea Renaming show --> faction and power --> player 2013-04-26 14:01:28 +02:00
Olof Larsson
7cbc99bdd6 Remove the interact spam check. I think it was only useful back in the old days where the denied messages where broadcasted to other players and not only yourself. 2013-04-26 11:07:29 +02:00
Olof Larsson
7ce0100e73 Minor changes to npe detection and denied commands 2013-04-26 11:06:07 +02:00
Olof Larsson
7626aed06a Fixing a few bugs, and adding in some debug output for unsolved ones. 2013-04-26 10:32:02 +02:00
Olof Larsson
f6d601446e Some bugfixes 2013-04-26 08:02:32 +02:00
Olof Larsson
684974b336 Minor tweaks to default config values 2013-04-25 20:21:23 +02:00
Olof Larsson
99f6087536 Typo-fix 2013-04-25 17:22:22 +02:00
Olof Larsson
71bf3e9f72 Adding in the pow command again. It should be noted that the whole information display system needs a rewrite. Perhaps one command for player and a few for faction? 2013-04-25 17:17:23 +02:00
Olof Larsson
21c7742dcb Added missing enabled requirement for sethome. 2013-04-25 17:00:22 +02:00
Olof Larsson
fffdf07178 More minor tweaks 2013-04-25 16:54:55 +02:00
Olof Larsson
ea06c468fc Fix some more small bugs 2013-04-25 16:02:37 +02:00
Olof Larsson
c6757fae60 Removing some f and adding some u. 2013-04-25 14:15:25 +02:00
Olof Larsson
7a99005f7b Tweaking requirements, removing declaim aliases and shortening the author list by using minecraft name only. 2013-04-25 13:53:22 +02:00
Olof Larsson
5047439756 More universe disabled checks. 2013-04-25 13:25:15 +02:00
Olof Larsson
ac2c7c705c Just started adding in the universe toggle. 2013-04-25 12:18:39 +02:00
Olof Larsson
8fd088e291 A few minor bugfixes and tweaks. 2013-04-25 12:04:01 +02:00
Olof Larsson
18e6c778b9 Fixing a couple of NPE 2013-04-25 11:00:17 +02:00
Olof Larsson
0fd21575e4 Adding in Faction creation timestamp. You can now see how old the faction is. 2013-04-25 10:51:11 +02:00
Olof Larsson
0ed104279f Change order in UPlayer.detachId to avoid NPE. 2013-04-25 10:27:39 +02:00
Olof Larsson
09a23353a7 Drop old special factions upon migration. 2013-04-25 09:59:25 +02:00
Olof Larsson
638ba4ca7f Thanks @Brettflan, Adding HOPPER and DROPPER to the material constant. 2013-04-25 09:54:20 +02:00
Olof Larsson
c10b6f5edc Adding in a preprocessor to avoid using the SerializedName annotation. 2013-04-25 09:49:39 +02:00
Olof Larsson
8e59017cb1 Working on the setter pattern some more. The inited check is now built into the entity changed method. 2013-04-25 08:34:10 +02:00
Olof Larsson
26af25f1c5 Improve the UPlayer setters to follow a standardized format and avoid triggering the changed method on nochange. 2013-04-25 08:01:26 +02:00
Olof Larsson
8070cc5579 Readd the powerboost for players and the proper maximum power per faction calculation. 2013-04-25 07:53:26 +02:00
Olof Larsson
8382d39409 Thanks @LiLChris, a cosmetic change. 2013-04-25 07:32:33 +02:00
Olof Larsson
e32a741b3b Renaming sender vars in the command system to more proper names. 2013-04-25 07:29:19 +02:00
Olof Larsson
882bdf4c88 Thanks @AEtherSurfer, changed the order of faction and radius in the claim command and added a maximum radius. 2013-04-24 20:17:20 +02:00
Olof Larsson
aea6c38eaf Nah lets not create a built in badword list. Its not doable due to the scunthorpe problem. 2013-04-24 19:04:53 +02:00
Olof Larsson
5eed71fc67 Rename Faction Tag to Faction Name. What did tag ever mean? Name makes more sense. 2013-04-24 19:01:17 +02:00
Olof Larsson
82e380cd3d these changes fixes a few startup errors related to non-attached factions lacking universe. 2013-04-24 18:22:52 +02:00
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