EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 21:56:47 +01:00
Code Issues Projects Releases Wiki Activity
3,530 Commits 48 Branches 45 Tags 34 MiB
f6e9fd9f3a
Commit Graph

974 Commits

Author SHA1 Message Date
GJ
3aec0e5ef4 Using UUID is safer. 2013-02-26 10:07:00 -05:00
GJ
56bd782625 Getting it through Bukkit is bad. 2013-02-26 10:02:25 -05:00
GJ
d8904827ec This should have the same effect. 2013-02-26 10:01:37 -05:00
GJ
07a0f43825 Don't need that anymore. 2013-02-26 09:42:22 -05:00
GJ
ec8581a835 Pass less events. 2013-02-26 09:41:47 -05:00
GJ
f5290c3256 Name 'em all the same. 2013-02-26 08:22:08 -05:00
GJ
070189a7fd Don't need those anymore. 2013-02-26 08:19:55 -05:00
GJ
d409610a55 Move Roll checks into the manager. 2013-02-26 08:19:21 -05:00
GJ
d46b134dbb Don't pass our events around so much. 2013-02-25 18:00:15 -05:00
NuclearW
5026bdcbd4 Add new child.yml config for picking parents of child skills 2013-02-25 16:58:37 -05:00
GJ
3607d0b9a1 Eclipse - still being stupid. 2013-02-25 16:58:06 -05:00
GJ
21b8626366 Put our managers on payroll, rather than firing them at the end of 
their shift.
 2013-02-25 16:54:46 -05:00
NuclearW
4c10fdf34a Use Debug Filter here 2013-02-25 16:00:09 -05:00
GJ
2373ca82ba Added "Shroom Thumb" ability to Herbalism. Closes #724 2013-02-25 09:58:25 -05:00
GJ
19068dee03 Fix Tree Feller not working but still awarding XP. 2013-02-25 08:01:06 -05:00
GJ
da1e03cbfc Eclipse is dumb and wasn't including these two files for some reason. 2013-02-25 07:30:06 -05:00
GJ
ec8221610a Add a few more checks for sanity on the new ability buffs. 2013-02-24 23:57:30 -05:00
GJ
afe28d54c6 Fix Herbalism not replanting crops properly. 2013-02-24 23:49:55 -05:00
GJ
1eb225cae1 Stages are capped at 4. 2013-02-24 16:35:33 -05:00
GJ
e716e38386 Dividing by 4 was wrong. 2013-02-24 16:31:01 -05:00
GJ
5cd542002e Only remove seed on greenThumb - Green Terra's already had the seed 
removed the first time.
 2013-02-24 14:04:54 -05:00
GJ
38155e3af4 Use the same MetadataValue for both of these 2013-02-23 18:13:12 -05:00
GJ
301914d94b Fix ClassCastException with trying to use Woodcutting on Mushrooms. 2013-02-23 15:03:39 -05:00
GJ
62aaad8707 Added "Holy Hound" ability to Taming 2013-02-22 18:47:34 -05:00
GJ
2fee9df625 Move more event handling back into the main listener to avoid passing 
the event itself.
 2013-02-22 17:55:31 -05:00
GJ
9282b7bd15 Remove config caching from SkillTools.java 2013-02-22 13:53:16 -05:00
GJ
0d473d232e Remove config caching from CombatTools.java 2013-02-22 13:47:54 -05:00
GJ
f9ad8ffe93 This check was unneeded, we already verify that the player is, in fact, 
a player before this check is ever called.
 2013-02-22 13:40:36 -05:00
GJ
e85a0f6cfc Change Acrobatics roll handling to take event.getDamage() instead of the 
event. Also adds a few new config options in advanced.yml for further
customizing roll behavior.
 2013-02-22 13:39:47 -05:00
GJ
63974f3968 Passing the event is bad - pass just event.getDamage() instead. 2013-02-22 12:10:15 -05:00
NuclearW
d052d7a3ce Change from using Block to BlockState in many locations 
Convert Herbalism ability to use BlockState instead of Block.
Move all block checks back to BlockChecks.
Don't need this if we're using BlockState
Convert Excavation to BlockState. We don't need to return booleans here
because we never edit the block state.Switch ModCheck.getCustomBlock to use BlockState
More work on the conversion to BlockState
More conversion to BlockState
Better way to handle mining drops, I believe.
Remove useless imports.
A test of making the diff look nicer
BlockChecks diff cleanup
Herbalism diff cleanup
Gotta update the block states here.
Moar blockstate.
Little more blockState stuff.
Even more blockstate.
 2013-02-22 11:23:46 -05:00
GJ
0a68b82078 Fixes wolves gaining combat bonuses based on their owner's held item. 
Closes #713
 2013-02-22 09:53:18 -05:00
GJ
e50eb1963f Minor typo. 2013-02-20 22:01:18 -05:00
Glitchfinder
fdd6c0a0d8 Fixing an NPE related to Spout players. 2013-02-20 21:55:52 -05:00
GJ
c589c5556b MASSIVE config overhaul - most keys are now based on the "proper" name 
given to a material or entity by Bukkit.

This WILL wipe some custom values you may have set, so please verify
that your values are what you want them to be after the new config file
is generated.
 2013-02-20 16:44:15 -05:00
GJ
17a85c94c6 Override toString() for upcoming config changes. Also, this ability is 
"Skull Splitter," not "Skull Spliiter"
 2013-02-20 13:29:41 -05:00
GJ
400c93fb7d Clean up our particle effects a bit. 2013-02-20 10:40:47 -05:00
GJ
1bcf43db63 Better way to handle daze effect. 2013-02-20 08:49:21 -05:00
GJ
79bcd76aa0 Change ability particles due to confusion over glass-breaking sound. 2013-02-20 08:42:25 -05:00
GJ
8833ceb3b5 Added particle effect to Critical Hit. 2013-02-19 19:08:21 -05:00
GJ
ccc265edf9 Add explosion effect for Greater Impact. 2013-02-19 19:08:21 -05:00
GJ
e956988c60 Add particle effect on Dodge. 2013-02-19 19:08:20 -05:00
GJ
fd47d77800 Add chat toggles for the events we have particle effects for. 2013-02-19 13:25:59 -05:00
GJ
f189907ff8 Added visual effects for ability enabling. Also readded chat messages 
for people who have particle effects disabled.
 2013-02-19 13:02:08 -05:00
GJ
6e32843fb4 Add potion effect for Daze. 2013-02-19 11:01:50 -05:00
GJ
a43a5a0861 Don't need to save the manager anymore. 2013-02-19 10:09:29 -05:00
GJ
4ff1e79cc0 Particle effect means you can now easily see when an enemy is bleeding. 2013-02-19 09:21:44 -05:00
GJ
d28794a587 Slightly cleaner way to handle a few of our repair functions. 2013-02-19 08:34:08 -05:00
GJ
a67dd1d9d7 One of these has to be a double if we want this modifier to work. 2013-02-19 08:03:02 -05:00
GJ
9c0f763949 We already check the block data before calling this function. 2013-02-19 01:06:06 -05:00
GJ
701822c69f MASSIVE Permissions overhaul. Added a handful of new permissions, 
renamed a few more. Changed Green Terra to handle blocks based on
perms rather than the config file.

For more details, read the diff.
 2013-02-19 01:02:29 -05:00
bm01
2eab93292e Removed some shouldBeAffected calls 
I'm pretty sure they aren't needed there
 2013-02-19 02:20:12 +01:00
bm01
29fb8b83c2 Fixed combat exp gain when hitting a friendly wolf 2013-02-19 02:06:31 +01:00
bm01
ad68f50b14 Removed isNPCPlayer, isNPCEntity is identical 2013-02-19 01:47:05 +01:00
Glitchfinder
519485f155 Converting entity tracking to use Bukkit metadata. Should greatly reduce lag on chunk loading and unloading. 2013-02-18 16:19:31 -08:00
GJ
d9aad67ca5 Fix splash potions not properly affecting the player that threw them. 2013-02-18 15:09:25 -05:00
GJ
083a89c1a3 Handle all our donor perks in one class. 2013-02-18 11:41:44 -05:00
GJ
671be42472 SkillTools, not Misc 2013-02-18 10:32:29 -05:00
GJ
1da1bb7218 These fit better in SkillTools. Plus, we had already duplicated one of 
them.
 2013-02-18 10:26:19 -05:00
GJ
d0d9527d39 These functions fit better in CombatTools. 2013-02-18 10:22:16 -05:00
GJ
c39827ed59 Don't need the same function in two places. 2013-02-18 10:11:43 -05:00
GJ
5d6a35d4ef Remove unused import. 2013-02-18 10:08:38 -05:00
GJ
05a9c8b7e5 Make McMMOPlayerLevelUpEvent fully cancellable. 2013-02-18 08:35:52 -05:00
NuclearW
57e6e5400b nope.avi 
Revert "Protect placeStore. It's ugly and still needs work."

This reverts commit 1fe182babe.
 2013-02-17 10:05:35 -05:00
GJ
8a795e6091 Don't need chance anymore. 2013-02-17 01:26:47 -05:00
GJ
946513cb66 Remove unused import. 2013-02-17 00:40:54 -05:00
GJ
1fe182babe Protect placeStore. It's ugly and still needs work. 2013-02-17 00:40:17 -05:00
bm01
cedd8da9ba Fixed Tree Feller dropping mushroom "blocks" instead of "items" 2013-02-16 23:09:19 +01:00
bm01
3cb269de4b TreeFeller.dropBlocks cleanup 2013-02-16 21:31:06 +01:00
bm01
91010f2958 Let's be consistent D: 2013-02-16 21:25:31 +01:00
bm01
f3e823997b getExperienceFromLog cleanup 2013-02-16 21:22:41 +01:00
GJ
f6b38ab32a Added hidden.yml option for using potion-based buffs instead of 
enchantment-based buffs.
 2013-02-16 14:36:46 -05:00
GJ
6f96a5026b Take a player, not an item. Also avoids potential for NPE. 2013-02-16 11:34:39 -05:00
GJ
4071f259ad Handle all the buff removal in BlockDamage. Also removes the config 
option for using Mining & Excavation without tools.
 2013-02-16 11:28:19 -05:00
GJ
593975a255 We don't have to pass the event anymore. 2013-02-16 00:00:24 -05:00
bm01
9c2ab19404 Slight greenThumbWheat cleanup 2013-02-16 03:42:56 +01:00
bm01
ef1a777180 Removed no longer needed check 2013-02-16 03:38:41 +01:00
bm01
77014b03ef No point in canceling the event 
And it actually fixes the double call (see previous commit)
 2013-02-16 03:36:27 +01:00
bm01
9143051d9f Run GreenThumbTimer on the current tick 
It avoids onBlockBreak to be called twice (which basically launched
the task twice). I don't know what were the consequences but that
wasn't right anyway.
Also it would be better if we wouldn't have to cancel the event,
because there is a possibility that plugins like LogBlock don't have a
chance to process it.
 2013-02-16 02:56:46 +01:00
bm01
f496ecf7b1 Fixed Green Thumb not checking rank 4 on wheat 2013-02-16 02:49:31 +01:00
GJ
fc3afc4340 Using PlantSize is cleaner. 2013-02-15 19:29:47 -05:00
GJ
fd138eb0b5 This was redundant was redundant 2013-02-15 19:20:42 -05:00
GJ
6d5835849f Fix issue with GreenThumb command display. 2013-02-15 19:18:43 -05:00
nossr50
800ebf5b64 Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO 2013-02-15 15:33:54 -08:00
nossr50
9df149c489 Huge Mushrooms now work for Tree Feller (UNTESTED) 2013-02-15 15:32:49 -08:00
shatteredbeam
efcf80899e Permissions class removal from Skillcommand 2013-02-15 14:38:51 -08:00
GJ
bf4d70e8be That was an incredibly stupid way to get those permissions. 2013-02-15 14:29:32 -05:00
GJ
284002bf8b No reason to String.valueOf() these. 2013-02-15 13:56:30 -05:00
GJ
fca0847929 Squids are not made of chocolate. 2013-02-15 12:19:02 -05:00
GJ
1d19dab71d Full change to DyeColor.COLOR.getDyeData() - *REQUIRES* CB 1.4.7 2013-02-15 12:16:31 -05:00
GJ
1ef1d53fd9 Make our commands respect localized skill names. 2013-02-15 09:26:01 -05:00
GJ
6c4ea34811 It's (not) over 5000% - fixes #683 2013-02-15 07:32:22 -05:00
GJ
caa1b0d14c Duplicate code is bad, m'kay? 2013-02-14 19:02:50 -05:00
GJ
6cc2497182 THis wasn't removing when it should have. 2013-02-14 16:29:49 -05:00
GJ
615288e635 Things in inventory can be null. 2013-02-14 16:02:42 -05:00
GJ
01e26f321d Fix issues with enchant-based Superbreaker implementation. 2013-02-14 14:35:53 -05:00
GJ
e8319aee81 Changed Super Breaker & Giga Drill Breaker to be an enchantment-based 
boost, rather than an instabreak.
 2013-02-14 13:12:15 -05:00
GJ
88b05cd5aa Fix Super Breaker not working right with custom blocks. 2013-02-14 09:39:22 -05:00
NuclearW
9bd33ab3df Introducing Block Cracker 2013-02-14 00:34:50 -05:00
GJ
55b88f0274 These belong better in SkillTools than Misc 2013-02-13 16:45:49 -05:00
GJ
f4da69a205 Fix some missing default cases and possible fall-through issues. 2013-02-13 16:34:36 -05:00
GJ
0879e1f326 Fixed bug where fired arrows could raise skill levels other than Archery 2013-02-13 12:25:57 -05:00
GJ
8312570825 Fixed bug where splash potions could raise a player's unarmed level. 
Fixes #678
 2013-02-13 12:10:10 -05:00
GJ
2ad73e9b2c Optimized our String/number conversions a bit. Also moved all 
String-related util functions from Misc.java to StringUtils.java
 2013-02-13 11:45:48 -05:00
bm01
776821a988 Readded Impact damage durability cap (and fixed it) 2013-02-13 14:49:35 +01:00
GJ
aa0acf767b Log ALL the things! 2013-02-12 22:18:47 -05:00
GJ
8f4d5442b1 Better than looping. 2013-02-12 16:47:11 -05:00
GJ
9db2d50676 These should be under party, not skills. 2013-02-12 14:36:38 -05:00
bm01
048a979375 Minor ImpactEventHandler cleanup 2013-02-12 19:36:10 +01:00
bm01
761fb3b811 Bad copy paste 2013-02-12 19:19:13 +01:00
bm01
9f22382506 Restored original behavior of Salvage.isSalvageable 
It doesn't check for custom armors, I don't know if it's a bug or not
Added isMinecraftTool and isMinecraftArmor for clarity
 2013-02-12 19:15:52 +01:00
bm01
f486492c37 For consistency with Bukkit, ItemChecks.isPants -> ItemChecks.isLeggings 2013-02-12 19:15:51 +01:00
bm01
2fac0170e7 Fixed Impact reducing durability of non-armor equipped blocks 2013-02-12 19:15:51 +01:00
bm01
45ebc2b89b 3% != 100% 2013-02-11 23:39:41 +01:00
GJ
76523d2988 3% != 100% - Fixes #671 2013-02-11 17:35:01 -05:00
bm01
b628b9eb4d Attempt to fix IOOBException due getOfflinePlayer at server startup 2013-02-09 15:16:57 +01:00
bm01
c659f8a9a9 Party now store OfflinePlayer instead of String 2013-02-09 14:34:53 +01:00
bm01
6d9db06305 Removed getSkillLevel, it doesn't belong to SkillType 2013-02-08 13:04:26 +01:00
NuclearW
af1288b6f8 Add Friendly Fire permission for parties 
This removes the friendly fire config option previously created
Both attacker and defender must have this option

Closes #648
 2013-02-07 18:46:41 -05:00
GJ
6c266a8926 We don't need two functions that do the exact same thing. 2013-02-07 12:17:18 -05:00
GJ
a13d28a6ec Entity config files aren't working properly yet - temporary solution is 
to use a 1.0 base for any entity with an UNKNOWN type.
 2013-02-06 15:33:24 -05:00
GJ
7a0f8ea2dd Tweak a few more things with Salvage. 2013-02-06 10:28:28 -05:00
TfT_02
2799bab206 Minor cleanup 2013-02-06 15:29:21 +01:00
TfT_02
ba4d0451ff Shears are in isIronTool(), no need to check explicitly 2013-02-06 14:59:36 +01:00
TfT_02
40773ee6f6 Added Shears, Buckets, Fishing rods and Bows to the list of items that can be Salvaged 2013-02-06 14:49:36 +01:00
GJ
bbfbe1e72c Remove max level check - Bukkit now does the checking for us. 2013-02-05 23:58:15 -05:00
GJ
bb88812668 Added basic support for Mo' Creatures (and other entity mods) - specify 
mob info in entities.yml
 2013-02-05 22:40:19 -05:00
GJ
aad14169fb Flip the order to short-circuit faster. 2013-02-05 10:18:24 -05:00
GJ
2764368089 HerbalismBlock could be null here. 2013-02-05 09:57:03 -05:00
GJ
0de7e22408 Adjust how we get the usage strings for the /skillname commands 2013-02-05 08:51:11 -05:00
TfT_02
89eef2ce07 Added new config options to allow friendly fire in parties. 2013-02-05 14:47:09 +01:00
TfT_02
263cb2823c Oops, forgot to remove debug messages! 2013-02-05 00:46:50 +01:00
TfT_02
e5e19f77b9 Automatically remove inactive party members after 7 days (default) 
Inactive meaning, the player has offline for atleast 7 days. This will
prevent the parties.yml file from getting unnecessarily large.
 2013-02-05 00:44:22 +01:00
TfT_02
85dc6e51d2 Bleeding particle effect added. 2013-02-04 17:41:32 +01:00
GJ
4aceadd777 == is faster than .equals() for enums. 2013-02-04 11:35:52 -05:00
bm01
35cdcb62b7 Removed needs for SkillType.ALL 
Also apparently made /Skillreset work on offline players and fixed
missing permissions check
 2013-02-04 16:33:34 +01:00
GJ
44b862c0bb Get rid of all the deprecated instances of Users.getProfile() 2013-02-04 08:09:24 -05:00
GJ
2888fdff9e Fixed bug with Hylian Luck when there are no treasures enabled. 2013-02-03 13:31:13 -05:00
bm01
a1ab6f286b Made xp sharing less ugly by reworking McMMOPlayer xp methods 
Notable consequence: checkXP and addLevel in ExperienceAPI are no longer
needed and became deprecated
 2013-02-03 12:45:19 +01:00
bm01
6d871c9bdb Properly fixed the NPE in dropItem 
It was due to bad logic in Herbalism
 2013-02-03 09:12:34 +01:00
GJ
a42a1f4a9f Fixed trying to cast player to SpoutPlayer - need to use 
SpoutManager.getPlayer(player) instead.
 2013-02-02 19:20:31 -05:00
GJ
8f17ec96f0 Fixed teleport exploit in regards to Archery bonus XP. 2013-02-02 19:07:05 -05:00
GJ
b11e28c880 Don't need to add one here, it sends us out of bounds. 2013-02-02 17:04:11 -05:00
TfT_02
a16d5b62cf Fix issue #620 2013-02-02 20:23:40 +01:00
NuclearW
ebca9fc2da Change getString to use varargs 2013-02-02 02:55:49 -05:00
GJ
54e5be1961 Removed redundant permissions check for skill commands. 2013-02-01 13:43:24 -05:00
bm01
137864dc04 Fixed /addlevels not working on offline players 
Fixed /addlevels all throwing NPE because of Smelting
Removed use of Users.getProfile()
 2013-02-01 11:50:19 +01:00
bm01
7d83dd8283 Put McMMOPlayer to use where it made sense 
It's basically a wrapper for anything related to players, as a
consequence Users.getProfile() is now depreciated.
Also removed SkillTools.xpProcessing() because of some redundancy with
McMMOPlayer.addXp().
+ some cleanup for consistency sake.
 2013-02-01 06:38:25 +01:00
GJ
d3c8a5565a Cleaning up from our deprecated permissions. 
Also cleaned up the unholy mess that was SkillResetCommand.
 2013-01-31 13:29:42 -05:00
GJ
cd35df17ec Fix a handful of Javadoc issues - need to check through the rest later to ensure that we actually have updated JDs for everything 2013-01-30 19:44:35 -05:00