Commit Graph

1715 Commits

Author SHA1 Message Date
nossr50
96e2cfaad6 Tip: Shoot the cyberdemon until it's dead. 2013-01-15 15:10:48 -08:00
nossr50
f7d482e7bc Sometimes I forget how to use git (all the time) 2013-01-15 14:55:41 -08:00
nossr50
6c67308a1f Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO 2013-01-15 14:49:55 -08:00
nossr50
6bbdbee669 FFS Leaderboard rewrites, and new mcrank command. 2013-01-15 14:49:20 -08:00
GJ
9204b23d51 Allow configuration of Skull Splitter damage modifier. 2013-01-15 17:00:56 -05:00
GJ
5bdf4b5dcc Finish Axe restructuring, modify a little bit of Swords stuff as well. 2013-01-15 16:38:44 -05:00
GJ
105f088576 Remove unused variable. 2013-01-15 16:36:39 -05:00
GJ
f40433fc99 Axe restructuring. 2013-01-15 16:16:46 -05:00
GJ
bbbd12d461 Fix issue where Tree Feller affected player-placed blocks. Fixes #507 2013-01-15 13:13:20 -05:00
GJ
81dae8c43d Fix NPE resulting from using /mcremove command on a Flatfile DB. Fixes
#509.
2013-01-15 10:51:06 -05:00
GJ
ec6a7e79d6 ACTUALLY fix issue with TNT damage - Fixes #510. 2013-01-15 10:34:13 -05:00
GJ
630b64462e Fixed a bug with Blast Mining incorrectly handling reduced TNT damage. 2013-01-15 10:01:15 -05:00
GJ
72b8eb85b0 NPEs are bad and I should feel bad. 2013-01-14 17:38:47 -05:00
Glitchfinder
a92843533b Merge pull request #506 from Glitchfinder/master
Further reducing lag when saving or unloading a world.
2013-01-14 14:25:18 -08:00
GJ
83855268d5 To keep me from accidentally deleting this again... 2013-01-14 17:23:39 -05:00
Glitchfinder
67e1defdb8 Further reducing lag when saving or unloading a world. 2013-01-14 14:18:01 -08:00
GJ
724aad8504 Allow for a chance at 3x drops from Super Breaker again - Addresses #456 2013-01-14 17:11:35 -05:00
Glitchfinder
a64e177c21 Fixing some NPEs related to having an empty leaderboard. 2013-01-14 13:09:11 -08:00
Glitchfinder
75e52bbe66 Making it impossible to attempt to drop air. 2013-01-14 11:31:11 -08:00
GJ
348887f799 Refactoring, removing useless variables, changing ints to doubles, etc. 2013-01-14 12:41:39 -05:00
GJ
8915a535c6 No point casting from int to int. 2013-01-14 12:03:42 -05:00
GJ
0587741437 More Axe restructuring, changing some config values from int to double,
added function to duplicate code.
2013-01-14 11:55:43 -05:00
GJ
8e2707d33e Duplicate code is stupid. 2013-01-14 00:47:47 -05:00
GJ
268db10361 Parameterize our ArrayLists. 2013-01-14 00:34:01 -05:00
GJ
ed5120eead This should be static access. 2013-01-14 00:27:30 -05:00
GJ
aab532f475 Remove useless else. 2013-01-14 00:27:16 -05:00
GJ
00ee75bb29 Remove unused imports. 2013-01-14 00:26:18 -05:00
GJ
e7e680fd8e Updating the SQL for the purge command, adding config options for
purging old users.
2013-01-14 00:25:31 -05:00
GJ
7b334601c6 Merge pull request #500 from t00thpick1/master
More SQL stuff
2013-01-13 21:09:40 -08:00
T00thpick1
050cb8c5f4 Speed up purgeOldUsers task 2013-01-14 00:06:01 -05:00
Glitchfinder
c1bbc685e6 Fixing a minor spacing issue. 2013-01-13 20:05:20 -08:00
Glitchfinder
d5d6f7e860 Reducing CPU usage as a result of unloading chunks. 2013-01-13 20:02:11 -08:00
Glitchfinder
f73d0dbc40 Missed one of the calls. 2013-01-13 18:24:43 -08:00
Glitchfinder
395e243730 Converting calls again. 2013-01-13 18:23:11 -08:00
Glitchfinder
eb2c552316 Bukkit Devs renamed a method and didn't leave a mirror in the old name. 2013-01-13 17:56:05 -08:00
TfT_02
664239c567 Fixing a java.io.FileNotFoundException when using SQL 2013-01-14 00:20:48 +01:00
TfT_02
06df8e7f7b Formatting 2013-01-14 00:20:48 +01:00
GJ
21a0849a5b Fix t00thpick's mistake. :p 2013-01-13 16:22:56 -05:00
GJ
1f660c8c5b Merge pull request #492 from t00thpick1/master
Speed up powerless sql users purge
2013-01-13 13:20:50 -08:00
T00thpick1
14f5a25633 Speed up SQL powerless users purge 2013-01-13 16:09:47 -05:00
GJ
606195c78a Added option to disable gaining Acrobatics XP from dodging lightning
strikes. Fixes #481
2013-01-13 16:04:02 -05:00
TfT_02
6a7f92b4e2 Fixed missing spaces resulting in Arcane Forging Settings being ignored 2013-01-13 12:53:59 +01:00
TfT_02
0e1646e3a7 Fixed removing to many '%' from locale files 2013-01-13 12:53:59 +01:00
NuclearW
ea5af0397e Merge pull request #488 from t00thpick1/master
One more fix
2013-01-12 20:52:10 -08:00
T00thpick1
6ed0038b1e Result rows start at 1 not 0 2013-01-12 23:24:35 -05:00
Grant
00640fe39b Merge pull request #487 from t00thpick1/master
Should fix mcTop and reduce used queries from 11 to 1 - Fixes #483
2013-01-12 20:10:24 -08:00
T00thpick1
4fb7d60eee Java loop should work right now, forgot to order it earlier 2013-01-12 21:58:22 -05:00
T00thpick1
c54755b9c1 Forgot to format 2013-01-12 21:30:53 -05:00
T00thpick1
07c9b614bc Increment place for display 2013-01-12 21:29:28 -05:00
T00thpick1
7bea8f5120 Fix MctopCommand and make it more efficient 2013-01-12 21:26:48 -05:00
gmcferrin
ea97dcdb55 Fix missing Spout check. Will switch to Bukkit sounds soon. 2013-01-12 19:17:29 -05:00
TfT_02
931bafe962 Adding missing line to locale files
Forgot to add this in my previous commit
2013-01-13 00:33:54 +01:00
TfT_02
a3a6509410 Update the changelog 2013-01-13 00:26:18 +01:00
TfT_02
5e26f2e707 Fixing silly calculations by me. 2013-01-13 00:26:18 +01:00
TfT_02
54ef85e1a3 Fishing in the rain gives you a higher chance of getting magical items! 2013-01-13 00:26:18 +01:00
TfT_02
6f29e475ee Nothing to see here, just some boring patches and fixes! 2013-01-13 00:26:18 +01:00
gmcferrin
e6607783e9 One last time... 2013-01-12 01:43:40 -05:00
gmcferrin
2021a0b065 Finish fixing CASCADE_DELETE issues... I think. 2013-01-12 01:23:16 -05:00
gmcferrin
0871a96399 Fix SQL syntax issue. 2013-01-12 00:34:52 -05:00
gmcferrin
2ed5e8e717 Fixes issue #315 - Fishing will now properly respect min/max levels in
treasures.yml
2013-01-11 17:55:54 -05:00
gmcferrin
0c61cc8bdc More things can be enchanted now. 2013-01-11 17:35:28 -05:00
gmcferrin
c2bad4419b Make the purge task available as a command. 2013-01-11 16:33:49 -05:00
gmcferrin
d0e2358fab This is a much better way to delete things. 2013-01-11 15:26:56 -05:00
TfT_02
db95085b26 Use the DecimalFormatter from SkillCommand
Why didn't I do this in the first place..
2013-01-11 19:07:07 +01:00
gmcferrin
08592cbacf Hopefully speed up UserPergeTask 2013-01-11 12:12:19 -05:00
gmcferrin
487e67d208 Because NuclearW said I was wrong...
"Final is final unless it's not really final."
2013-01-10 23:15:53 -05:00
gmcferrin
a8abfdae5e Start Axe restructuring. 2013-01-10 22:39:08 -05:00
gmcferrin
6496816692 Fixed the null check I broke. 2013-01-10 22:06:50 -05:00
gmcferrin
364c18b842 Leave purge task disabled by default until we can speed it up. 2013-01-10 21:56:48 -05:00
gmcferrin
e20098d462 Fixed up the log messages. 2013-01-10 21:54:32 -05:00
gmcferrin
d25a314d3a Fix bug with UserPurgeTask... 2013-01-10 21:41:35 -05:00
gmcferrin
3dde331f9d Add some debug so we can find the problem... 2013-01-10 21:11:11 -05:00
gmcferrin
f7e56d9833 (Hopefully) Fix NPE, delay PurgeTask start for a few seconds just to be
safe.
2013-01-10 20:49:33 -05:00
gmcferrin
b554fb342a Helpful logging! 2013-01-10 20:33:48 -05:00
gmcferrin
6d9ef91315 Make purge task run options configurable. Also adds ability to disable
the task entirely.
2013-01-10 19:58:25 -05:00
gmcferrin
ce42da5806 Added task to prune old and powerless users from the SQL database.
*** WARNING: THIS WILL RUN AUTOMATICALLY ON YOUR DB. IF YOU ARE WORRIED
ABOUT DATA LOSS, BACK UP YOUR SQL DATA BEFORE INSTALLING THIS BUILD ***
2013-01-10 19:36:11 -05:00
TfT_02
6cdb27aef0 Moving Fishing and Arcance Forging settings to advanced.yml 2013-01-11 00:21:18 +01:00
Glitchfinder
2205ad0772 Merge pull request #474 from Glitchfinder/master
Added a cleanup task to remove inavlid spawned mobs.
2013-01-10 14:30:50 -08:00
Glitchfinder
637e826c1b Adding a cleanup task to remove invalid entities from the spawned mob storage. 2013-01-10 14:12:41 -08:00
TfT_02
b19395b40d Also display possible lucky perk for MagicHunter 2013-01-10 22:56:15 +01:00
TfT_02
085a25306c Make the MagicHunter Chance configurable 2013-01-10 22:54:57 +01:00
TfT_02
88c39dbb72 Now displays the new magic find chance 2013-01-10 22:11:49 +01:00
Glitchfinder
91670d3945 Merge pull request #473 from Glitchfinder/master
Alleviating hangtime on world save
2013-01-10 12:36:10 -08:00
TfT_02
bdfd7d9839 Display Endurance Perk stats in skill commands 2013-01-10 21:33:50 +01:00
TfT_02
e01b6f175c Use lucky variable; Don't use the actual permission node when not needed. 2013-01-10 21:33:50 +01:00
TfT_02
3f899380d9 Fixing two typos @Jobsti 2013-01-10 21:33:50 +01:00
Glitchfinder
2513b4ca23 Alleviating hangtime on world save. 2013-01-10 12:33:30 -08:00
gmcferrin
93180ccd06 Because 50% was too high. 2013-01-10 15:28:02 -05:00
gmcferrin
f43b4ebdc5 Clarify the way fishing enchantments work - need to fix command display
still.
2013-01-10 15:22:47 -05:00
Glitchfinder
8267a10f41 Adding an explanation in the comments. 2013-01-10 11:23:58 -08:00
Glitchfinder
771ef6e16e Disabling the place store saveWorld call for when a world is saved due to excessive lag. 2013-01-10 11:13:18 -08:00
gmcferrin
f7ef2b768f Added permission nodes for using Green Thumb with cocoa. 2013-01-10 13:07:14 -05:00
gmcferrin
74c3ce0552 Support for auto-replanting cocoa. 2013-01-10 12:55:54 -05:00
Glitchfinder
f8c5c380b1 Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO 2013-01-10 09:27:05 -08:00
Glitchfinder
2708449089 Making errors during the chunk conversion process silent. 2013-01-10 09:26:54 -08:00
gmcferrin
bcfec56300 Because it's not just Citizens that uses NPCs. 2013-01-10 12:18:48 -05:00
gmcferrin
ec6b9d4387 Attempted fix for CombatTag dupe glitch - don't apply AoE damage to
NPCs.
2013-01-10 12:18:08 -05:00
gmcferrin
621f739831 Axes restructuring, part 1 2013-01-10 09:26:28 -05:00
gmcferrin
607d2b8bd7 Abstraction is good. 2013-01-10 09:26:01 -05:00
gmcferrin
c1463c3257 Because we don't need that many Random objects. 2013-01-09 23:46:35 -05:00
gmcferrin
e036b7ac70 We don't need that param. 2013-01-09 23:15:29 -05:00
gmcferrin
4a4db675f1 More OCD. 2013-01-09 23:07:32 -05:00
gmcferrin
e193da2cd7 My OCD made me do it. 2013-01-09 23:03:17 -05:00
gmcferrin
c60cbe824c Function even MORE things. 2013-01-09 22:53:26 -05:00
gmcferrin
8b9432d1d9 So many useless else statements... 2013-01-09 22:43:21 -05:00
gmcferrin
75a5ffcb10 Cleanup our iterators. 2013-01-09 22:18:41 -05:00
gmcferrin
6cc2fc7a6e Functions are still better than copy-pasted code. 2013-01-09 22:09:07 -05:00
gmcferrin
4bb6f68e6f No sense in repeating static variables. 2013-01-09 21:49:17 -05:00
gmcferrin
00e1521d46 Functions >> copy-paste code. 2013-01-09 21:47:03 -05:00
gmcferrin
1055186e86 Finished Mining restructuring. 2013-01-09 21:44:53 -05:00
gmcferrin
1839f6ce8c Restructuring Blast Mining. 2013-01-09 19:45:34 -05:00
TfT_02
39e9e426ef Fixing #465 /swords always displaying 5 seconds as SerratedStrikes length 2013-01-09 21:35:33 +01:00
TfT_02
7c2d590951 Finishing adding comments 2013-01-09 17:21:56 +01:00
TfT_02
551b73ea74 Another confusingly named config node 2013-01-09 17:18:20 +01:00
TfT_02
fca095689e Fixed wrongly named config node 2013-01-09 16:54:01 +01:00
TfT_02
e76078fc89 Updated German translation by @Jobsti #462 2013-01-09 15:54:20 +01:00
gmcferrin
2b6b7b899e Attempting to fix some possible memory leaks. Son't know if I'm actually
helping anything though.
2013-01-09 00:01:33 -05:00
gmcferrin
4e6086e8ed Fixed typo in PartyCommand that resulted in locale string not being
output.
2013-01-08 21:56:21 -05:00
gmcferrin
97a59cd21e Fix locale stuff again. 2013-01-08 21:53:18 -05:00
Glitchfinder
3c919c3af7 Fixing new merge conflicts. 2013-01-08 17:45:53 -08:00
gmcferrin
fbe3c70b85 Locale file update! 2013-01-08 20:33:04 -05:00
Glitchfinder
46bf22e36b Merging TfT_02's branch in. 2013-01-08 17:28:09 -08:00
gmcferrin
003c89c3a4 Missed one. 2013-01-08 18:54:22 -05:00
gmcferrin
793bd04afe Fixing merge issues, again. 2013-01-08 18:52:50 -05:00
gmcferrin
0249ae2724 Handle potions better. 2013-01-08 18:46:26 -05:00
Glitchfinder
e5592c5da8 Resolving minor merge conflict. 2013-01-08 15:27:59 -08:00
Glitchfinder
b0500332bc Finishing up backwards compatibility for dye colors. 2013-01-08 15:14:12 -08:00
gmcferrin
78b8ac663e A little more cleanup. 2013-01-08 18:09:13 -05:00
Glitchfinder
e41ab3ac18 Merge pull request #457 from Glitchfinder/master
Minor updates.
2013-01-08 14:50:39 -08:00
gmcferrin
36d97bbcaf Store the scheduler. 2013-01-08 17:45:52 -05:00
gmcferrin
f3c89fe48b Archery cleanup. 2013-01-08 17:44:05 -05:00
Glitchfinder
9b31520684 Basic error check for backwards compatibility with dye colors. 2013-01-08 14:39:08 -08:00
gmcferrin
08b46e1a7c Cover ALL the bases. 2013-01-08 17:26:11 -05:00
gmcferrin
b78299bbbd Metadata does nothing, apparently. 2013-01-08 17:24:09 -05:00
Glitchfinder
a5219055ef Merge pull request #454 from Glitchfinder/master
Fixing a minor omission in the Permissions setup.
2013-01-08 14:07:22 -08:00
Glitchfinder
f79a9e5182 Fixing minor omission in permissions setup. 2013-01-08 14:05:41 -08:00
TfT_02
3904b172ad Better formatting for the comments 2013-01-08 22:19:03 +01:00
gmcferrin
e0da506d1a Protected, not public. 2013-01-08 16:10:19 -05:00
gmcferrin
d2f6191615 Starting on cleaning up null checks & type casting 2013-01-08 16:07:29 -05:00
gmcferrin
7c211fa50c Fix for Super Breaker & Giga Drill Breaker double/triple drops. 2013-01-08 14:56:31 -05:00
gmcferrin
fadec1a846 Remove unused import. 2013-01-08 14:27:09 -05:00
gmcferrin
d2aa19e31f Whoops, forgot to change a reference. 2013-01-08 14:23:21 -05:00
gmcferrin
ccfe1181be More mining restructuring. 2013-01-08 12:52:16 -05:00
gmcferrin
85fb12a4ec Use new Bukkit DyeColor data. 2013-01-08 11:31:07 -05:00
gmcferrin
84994c2b2f Remove a few unused imports & variables. 2013-01-08 10:50:37 -05:00
gmcferrin
1a2dfb9b19 Fixed parameterization issue. 2013-01-08 10:48:30 -05:00
gmcferrin
753652dcf9 More mining updates. 2013-01-08 10:46:19 -05:00
gmcferrin
b99d261084 Remove our workaround for NBT tag issues since Bukkit fixed it. 2013-01-08 10:45:49 -05:00
gmcferrin
aee4bcd65e More mining restructuring. 2013-01-08 09:42:37 -05:00
gmcferrin
159ec3f04d Pass location & type as params, rather than calling inside the function. 2013-01-08 09:35:41 -05:00