Commit Graph

452 Commits

Author SHA1 Message Date
GJ
7c59621c9e More cleaning on listeners. Also fixes NPE with itemInHand, because
Bukkit is dumb.
2013-01-24 15:46:29 -05:00
GJ
76a987e1e0 PlayerListener cleanup 2013-01-24 14:19:26 -05:00
GJ
ab677e941d Start cleaning up the mess we've made of our listeners. 2013-01-24 11:50:12 -05:00
GJ
b7bb3f4487 Don't include child skills in these loops. Fixes #577 2013-01-24 09:08:30 -05:00
GJ
121354e489 We don't need two guides guides. Fixes #572 2013-01-24 00:05:10 -05:00
T00thpick1
135bfc2627 Don't cycle when on child skill 2013-01-23 23:49:01 -05:00
GJ
a01882aea5 Because we need to care about the result, not the source.
Also adds a couple of null checks, just to be safe.
2013-01-23 23:09:54 -05:00
GJ
6f0e2437e0 Smelting! 2013-01-23 16:34:01 -05:00
GJ
6b0e7a9c61 Major refactoring. This WILL break any mcMMO-related plugin that
does not properly hook into the API classes. 

This consolidates the skill-related classes into their own individual
packages, and moves several misc skill classes into the main Skill
package as well. This also moves all Party & Spout related files into
their own respective packages as well.
2013-01-22 12:43:25 -05:00
GJ
e048a6d0d0 Cleanup Swords & Taming commands 2013-01-22 10:48:10 -05:00
GJ
cedfb1a538 Fixed bug with checking if an entity is wearing armor. 2013-01-22 00:59:20 -05:00
bm01
f0f7dee3c2 Optimized Tree Feller
And cleaned up WoodCutting a little
2013-01-22 02:39:13 +01:00
GJ
ddbf5a559a Copy-pasta code is bad. 2013-01-21 20:01:33 -05:00
GJ
ea4048dce9 Regardless of case, we need both a position & stat value for this.
Fixes #541
2013-01-21 19:07:17 -05:00
GJ
0711454e31 General cleanup to satisfy my OCD a little while longer. 2013-01-21 17:22:54 -05:00
GJ
900623461a Useless else statements. 2013-01-21 17:15:53 -05:00
GJ
9512879cc7 Remove unused imports. 2013-01-21 12:36:00 -05:00
bm01
c8013421e6 Few chunk load optimizations 2013-01-21 03:07:18 +01:00
Glitchfinder
77ffc9c3c2 Removing unnecessary ArrayLists 2013-01-20 15:59:57 -08:00
Glitchfinder
9a6ebb0b9a Slightly reducing the processing required to unload chunks. 2013-01-20 15:52:00 -08:00
Glitchfinder
57d1cd5f63 Further alleviating the time it takes to load chunks. 2013-01-20 15:46:53 -08:00
GJ
b7354779d4 Minor changes to try & reduce method calls. 2013-01-20 16:07:27 -05:00
Glitchfinder
643af1c32b Fixing a memory leak involving mob tracking. 2013-01-19 14:02:23 -08:00
GJ
b9bf3f96d2 Added new Hylian Luck skill to Herbalism. 2013-01-19 12:33:57 -05:00
GJ
11ea6b269e Fix issues with properties files & formatting. 2013-01-18 19:34:19 -05:00
Glitchfinder
372950071a Merge pull request #532 from Glitchfinder/master
Removing detritus left over from recent commits.
2013-01-18 15:47:38 -08:00
Glitchfinder
b424ecfd3e Removing ChunkletUnloader and dependents, since they are no longer necessary. 2013-01-18 15:39:02 -08:00
Glitchfinder
fc38bbd179 Merge pull request #530 from Glitchfinder/master
Updating entity tracking and such.
2013-01-18 14:57:52 -08:00
Glitchfinder
00f24fd5bd Reducing CPU usage on chunk load. 2013-01-18 14:55:29 -08:00
Glitchfinder
ca2673f258 Condensing entity tracking into a single set of storage, to reduce CPU use. Also handily causes invalid falling blocks to be removed. (Fell out of the world, etc) 2013-01-18 14:43:14 -08:00
T00thpick1
7d416a90de Redundant as they are caught in finally 2013-01-18 16:18:44 -05:00
Glitchfinder
d09526e470 Changing chunk unloading to patch logic hole for entity tracking. 2013-01-18 12:39:57 -08:00
GJ
ed68f227ac Not closing the objectStream here is BAD. 2013-01-18 15:28:42 -05:00
T00thpick1
2f16dbc9b5 Explicitely state desired order 2013-01-17 21:35:35 -05:00
T00thpick1
c0b3a4e929 Index tables 2013-01-17 18:11:28 -05:00
GJ
0262255bea Fixed bug where Skull Splitter would be applied twice. 2013-01-17 12:04:56 -05:00
nossr50
9717be3da8 Minor cleanup 2013-01-16 12:09:03 -08:00
nossr50
67a4efa03e FFS Leaderboards will only update every 10 minutes 2013-01-16 12:02:41 -08:00
nossr50
fd4f0f4096 mcrank FFS output is now consistent with SQL 2013-01-16 11:58:14 -08:00
GJ
957605d46b More localization updates. 2013-01-16 14:28:59 -05:00
GJ
55f824e0c8 More work on localization update 2013-01-16 14:03:32 -05:00
GJ
faa22002e3 Start of major localization update. 2013-01-16 14:03:31 -05:00
T00thpick1
c0dfcfd9f6 More changes 2013-01-16 13:28:14 -05:00
T00thpick1
c073c7ed3a Make mcRank Async in SQL 2013-01-16 02:50:18 -05:00
GJ
7fa1a8c6c7 Make /mctop [skillname] work for localized skillnames 2013-01-16 00:06:14 -05:00
GJ
037fd890dc Use localized skill name in skill guide string.
Still need to localize the REST of the strings relating to the skill
guides, though.
2013-01-15 23:40:34 -05:00
t00thpick1
9d70a2a9a6 We have to stop meeting like this, database.java 2013-01-15 22:42:56 -05:00
t00thpick1
9b94fba3a6 The final frontier 2013-01-15 22:27:47 -05:00
t00thpick1
d440876bbb Close statements correctly, add update function 2013-01-15 22:08:59 -05:00
t00thpick1
32c62fd7eb Actually fix discrepencies between mcrank + mctop 2013-01-15 22:00:28 -05:00
t00thpick1
9c9a097ff3 Fix discrepencies between mctop and mcrank 2013-01-15 21:20:33 -05:00
t00thpick1
24367b350d One more change 2013-01-15 19:40:17 -05:00
t00thpick1
ea13ce09c9 Apostrophe's are important 2013-01-15 19:24:10 -05:00
t00thpick1
137c46b8ce Part two of sql mcRank 2013-01-15 19:03:13 -05: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
5bdf4b5dcc Finish Axe restructuring, modify a little bit of Swords stuff as well. 2013-01-15 16:38:44 -05:00
GJ
f40433fc99 Axe restructuring. 2013-01-15 16:16:46 -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
Glitchfinder
67e1defdb8 Further reducing lag when saving or unloading a world. 2013-01-14 14:18:01 -08: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
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
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
TfT_02
664239c567 Fixing a java.io.FileNotFoundException when using SQL 2013-01-14 00:20:48 +01: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
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
0c61cc8bdc More things can be enchanted now. 2013-01-11 17:35:28 -05:00
gmcferrin
d0e2358fab This is a much better way to delete things. 2013-01-11 15:26:56 -05:00
gmcferrin
a8abfdae5e Start Axe restructuring. 2013-01-10 22:39:08 -05:00
gmcferrin
d25a314d3a Fix bug with UserPurgeTask... 2013-01-10 21:41:35 -05:00
Glitchfinder
637e826c1b Adding a cleanup task to remove invalid entities from the spawned mob storage. 2013-01-10 14:12:41 -08:00
Glitchfinder
2513b4ca23 Alleviating hangtime on world save. 2013-01-10 12:33:30 -08: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
c1463c3257 Because we don't need that many Random objects. 2013-01-09 23:46:35 -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
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
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
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
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
gmcferrin
d2f6191615 Starting on cleaning up null checks & type casting 2013-01-08 16:07:29 -05:00
gmcferrin
ccfe1181be More mining restructuring. 2013-01-08 12:52:16 -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
Glitchfinder
2933f80d69 Fixing yet another concurrency error. 2013-01-08 01:32:42 -08:00
gmcferrin
d69cf09d4e Removed some unnecessary casting. 2013-01-07 17:08:53 -05:00
Glitchfinder
6565d84cf9 Shutting down more concurrency errors. 2013-01-07 01:20:36 -08:00
Glitchfinder
83888f80d4 Fixing merge conflicts 2013-01-06 17:59:31 -08:00
Glitchfinder
974862a60a Updating permissions for consistency. 2013-01-06 17:52:31 -08:00
Glitchfinder
d0c051a9c2 Merge pull request #419 from Glitchfinder/master
Patching two bugs.
2013-01-02 18:06:34 -08:00
Glitchfinder
d444e088c4 Patching a bug where mcMMO drops too few items, and yet another concurrent modification exception. 2013-01-02 18:03:52 -08:00
Glitchfinder
4161952566 Merge pull request #410 from Glitchfinder/master
Fixing a concurrent modification error.
2013-01-01 19:26:39 -08:00
Glitchfinder
5b18abbea0 Fixing a concurrent modification error. 2013-01-01 19:25:35 -08:00
gmcferrin
1ff1704697 Fixed some parameterization issues. 2013-01-01 16:13:33 -05:00
gmcferrin
aeaad41c45 Fix static access issues. 2013-01-01 16:04:53 -05:00
gmcferrin
146fa474a1 Removed unused import 2013-01-01 16:02:39 -05:00
gmcferrin
11468abc98 Fixed update for Mining refactoring 2013-01-01 16:01:51 -05:00
Glitchfinder
707a388c51 Fixed an issue where dropped items did not retain custom NBT data. 2012-12-31 19:57:21 -08:00
Glitchfinder
d33334708d Fixing recursion errors by switching from an unnecessary btree to a simple ArrayList. 2012-12-31 19:40:33 -08:00
Glitchfinder
e607e04af4 Merge pull request #396 from Glitchfinder/master
Fixes and Patches
2012-12-31 10:03:19 -08:00
Glitchfinder
905e92fa4d Adding the ability to track spawned mobs when chunks unload. 2012-12-30 19:51:26 -08:00
TfT_02
eed8a57ff9 Merge pull request #392 from TfT-02/master
Various fixed for issues in the issue tracker
2012-12-30 15:03:12 -08:00
Glitchfinder
28b092a4e3 Adding Bats, Giants, Withers, and Wither Skeletons to the combat experience list. 2012-12-30 12:33:38 -08:00
TfT_02
43de871392 Fixed enchantments being ignored + removed uneccesary code
Fixed Unbreaking enchantments being ignored when using Treefelling and
when hit by Armor Impact
2012-12-29 22:38:57 +01:00
Glitchfinder
17169903b4 Merge pull request #391 from Glitchfinder/master
Fixing Data Value issues caused by the patch to deprecated ItemStack use.
2012-12-29 13:02:07 -08:00
Glitchfinder
aa70c82824 Fixing issues caused by the patch to deprecated ItemStack changes. 2012-12-29 12:59:18 -08:00
Glitchfinder
d35e56fd37 Merge pull request #383 from Glitchfinder/master
Fixing a few more NPEs.
2012-12-28 21:11:58 -08:00
Glitchfinder
cafed2d98c Fixing remaining NPEs with custom blocks using vanilla IDs. 2012-12-28 21:11:22 -08:00
TfT_02
6f1ee88b78 Fixes issues #259 and #335 2012-12-28 11:40:15 +01:00
TfT_02
de3bae41ae Implementing an durability cap for ArmorImpact 2012-12-27 17:36:12 +01:00
Glitchfinder
11b5c54c69 Reimplementing skill level and power level caps. 2012-12-26 19:54:20 -08:00
TfT_02
71471d3bbc Added Wooden button to list of blocks that should not trigger abilities 2012-12-25 15:35:12 +01:00
gmcferrin
07e98ab79f Fixed Async deprecation issues 2012-12-25 01:06:21 -05:00
gmcferrin
9af66a8e69 Fixed ItemStack deprecation issues. 2012-12-25 01:01:10 -05:00
Grant
36d5344ded Cleanup formatting. 2012-12-24 16:56:25 -05:00
Grant
9136530618 Removed unused imports 2012-12-24 16:17:33 -05:00
Glitchfinder
52f7120392 Resolving merge conflict. 2012-11-21 13:47:17 -08:00
TfT_02
0d2abb95b5 Adding AdvancedConfig 2012-11-21 21:49:54 +01:00
Grant
6b2adc9359 Merge pull request #318 from mastershake71/master
Fixes Nuker Dupe
2012-11-21 12:37:51 -08:00
mastershake71
e8152a3475 Solves nuker dupe glitch. Not all anti-cheat block damage, so check
and make sure both are allowed not just one.
2012-11-18 23:31:19 -05:00
Glitchfinder
6d42d14575 Fixed a bug where Herablism magically converted potatoes to carrots. 2012-11-15 16:34:57 -08:00
Glitchfinder
506efec858 Merge pull request #3 from TfT-02/master
Salvage ability for Repair
2012-11-13 13:37:04 -08:00
TfT_02
8e3320ad72 Hehe, you were soo right. This is MUCH cleaner to look at. :) 2012-11-13 22:28:56 +01:00
TfT_02
ff279bf633 Moved Salvage check to ItemChecks 2012-11-13 22:17:34 +01:00
TfT_02
a582b07549 Small error fix - As mentioned by Glitchfinder 2012-11-13 22:14:26 +01:00
TfT_02
f8b44cd8ce New Salvage ability for Repair!
Added a fully working ability to Repair. With this ability you can
salvage items and get bars in return.

- Added new permission node for Salvage ability
- Added new config options for Salvage
- Added new locale strings for Salvage
- Added a check to make sure that Repair Anvil != Salvage Anvil
2012-11-13 16:50:00 +01:00
Glitchfinder
01f38537de Fixing cooldown timers so that they display the proper cooldown for players with perks. 2012-11-12 21:57:57 -08:00
Glitchfinder
4a52135a0b Nerfing overpowered Herbalism double drops for melons and netherwart. 2012-11-12 19:10:14 -08:00
Glitchfinder
3a467b3da4 Adding Fishermans Diet ability to fishing. 2012-11-12 16:18:27 -08:00
Glitchfinder
e6e8c12735 Merge branch 'master' into fixes 2012-11-12 13:47:31 -08:00
Grant
9c4ff30ce7 Merge pull request #304 from Glitchfinder/master
Attempting a minor reduction in lag for larger servers.
2012-11-11 11:45:11 -08:00
Glitchfinder
7859660ece Adding herbalism green thumb ability to carrots, potatoes, and netherwart. 2012-11-09 16:37:12 -08:00
Glitchfinder
2c613d5b99 Fixing a null pointer error related to skill cooldowns. 2012-11-07 19:04:17 -08:00
Glitchfinder
f023529d37 Reducing filesystem usage. Should help reduce lag on larger servers. THIS IS NOT A PERMANENT SOLUTION. 2012-11-06 23:15:15 -08:00