EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-26 05:16:47 +01:00
Code Issues Projects Releases Wiki Activity
3,368 Commits 48 Branches 45 Tags 34 MiB
c4aa9396fd
Commit Graph

2414 Commits

Author SHA1 Message Date
GJ
35f243a6e6 No reason to use the SAME CODE in three different clases. 2013-02-07 23:59:02 -05:00
GJ
114858505c Remove unused import. 2013-02-07 23:06:22 -05:00
GJ
3da062c4cc Update /party to use Bukkit CommandAPI for permissions & description - 
usage is handled internally due to the number of subcommands.
 2013-02-07 23:05:59 -05:00
GJ
291393d45d Update /party create to be a subcommand 2013-02-07 22:54:15 -05:00
GJ
3cc5cd4a04 Fixed playerParty never being initialized. 2013-02-07 22:10:31 -05:00
GJ
70ba4a0f3d Change /party accept to a subcommand. 2013-02-07 22:09:43 -05:00
GJ
9de6b4724a Changed names to refer to partyInvite for the sake of clarity. 2013-02-07 22:05:08 -05:00
GJ
79b96c380d Move handlePartyChangeEvent to PartyManager 2013-02-07 22:01:14 -05:00
GJ
3ccf79cff5 Make /party join into a subcommand. 2013-02-07 21:46:19 -05:00
nossr50
02bccf6dc1 Nerf Enderman default XP value part 2 2013-02-07 17:13:51 -08:00
NuclearW
911f036723 Cancel EntityTargetEvent for when an entity wishes to target a party member without the friendly fire permission being enabled for both. 
Not sure this can happen except for when an entity is made agressive to a player, then friendly fire is removed later and the player returns in range of the agressive tamed entity.

Thought: Move the permissions check for friendly fire into isFriendlyPet?  Not sure where else this is used, but if we always do a permissions check for friendly fire afterwards, it would make sense to move that check.
 2013-02-07 18:56:38 -05: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
4f45431dd3 Abstract the Chat commands. 2013-02-07 15:59:18 -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
c3f83302c5 Abstract our Spout commands. 2013-02-07 11:57:54 -05:00
GJ
57063246fb Anniversary is over for another year... 2013-02-07 10:23:11 -05:00
GJ
29f47d5ca7 Minor typo. 2013-02-07 10:21:54 -05:00
GJ
7c579a1040 Remove unused import. 2013-02-07 08:26:17 -05:00
GJ
59219e3f33 Update /mchud and /xplock to use the Bukkit CommandAPI 2013-02-07 08:25:54 -05:00
GJ
d5550c8fd1 Changed /p and /a to use /partychat and /adminchat as the default 
command name. The use of /p, /pc, /a, and /ac is still supported.
 2013-02-06 17:57:16 -05:00
GJ
d0ca2b9d4b Update /mmoupdate to use Bukkit CommandAPI. Addresses #628 2013-02-06 17:10:05 -05:00
GJ
84fb7eec36 Move this out of PlayerLoginEvent and into PlayerJoinEvent - 
this prevents us from creating DB entries for players that get caught by
a whitelist.
 2013-02-06 16:52:36 -05:00
GJ
c04b5dc4d6 Remove unused import 2013-02-06 16:49:14 -05:00
bm01
4b4fb7fd39 Fixed updateLeaderboards causing a memory leak and a bad /mctop display 2013-02-06 22:47:05 +01:00
GJ
215bd0f4a2 Deprecated most functions in ExperienceAPI, replaced them with identical 
versions that use a String for the SkillName rather than the SkillType
enum values
 2013-02-06 16:13:01 -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
bcdd235b9f NuclearW, why did you do this? 2013-02-06 12:50:11 -05:00
GJ
6be0714872 Update /mcremove to use the Bukkit CommandAPI. 2013-02-06 12:49:43 -05:00
GJ
7e70c4001b Move aliases back to plugin.yml since setAliases doesn't work. 2013-02-06 11:45:19 -05:00
GJ
9326921e2a Revert back to ugly-alias in PlayerCommandPreprocessEvent for /skillname 
commands.
 2013-02-06 11:00:43 -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
NuclearW
cd190eebc9 Locale Graph 2013-02-06 01:05:16 -05:00
NuclearW
c13593def1 Refactor LocaleLoader a bit 2013-02-06 01:05:09 -05: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
64d3430455 ACTUALLY ACTUALLY make /mcpurge behave right for flatfile. 2013-02-05 17:19:53 -05:00
GJ
7e4188e776 ACTUALLY make removing powerless players work for Flatfile. Old users 
will only work from here forward - we never tracked login time before
for FlatFile.
 2013-02-05 17:09:20 -05:00
GJ
3f6c07ba6a Updated /mcpurge for Bukkit CommandAPI, also made it work with Flatfile 2013-02-05 15:29:57 -05:00
GJ
419937f62e Refactoring - these should be with the rest of the DB files. 2013-02-05 12:56:31 -05:00
GJ
ab92aa3ffa Update /mcpurge command to use Bukkit CommandAPI. Addresses #628 2013-02-05 12:50:09 -05:00
GJ
2d9dc92f83 Added methods to ChatAPI for retrieving the current chat mode of a 
player. Fixes #641
 2013-02-05 12:30:15 -05:00
GJ
0f214496f2 Fixed a few incorrect usage strings. 2013-02-05 11:19:25 -05:00
GJ
9103914bc9 Update /mctop to use Bukkit CommandAPI. Addresses #628 2013-02-05 10:54:53 -05:00
GJ
aad14169fb Flip the order to short-circuit faster. 2013-02-05 10:18:24 -05:00
GJ
3550c25b7d targetParty could have been null going into the PartyChangeEvent. 2013-02-05 09:59:03 -05:00
GJ
2764368089 HerbalismBlock could be null here. 2013-02-05 09:57:03 -05:00
GJ
e46dcb69da Move setup tasks from onEnable to their own private functions for better 
readability.
 2013-02-05 09:51:45 -05:00
GJ
ef7aeb752e Update /mcstats to use Bukkit CommandAPI. Addresses #628 2013-02-05 09:30:47 -05:00
GJ
81ba0404b2 Fix issue with /mcstats displaying Integer.MAX_VALUE for the power level 
cap when there is no power level cap.
 2013-02-05 09:26:10 -05:00
GJ
9af470536b Some things should remain private. 2013-02-05 09:18:37 -05:00
GJ
5349b46122 Update /mcrank to use Bukkit CommandAPI. Addresses #628 2013-02-05 09:18:06 -05:00
GJ
0de7e22408 Adjust how we get the usage strings for the /skillname commands 2013-02-05 08:51:11 -05:00
GJ
03f96daba3 Fix typo in /mcability permissions check 2013-02-05 08:51:11 -05:00
GJ
f6aca88b36 Change /mcmmo to use Bukkit CommandAPI. Addresses #628 2013-02-05 08:51:10 -05:00
GJ
ea32cb9e12 These commands cannot work for online players, period. 2013-02-05 08:51:10 -05:00
TfT_02
1c328e7ac7 Fixed a bug which made it impossible to join other players' parties. 2013-02-05 14:47:09 +01:00
TfT_02
89eef2ce07 Added new config options to allow friendly fire in parties. 2013-02-05 14:47:09 +01:00
TfT_02
433c99e239 Clean up 2013-02-05 14:47:08 +01:00
Glitchfinder
e2faeac505 Updating blast mining permissions and alphabetizing the permissions list. 2013-02-04 15:54:19 -08:00
TfT_02
263cb2823c Oops, forgot to remove debug messages! 2013-02-05 00:46:50 +01:00
TfT_02
3cff8aba16 Add an error message when the config.yml is outdated. 
Adressess #626.
 2013-02-05 00:44:22 +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
GJ
4d93f3271d Update /mcability to use Bukkit CommandAPI. Addresses #628 2013-02-04 17:35:48 -05:00
GJ
0683745dd2 Update /inspect to use Bukkit command API. Addresses #628 2013-02-04 16:43:37 -05:00
GJ
49ef013152 Add alias to /xprate through the register instead of plugin.yml 2013-02-04 16:00:04 -05:00
GJ
717a258430 Added the other permissions nodes. Addresses #628 2013-02-04 15:10:07 -05:00
GJ
bb945a765c Updating /xprate to use Bukkit command API 2013-02-04 15:09:35 -05:00
Glitchfinder
6d486401b5 Adding a permission for the /mcc command. 2013-02-04 11:58:00 -08:00
Glitchfinder
07df5edc86 Adding new permissions for the /xplock command. 2013-02-04 11:47:32 -08:00
Glitchfinder
ae5ab13533 Adding a permission for the /mchud command. 2013-02-04 11:39:43 -08:00
TfT_02
fc40f545fe Removed Chimaera Wing 
"RIP Chimera wing, an archaic item from a decadent past" ~ shatteredbeam
 2013-02-04 19:41:23 +01:00
TfT_02
37e01f992d Update the changelog 2013-02-04 17:58:21 +01:00
TfT_02
85dc6e51d2 Bleeding particle effect added. 2013-02-04 17:41:32 +01:00
TfT_02
6d5ce1357e More party members = more XP share bonus 
Sorry, broke your party settings in config.yml. So now when there are
more party members near, the party share bonus is increased. :)
 2013-02-04 17:41:31 +01:00
TfT_02
ac1d556895 Moved this a bit + minor cleanup 2013-02-04 17:41:31 +01:00
GJ
4aceadd777 == is faster than .equals() for enums. 2013-02-04 11:35:52 -05:00
GJ
49de6614c0 Remove more old code from PlayerProfile 2013-02-04 11:28:59 -05:00
GJ
cc50428646 Remove old code from PlayerProfile. 2013-02-04 11:28:21 -05:00
GJ
b60bdc9b17 Fixed /mcrank not working for SQL power level after removal of 
SkillType.ALL
 2013-02-04 11:22:39 -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
458f7f5f5b Fix /xprate not properly sending "Event started" messages. Fixes #624 2013-02-04 08:47:54 -05:00
GJ
5f306447a0 Convert /skillreset to Bukkit command methods. Also refactored the name 
to SkillresetCommand to fall in line with the naming of all other
command executor classes.
 2013-02-04 08:38:13 -05:00
GJ
44b862c0bb Get rid of all the deprecated instances of Users.getProfile() 2013-02-04 08:09:24 -05:00
GJ
74c367c069 Remove unused variable 2013-02-04 07:55:01 -05:00
GJ
c3db026fd9 Changed /mmoedit to use Bukkit command info. Also fixed bug where 
/mcrefresh was registered with the info of /mcgod
 2013-02-04 07:54:26 -05:00
GJ
958095d11b Update /mcrefresh to use Bukkit command info. Also updated a few 
description strings.
 2013-02-04 00:55:17 -05:00
GJ
b21dc8631a Remove unused imports. 2013-02-04 00:55:17 -05:00
bm01
03354ed1cb Fixed #630 (null player was used) 2013-02-04 06:32:15 +01:00
Glitchfinder
1a63fc7638 Updating the permissions for the /[skillname] commands. 2013-02-03 16:43:06 -08:00
Glitchfinder
6498c711ba Updating the permissions for the /ptp command and fixing the event it files to properly show who is teleporting where. 2013-02-03 15:40:29 -08:00
Glitchfinder
57c8c94db7 Updating the permissions for the /mctop command. 2013-02-03 14:17:40 -08:00
Glitchfinder
15f212c384 Updating the permission for the /mcremove command. 2013-02-03 13:53:35 -08:00
Glitchfinder
dee384c8b9 Updating permissions for the /mcrefresh command. 2013-02-03 13:45:37 -08:00
Glitchfinder
93ffd950e9 Further updating the permissions for the /mcrank command. 2013-02-03 13:35:36 -08:00
Glitchfinder
b01d80b1f4 Updating the permissions for the /mcrank command. 2013-02-03 13:14:26 -08:00
Glitchfinder
84d01362f9 Updating the permission for the /mcpurge command. 2013-02-03 13:08:12 -08:00
Glitchfinder
939586ce1a Adding a permission for the /mcmmo command. 2013-02-03 13:03:04 -08:00
GJ
2888fdff9e Fixed bug with Hylian Luck when there are no treasures enabled. 2013-02-03 13:31:13 -05:00
bm01
b048cc1e55 Missed that one (formatting issue with /party kick) 2013-02-03 16:49:22 +01:00
bm01
3c94074533 Fixed minor formatting issue with /party owner 2013-02-03 16:47:30 +01:00
bm01
2de8962887 Fixed possible "array overflow" with /party kick 2013-02-03 16:46:46 +01:00
bm01
e37e913f6a Fixed minor formatting issue with /party invite 2013-02-03 16:37:41 +01:00
bm01
51305118fa Moving party stuff from PlayerProfile to McMMOPlayer 2013-02-03 16:27:59 +01:00
bm01
52bd48cde7 Fixed bad /Skillreset usage formatting 2013-02-03 14:08:57 +01:00
bm01
ecf32da760 Fixed /Addxp on all skills not working properly 
It was broken because of one of the previous commits
 2013-02-03 13:56:47 +01:00
bm01
1dbe56b026 Replaced deprecated calls to Users.getProfile() in our listeners 2013-02-03 13:40:56 +01:00
bm01
f51bdad6b4 Removed unwanted profile check in isNPCPlayer 
Is the profile is null, it may be our fault, and because of this check
we would never know about it.
 2013-02-03 13:27:47 +01:00
bm01
97d47c19b7 Replaced deprecated calls to Users.getProfile in our APIs 2013-02-03 12:57:29 +01: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
bm01
12faebca27 Fixed PlayerFishEvent.getCaught() ClassCastException 2013-02-03 06:00:12 +01:00
bm01
bd3db4a425 Fixed Xp not being awarded in parties because of XpShareMode.NONE 2013-02-03 05:25:02 +01:00
NuclearW
5801981147 Chunkmeta and Storage graphs 2013-02-02 22:47:05 -05:00
NuclearW
727cb029a6 om nom nom donut graph 2013-02-02 22:03:50 -05:00
GJ
dd0933c584 Edit /addlevels a bit, along with some command info in plugin.yml 2013-02-02 21:30:21 -05:00
GJ
e92b57c50c Return normal usage, not console usage. 2013-02-02 21:29:55 -05:00
GJ
2e3c1d53f5 Update command registration for /mcgod 2013-02-02 21:25:16 -05: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
bm01
e9425625e2 Added missing permissions for mcrank mctop and mcstats 2013-02-02 12:20:02 +01:00
NuclearW
8aabe1c148 Change metrics to be shaded in, add new graph 
New graph checks if a build came from our Jenkins, and reports that
Started new graph for donut version information, waiting for confirmation on data delimiter before proceeding with enabling that
@md-5 is now in mcMMO

Closes #617
 2013-02-02 04:38:15 -05:00
bm01
76ff0374ce Removed no longer needed check (related to previous commit) 2013-02-02 09:52:24 +01:00
bm01
09373c45f3 We already have a task for Profile saving 2013-02-02 09:33:19 +01:00
bm01
d0a5454333 Partially fixed /Addxp on offline player 
Xp is awarded but in order to level up the player need to log in
and use his skills.
 2013-02-02 09:26:44 +01:00
bm01
9ea693d3ce Fixed /Addxp not working properly with two arguments 2013-02-02 09:20:05 +01:00
NuclearW
ebca9fc2da Change getString to use varargs 2013-02-02 02:55:49 -05:00
GJ
c43e8f8f19 Remove unused imports. 2013-02-02 02:13:10 -05:00
GJ
b6b03369f7 Actually use the new /addxp registration function 2013-02-02 02:12:38 -05:00
GJ
0b6e854520 Change some checks around in /addlevels for readability. 2013-02-02 02:11:46 -05:00
GJ
55b17e7d2b Update /addxp to use Bukkit handling by default rather than ours. 2013-02-02 02:07:35 -05:00
GJ
d1f499f6fd Moved around a few more commands. 2013-02-02 00:09:47 -05:00
bm01
610bc42815 Fixing no Xp gain from previous commit 2013-02-02 05:06:47 +01:00
bm01
2006356ccd Fixing Xp share awarding full Xp to the original player 2013-02-02 05:00:39 +01:00
bm01
63e827aefb isEmpty() is prettier <3 2013-02-02 04:42:24 +01:00
bm01
1898537149 Fixed double rounding of shared Xp, rounding up final result instead 2013-02-02 04:33:26 +01:00
Glitchfinder
60033d47ec Adding support for both display names and sender names in the chat API. 2013-02-01 18:59:22 -05:00
Glitchfinder
b633f36131 Adding proper children for the deprecated permissions, and removing extra permissions checks. 2013-02-01 14:36:01 -08:00
Glitchfinder
749443454d Updating permissions for the /mcgod command. 2013-02-01 14:01:11 -08:00
GJ
d68dfe2a32 ACTUALLY fix the NPE this time. 2013-02-01 15:56:23 -05:00
GJ
b0acea3353 Fix bug in previous dev build that would make mcMMO never drop items... 2013-02-01 15:07:18 -05:00
GJ
862f5d73e1 Apparently our ItemStack can be null here. 2013-02-01 14:58:03 -05:00
GJ
52bf73aecc Remove unused imports. 2013-02-01 14:43:41 -05:00
GJ
54e5be1961 Removed redundant permissions check for skill commands. 2013-02-01 13:43:24 -05:00
GJ
7fbf3d4f27 Refactoring of general commands - the prior package structure made no 
sense.

New package structure splits commands into those normally reserved for
admin use and commands normally available to all players.
 2013-02-01 13:41:26 -05:00
GJ
2df285fd7c Having an option to disable commands from the config was a bad idea that 
encouraged lazy admins. 

NOTE: If you were using these config options instead of relying on
permissions, you will need to reconfigure these commands to be disabled
via permissions.
 2013-02-01 13:34:33 -05:00
GJ
a3e9d12f6a Rework /addlevels to use the built-in Bukkit command stuff. 2013-02-01 13:27:12 -05:00
GJ
89e5e16aad This is a much better way to work with our commands dynamically. It 
allows for localized description strings, aliases, etc.

With this addition, our "ugly alias" method in CommandPreProcessEvent is
no longer needed, nor is our alias map.

This also makes us more friendly with Essentials - if Essentials is
enabled, the /repair command will be changed to /mcrepair for
compatibility reasons.
 2013-02-01 12:27:24 -05:00
GJ
b463e4ce6f Localize a string I missed last time... 2013-02-01 10:38:28 -05:00
GJ
8c7fd7b1a6 Fix issue where the vanilla XP boost for smelting would be called 
regardless of who took the item out of the furnace. Not only does this
fix the exploit, it also fixes an NPE that could occur if the player who
lit the furnance was offline when someone else extracted the items from
it.
 2013-02-01 08:03:03 -05:00
GJ
2762a9d1fd Fix NPE on startup relating to old party files without an xp share mode 
set.
 2013-02-01 07:57:00 -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
ef775f1c24 Removed some deprec(i)ated calls to Users.getProfile() 2013-02-01 11:50:19 +01:00
TfT_02
56617a1c1c Minor cleanup 
No need for this here since .addXp() also does xpCheckSkill()
Also, thank you @bm01 for the cleanup! :)
 2013-02-01 10:15:28 +01:00
bm01
77e048471e Forgot to use the ShareHandler enum here 2013-02-01 06:51:02 +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
d0c0b9a089 Fixed /mmoedit not giving feedback when modifying another players stats. 
Addresses #243
 2013-01-31 21:58:09 -05:00
GJ
75894c4419 Clean up a little more from our permissions reworking. 2013-01-31 15:39:21 -05: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
bd2cd07f46 Better way to deprecate these. 2013-01-31 09:00:17 -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
Glitchfinder
c34d269f33 Adding a new permissions for the /mcability command. 2013-01-30 16:29:58 -08:00
GJ
01c8b8ad4a Builder > Buffer 2013-01-30 18:58:31 -05:00
GJ
fc5dda78f5 Fixed javadoc issue, also fixed bug where we were trying to compare the Player and a string, rather than the player's name. 2013-01-30 18:49:14 -05:00
GJ
d6e78beb72 More efficient way of handling our strings when setting up Flatfile. Also no reason to initialize those strings. 2013-01-30 18:45:41 -05:00
GJ
f324181190 Remove useless toString() call. 2013-01-30 18:29:44 -05:00
bm01
5c13661c47 Slight cleanup, removed unused import 
And this is how we go from build 12xx to 14xx in one week
 2013-01-30 23:36:33 +01:00
bm01
8b514d631c Vanilla xp bonus should actually be in beginFishing() 
or at least be called by beginFishing()
 2013-01-30 23:29:36 +01:00
bm01
13a65e875f Minor Fishing "cleanup" 2013-01-30 22:51:11 +01:00
U-YUE\Sean
a1d4a4b3f8 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2013-01-30 12:26:27 -08:00
U-YUE\Sean
610b87f462 Fixing a permissions loop and reverting a package change to prevent Serialization errors. 2013-01-30 12:25:48 -08:00
TfT_02
374b758700 Fix AxesMastery displaying wrong values 2013-01-30 20:33:19 +01:00
U-YUE\Sean
d32e0962b0 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2013-01-30 11:10:32 -08:00
U-YUE\Sean
1cb9f93f0e Added permissions to the /xprate command. 2013-01-30 11:10:19 -08:00
U-YUE\Sean
4a24ade442 Adding new permissions for the /skillreset command. 2013-01-30 10:56:58 -08:00
GJ
3f6bd7894d Added vanilla XP boost for Fishing - includes permissions, config 
options, etc
 2013-01-30 13:24:56 -05:00
U-YUE\Sean
cbb941116f Adding new permission for the /mmoupdate command. 2013-01-30 10:03:32 -08:00
U-YUE\Sean
bcaa7ecacb Added new permissions for the /mmoedit command. 2013-01-30 09:55:22 -08:00
U-YUE\Sean
b8eb6186ed Adding permission for the /mcstats command. 2013-01-30 09:50:15 -08:00
U-YUE\Sean
6d5cf2b139 Adding new permissions for the /inspect command. 2013-01-30 09:38:08 -08:00
TfT_02
5e6b1fe362 BeastLore can now display Offline Owner names 2013-01-30 18:35:57 +01:00
GJ
1c0cafc6c8 Fixed the guide usage string showing up every time /skillname was called 2013-01-30 12:30:45 -05:00
GJ
8eee0cb0b0 Use display name for chat events. 2013-01-30 12:25:31 -05:00
GJ
bfe8403d75 Minor cleanup. 2013-01-30 12:22:14 -05:00
U-YUE\Sean
8a852ce22e Adding new permissions for the /addxp command. 2013-01-30 09:09:14 -08:00
U-YUE\Sean
64fc7bcaf8 Updating permissions for the /addlevels command. 2013-01-30 09:06:21 -08:00
GJ
599bbe73b4 More major refactoring. My OCD is better now. 2013-01-30 11:53:51 -05:00
GJ
852872f55c Custom mod support refactoring. 2013-01-30 11:35:33 -05:00
GJ
62a037a4fd Minor cleanup of new party stuff. 2013-01-30 11:25:44 -05:00
TfT_02
9a89c7c49f Added party XP sharing. 2013-01-30 15:17:54 +01:00
GJ
c6ef053aac Fixed a couple of our locale strings getting screwed up due to 
refactoring.
 2013-01-30 08:36:24 -05:00
GJ
d3b0da4186 Finished tidying up our Spout checking. 2013-01-30 08:08:29 -05:00
bm01
d09cd49f01 Attempt to fix Spout NoClassDefFoundError 2013-01-30 08:44:01 +01:00
GJ
bfa29cbf02 Fixed Spout not being able to precache our resources properly, and 
therefore making our XP bars fail. Fixes #587
 2013-01-30 00:09:22 -05:00
bm01
74d9fa422f Fixed Shake Mob level not being displayed correctly 
Another bug introduced in previous commits
 2013-01-30 05:12:34 +01:00
bm01
b43538ee78 Fixed Shake Mob using "data" value as amount 
Bug introduced in one of the previous commits
 2013-01-30 02:02:42 +01:00
bm01
ae49f0b6e4 Remove unused import 
Whoops D:
 2013-01-30 01:15:07 +01:00
bm01
063de93eb8 Do not break 1.4.6 compatibility yet 2013-01-30 01:13:29 +01:00
bm01
ec997bd2b6 Fixed Shake Mob not dropping the correct Wool 
Bug introduced by my previous commit
 2013-01-30 01:02:03 +01:00
bm01
20aa312173 Removed permanent storage of config value in Woodcutting 2013-01-30 01:02:03 +01:00
bm01
48b0050451 Fishing refactoring, fixed bad enchant distribution 2013-01-30 01:02:02 +01:00
GJ
c04b14c751 Add anvil sounds to Salvage. 2013-01-29 19:00:47 -05:00
GJ
3d8aa29b52 Fix startup error from last build due to the removal of the custom spout 
repair sound.
 2013-01-29 18:58:42 -05:00
GJ
ac7ed67d91 We're now using Bukkit sounds instead of Spout sounds - only 
current exception is the custom level-up sound.
 2013-01-29 18:36:16 -05:00
GJ
20f6a55df2 Remove duplicate checks. 2013-01-29 12:02:32 -05:00
GJ
60041a1253 Added ability to config Hylian Luck drops through treasures.yml 2013-01-29 11:24:41 -05:00
gmcferrin
1e7b54ef0d Tweak archery distance XP function to reward better. 2013-01-29 10:55:06 -05:00
gmcferrin
d2cb88d93b No need to check if this is wheat... 2013-01-29 10:07:32 -05:00
GJ
659e982c47 Check if the furnace is actually a furnace - fixes ClassCastExceptions 
caused by "virtual furnace" plugins.
 2013-01-29 08:09:08 -05:00
TfT_02
5bf1e49e43 Edit /mcc information with new party commands 
`/party password` can now be used to clear the parties password when no
argument is provided.
Also improved feedback messages when managing your party.
 2013-01-29 13:17:38 +01:00
GJ
5b862a4cee Added XP bonus for Archery based on distance from shooter to target. The 
farther you are from your target, the more bonus XP you'll earn.
 2013-01-29 01:58:03 -05:00
GJ
2aec202e6d Attempting to make Herbalism cleaner... 2013-01-28 16:56:18 -05:00
TfT_02
0a17bf69c0 Implementing ptp request timeouts. 
Also fix and improve a few things as suggested by bm01
 2013-01-28 21:24:55 +01:00
GJ
6db78d3cda This might be a bit slower, but it's WAY cleaner. Also prevents us from 
having to update this function every time Minecraft adds a new
transparent block.
 2013-01-28 12:51:20 -05:00
GJ
0692dd82ad Cleaned up a few things in PartyCommand - removed unnecessary else 
statements & function args, removed accidental usage of
Bukkit.getServer() command, fixed some spacing issues.

Added new CommandHelper function to take a player when checking
permissions to avoid double-checking when it's already been verified
that the sender is a player.
 2013-01-28 09:16:19 -05:00
GJ
088d4ac14a Removed useless function variable. 2013-01-28 08:36:55 -05:00
GJ
92262d0e47 Cleanup PtpCommand a bit, remove some useless argument passing and else 
statements.
 2013-01-28 08:36:12 -05:00
GJ
1549f66fd7 Removed unused imports. 2013-01-28 08:16:09 -05:00
GJ
1118cd8ca1 Fixed Spout config files loading / generating when they shouldn't have 2013-01-28 08:15:12 -05:00
TfT_02
d744c6a46d Party teleportation now requires the target player to confirm the teleport request before the teleportation takes place. 2013-01-28 00:52:51 +01:00
TfT_02
cb46040309 Because you can't join your own parties. 2013-01-28 00:35:06 +01:00
TfT_02
abd8223e41 Add /ptp toggle command 2013-01-27 23:35:46 +01:00
TfT_02
e061acb44a Fixing a bug where deflect and disarm would have wrong values. 
Adresses issue #593
 2013-01-27 22:49:10 +01:00
GJ
cc6850b37d Fixed bug where Green Terra could possibly activate on crops that 
weren't fully grown. Also fixed crop growth rates being checked twice.
 2013-01-27 16:34:47 -05:00
GJ
a3c92b07cb Jack O' Lanterns are ALWAYS placed blocks. 2013-01-27 16:24:30 -05:00
GJ
e61581c4e6 Fixed mod config files loading / generating when they shouldn't have 2013-01-27 16:21:02 -05:00
GJ
43dbb94a7f Changed Excavation to have individual XP values for each block type, 
rather than a base XP value
 2013-01-27 01:09:20 -05:00
bm01
d43e61a49c Reimplemented TreeFeller on Jungle Trees experience nerf 2013-01-27 04:20:07 +01:00
NuclearW
7ccadae489 Changes to the changes to the ChatAPI. 
mcMMO will not pass null for any events that it creates about itself.
Older plugins which are using depricated methods in ChatAPI will be null.
Newer plugins passing null to ChatAPI will also be null.

Null guarantees that it is not from mcMMO, but from an external plugin that is not specified.
 2013-01-26 22:13:49 -05:00
jgeboski
251c152efa McMMOChatEvent: added a field to hold the dispatching plugin 
Currently, there is no sane way to detect which plugin dispatched
an McMMOChatEvent. This is problematic for plugins using the ChatAPI
while also listening for McMMOChatEvents as it leads to a message loop
being created.

A "simple" solution is to store a reference to the dispatching plugin in
the McMMOChatEvent. This allows for a plugin to determine if it is an
event dispatched by itself, or some other plugin. In addition, this can
allow for better control within third party plugins to determine where
McMMOChatEvents are dispatched from.

This patch is backwards with existing interfaces.
 2013-01-26 21:07:36 -05:00
bm01
a8fa625b5c Fixed parties not being loaded at startup 
+ minor cleanup
 2013-01-27 01:32:58 +01:00
bm01
3f44bd8eac Fixed NPE in Database.checkConnected() 2013-01-27 00:28:03 +01:00
bm01
2eb593e163 Attempt to fix NPE spam when MySQL connection failed 
This is how it was before my cleanup, I find what the
methods do and/or how they're named a little weird,
We may want to do something about it.
 2013-01-27 00:07:30 +01:00
bm01
2356fda67a Minor cleanup 2013-01-27 00:02:01 +01:00
bm01
bff7919c21 Major cleanup 2013-01-26 23:01:55 +01:00
TfT_02
f1075f800f Cleanup, no need for this in PartyManager 2013-01-26 19:40:20 +01:00
TfT_02
473b9e8bbe Add new party command /party rename 2013-01-26 19:31:17 +01:00
TfT_02
b91b88a74b Better feedback when trying to join a password protected party. 2013-01-26 16:26:32 +01:00
GJ
56e16acce4 Fix bug where smelting allowed for XP gain in Mining/Repair even if 
permissions were not present.
 2013-01-26 00:25:14 -05:00
TfT_02
4692a461eb burnTimeModifier only needs show two decimal places 2013-01-26 02:13:10 +01:00
GJ
3e04bacf73 Tweak a few things with Herbalism. 2013-01-25 19:21:33 -05:00
bm01
a0a52a3433 Added the possibility to not use a max level for Fishing 
by using a negative number, changed default
treasure.yml file accordingly
 2013-01-26 01:04:24 +01:00
bm01
188ad359fe Changed Fishing to always give a fish on a successful catch 2013-01-26 01:03:42 +01:00
TfT_02
d601496173 Reworked party commands. 
Party commands are now all subcommands of /party. Use /party create
<party-name> to create a new party. To join an existing party, player
can now use /party join <player-name>. You can only join unlocked
parties. New parties are locked by default and require the party leader
to invite members.
 2013-01-26 00:40:23 +01:00
GJ
85b909a7ab Change some stuff around with ChatManager, change ChatAPI to route 
through ChatManager.
 2013-01-25 18:21:17 -05:00
GJ
18a4f5ed40 Fixed bug where Iron Grip was using the attacker's skill values rather 
than the defender's
 2013-01-25 17:57:42 -05:00
GJ
c4ec9a6df9 Fixed issues with combat abilities not checking cooldowns in last few 
dev builds.
 2013-01-25 17:21:18 -05:00
bm01
a4aebdc643 Forgot to change references 2013-01-25 22:44:32 +01:00
bm01
b61410b6eb Make this constant 2013-01-25 22:34:35 +01:00
bm01
51d681974c Re-added unbreaking enchant handling for Tree Feller 2013-01-25 22:32:52 +01:00
bm01
071f7edade Fixed inverted check of mob spawner / egg entities 2013-01-25 21:45:52 +01:00
GJ
46f1157030 Clean up more of block listener. 2013-01-25 15:32:11 -05:00
GJ
3cca6d9ab4 Split the listener - those events don't need to happen at HIGHEST 
priority.
 2013-01-25 15:01:32 -05:00
GJ
91e8051cee Fixed abilities activating with the wrong tool in hand 2013-01-25 13:54:32 -05:00
GJ
c220f0dee5 Fixed Leaf Blower not respected the unlock level set in advanced.yml 2013-01-25 12:41:39 -05:00
GJ
a7be57241c Cleanup listeners a bit more. Also fix bug in recent dev builds where 
placed blocks were not properly tracked.
 2013-01-25 12:33:48 -05:00
GJ
a35af4dbe6 This is better & cleaner than just comparing the data. 2013-01-25 10:41:43 -05:00
GJ
329f779781 Refactor a bit 2013-01-25 00:56:23 -05:00
GJ
95fa688306 More cleanup. 2013-01-25 00:51:45 -05:00
GJ
3d275a4f53 Hopefully a better fix for the previously mentioned issue. 2013-01-24 23:54:07 -05:00
GJ
06cf0ff2c2 Temporary fix for some of our combat checks not being called properly. A 
better fix will be coming soon.
 2013-01-24 23:03:00 -05:00
GJ
ba7ebe1319 Minor Database refactoring. 2013-01-24 22:53:02 -05:00
GJ
3efc2138d6 Minor Spout refactoring 2013-01-24 22:47:12 -05:00
GJ
9b0cba9dbe More listener cleanup 2013-01-24 22:43:15 -05:00
GJ
62a5d2db5c Make sure we ignore cancelled events. 2013-01-24 22:24:07 -05:00
GJ
96d59a2e81 A little more cleanup 2013-01-24 22:22:02 -05:00
GJ
f5179cdcea Fixing awkward Bukkit bug related to Flame arrows. 2013-01-24 21:55:56 -05:00
GJ
9cdfebda9a Trying to clean up duplicate checks & whatnot in our listeners. 2013-01-24 20:10:50 -05:00
GJ
7c59621c9e More cleaning on listeners. Also fixes NPE with itemInHand, because 
Bukkit is dumb.
 2013-01-24 15:46:29 -05:00
GJ
8736aae2ef Fix NPE when a furnace belonging to a player that has logged out keeps 
burning.
 2013-01-24 15:35:01 -05:00
GJ
76a987e1e0 PlayerListener cleanup 2013-01-24 14:19:26 -05:00
GJ
9dac898c1c Fixes possible NPE when a furnace is destroyed while someone is still 
viewing it.
 2013-01-24 11:50:12 -05:00
GJ
ab677e941d Start cleaning up the mess we've made of our listeners. 2013-01-24 11:50:12 -05:00
bm01
29d796b6af Partially reverted my previous fix 
ItemStack constructor actually worked,
the issue was about double drops using
the original data, not about TreeFeller.
 2013-01-24 16:15:10 +01:00
GJ
276800f999 Change how we handle players not being able to pick up items while using 
Berserk.
 2013-01-24 09:44:48 -05:00
bm01
8d077ff4f2 Cleanup 2013-01-24 15:37:02 +01:00
bm01
58b01021c1 Definitely fixed sideways logs issues 
... Apparently
 2013-01-24 15:28:18 +01:00
bm01
5a6dc8511f Actually fixed TreeFeller and sideways logs items 2013-01-24 15:13:56 +01: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
GJ
531e92bda3 It's over 5000! 
Fixes #571
 2013-01-23 23:55:51 -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
t00thpick1
a8b5b438bf Null check 2013-01-23 21:03:02 -05:00
GJ
8ccaf3caf2 Fix ClassCastException 2013-01-23 19:19:35 -05:00
GJ
1337c45f1d Fixed NPE with startup relating to SmeltingCommand. 2013-01-23 19:10:12 -05:00
GJ
a968019799 Rearrange order of listeners in attempt to fix errors on startup. 2013-01-23 18:54:13 -05:00
GJ
0a9e1ba42e Start cleaning up BlockListener. 2013-01-23 18:54:13 -05:00
bm01
7e91776cfb Made Tree Feller a little more aggressive 2013-01-24 00:53:08 +01:00
bm01
9689c50603 Javadoc update & fixes 2013-01-24 00:53:08 +01:00
bm01
bb2eb053da Fixed Tree Feller dropping sideways log items 2013-01-24 00:53:08 +01:00
bm01
de5110310f Fixed placed-log flag checks 2013-01-24 00:53:08 +01:00
GJ
64137995c2 Add advanced.yml config options for Smelting. 2013-01-23 17:07:26 -05:00
GJ
6f45e479bd Fix typo in alias map assignment for Smelting. 2013-01-23 16:50:10 -05:00
GJ
6f0e2437e0 Smelting! 2013-01-23 16:34:01 -05:00
GJ
56d27c3d78 Fixed issues with Hylian Luck & the placed-block flag. 2013-01-23 13:06:13 -05:00
GJ
7919e591cb Move Hylian Luck into a separate listener since it actually cancels the 
event.

Priority when cancelling events should not be MONITOR.
 2013-01-23 12:53:12 -05:00
GJ
aabbc2f238 Is it a log? There's a function for that... 
Also fix leaves dropping logs instead of saplings.
 2013-01-23 12:44:00 -05:00
TfT_02
fb31cef68b Fix Gracefull Roll chance being null 2013-01-23 16:14:12 +01:00
bm01
2a89e912f8 Removed debugging code left behind 2013-01-22 23:49:06 +01:00
bm01
ee91ed8708 Fixed sideway logs handling 2013-01-22 23:44:53 +01:00
bm01
69475f92c7 Catch this 2013-01-22 22:24:53 +01:00
bm01
dc2452231d Abstract Woodcutting 2013-01-22 22:04:05 +01:00
bm01
1bbb245e32 More work on Woodcutting and Tree Feller 2013-01-22 21:51:07 +01: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
00d50953ad Update /repair command 2013-01-22 12:26:35 -05:00
GJ
397dd96383 Update Woodcutting command. 2013-01-22 11:52:06 -05:00
GJ
cac5f15a37 I broke the build... 2013-01-22 11:19:26 -05:00
GJ
74c32c4e59 Cleanup of UnarmedCommand.java 2013-01-22 11:18:12 -05:00
GJ
e048a6d0d0 Cleanup Swords & Taming commands 2013-01-22 10:48:10 -05:00
GJ
65d71db72f Cleaning up Herbalism & Mining commands. 2013-01-22 02:20:05 -05:00
GJ
b4fffe154d Shoulda been a double. 2013-01-22 01:57:48 -05:00
GJ
716c4d3783 Fixed Woodcutting accidentally using Mining double drop values. 2013-01-22 01:56:54 -05:00
GJ
5a9ca96a0f Cleanup of HerbalismCommand, added config options for Hylian Luck 2013-01-22 01:52:34 -05:00
GJ
cedfb1a538 Fixed bug with checking if an entity is wearing armor. 2013-01-22 00:59:20 -05:00
GJ
176ffcc3d1 Cleanup on FishingCommand, split Farmer's Diet & Fisherman's Diet into 
distinct config values. Fixes #556
 2013-01-22 00:47:56 -05:00
GJ
3cc9672ff3 Fixed an inverted check on Impact. 2013-01-21 23:03:14 -05:00
bm01
946d845987 Fixed the merge, I think 2013-01-22 02:43:49 +01: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
67fd45ef25 Avoid a few unnecessary calls. 2013-01-21 19:36:15 -05:00
GJ
7f8beca33c Synchronizing watches... 2013-01-21 19:19:25 -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
0a295f7738 Eclipse, y u do that? 2013-01-21 17:32:31 -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
GJ
299c7ff804 Because McMMOPlayerUnarmEvent is a silly name. 2013-01-21 12:35:38 -05:00
NuclearW
0276294569 Add McMMOPlayerUnarmEvent 2013-01-21 03:53:25 -05:00
Glitchfinder
16bc359f99 Merge pull request #544 from Glitchfinder/master 
Fixing a new duping bug. And this time it was NOT our fault!
 2013-01-20 18:09:03 -08:00
bm01
c8013421e6 Few chunk load optimizations 2013-01-21 03:07:18 +01:00
Glitchfinder
c1e82b566e Fixing a new duping bug. And this time it was NOT our fault! 2013-01-20 18:06:30 -08: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
GJ
0cdb50e538 Use variables to save on some calls. 2013-01-20 15:51:07 -05:00
Glitchfinder
643af1c32b Fixing a memory leak involving mob tracking. 2013-01-19 14:02:23 -08:00
bm01
e7ceef479e Removed extra durability loss from Leaf Blower 2013-01-19 20:47:15 +01:00
bm01
0545ed434d Removed unnecessary calls 2013-01-19 20:44:51 +01: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
50de88a0a0 Fixing minor spacing issue. 2013-01-18 14:47:55 -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
GJ
87a9c12827 Remove my nonworking debug code so mcMMO will actually start. 2013-01-18 14:01:20 -05:00
NuclearW
ebd83e1f19 Support some new stuff in our locale files 2013-01-18 13:59:20 -05:00
GJ
d153e3e25c Go on and remove the placed flag when it first falls. 2013-01-18 11:52:38 -05:00
GJ
e3b3b7cfdb Useless check for air. 
The block will always be replacing either air, water, or lava. The check
for whether or not it's being tracked is sufficient.
 2013-01-18 09:41:46 -05:00
GJ
2c78bac8f7 We only care about sand & gravel. 
Technically this was already addressed because no other blocks would
have their place store set to true, but this eliminates unnecessary
overhead caused by the checking of other falling blocks - anvils, dragon
eggs, and TNT.
 2013-01-18 09:37:03 -05:00
GJ
db1c0647ed Fix issue with tracking falling sand & gravel. 2013-01-17 23:26:18 -05:00
T00thpick1
2f16dbc9b5 Explicitely state desired order 2013-01-17 21:35:35 -05:00
T00thpick1
7e7ab249c2 Order correctly to match mcrank 2013-01-17 21:31:50 -05:00
T00thpick1
1d2298e5f6 Join tables in query 2013-01-17 20:57:06 -05:00
GJ
0dfd2fe9ef ACTUALLY fix issue with fishing enchantments. Also updated the 
changelog.
 2013-01-17 18:25:26 -05:00
T00thpick1
c0b3a4e929 Index tables 2013-01-17 18:11:28 -05:00
GJ
5830bf461d Fix fishing not handling enchants right. 2013-01-17 15:32:28 -05:00
GJ
857bb00c8a Because this way is easier. 2013-01-17 15:20:20 -05:00
nossr50
abb0184e49 Fixed a bug where Triple Drops wouldn't happen. 2013-01-17 11:23:52 -08:00
nossr50
b11762da99 Absolutely no reason to do it that way 2013-01-17 10:28:31 -08:00
GJ
0262255bea Fixed bug where Skull Splitter would be applied twice. 2013-01-17 12:04:56 -05:00
GJ
38a8a6f2ff Fix possible NPE when using the PartyAPI to add a player to a party that 
doesn't exist.
 2013-01-17 11:26:55 -05:00
GJ
a9c722de67 Wrapping up the localizations... though I'm sure there are probably 
still some that got missed.
 2013-01-17 11:02:55 -05:00
GJ
49610e372f Localizing more commands. 2013-01-17 01:36:56 -05:00
GJ
37c92b8d7c Localize /addlevels and /addxp commands 2013-01-16 23:58:12 -05:00
GJ
07211611a6 Missed one. 2013-01-16 23:36:00 -05:00
GJ
ea7fee2a53 Localize /mmoedit, /mmoupdate, and /mcpurge 2013-01-16 23:31:28 -05:00
GJ
89da8b832f Localize chat commands and /invite 2013-01-16 22:13:30 -05:00
GJ
5f4c83b6a1 Localize /mchud & /ptp 2013-01-16 18:09:02 -05:00
GJ
2e751b1438 Localize XpLock command. 2013-01-16 17:38:00 -05:00
GJ
1a888d3116 Formatting, and reminding myself to come back and fix this even further. 2013-01-16 17:37:35 -05:00
GJ
2a4fe4aa48 Because lowercase class names are just wrong... 2013-01-16 17:13:56 -05:00
GJ
4c81eb3058 Localizing, and removing a duplicate line. 2013-01-16 17:13:04 -05:00
GJ
64c20d0e24 Because toothplck1 doesn't know how to locale, apparently. 2013-01-16 16:58:00 -05:00
GJ
ff186d5d9d Make our StructureGrowEvent only care about player-planted trees. 2013-01-16 16:47:04 -05:00
GJ
734d691e00 Fix issue where Tree Feller wouldn't work on the base of a 
player-planted tree. Fixes #524
 2013-01-16 16:16:11 -05:00
T00thpick1
51777dbe85 Import chatColor 2013-01-16 16:15:03 -05:00
T00thpick1
fb1d48fcae Output Header along with info for mcRank 2013-01-16 16:13:31 -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
GJ
d673676a8a Add localized skill names to Perks.Lucky.Desc in skill commands. 2013-01-15 23:30:58 -05:00
nossr50
793538d4ef Fixing mcrank reading from FFS when on SQL 2013-01-15 20:09:49 -08: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
a6144f6dee Hehe no silly hat for me 2013-01-15 22:24:46 -05:00
t00thpick1
94a4f628c7 Fix mcremove for sql 2013-01-15 22:14:05 -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
7e297ac884 Name methods properly 2013-01-15 19:09:48 -05:00
t00thpick1
e6e8470851 Should be capitalized 2013-01-15 19:08:41 -05:00
t00thpick1
89a36ae47e Last change 2013-01-15 19:04:30 -05:00
t00thpick1
137c46b8ce Part two of sql mcRank 2013-01-15 19:03:13 -05:00
t00thpick1
5512bd7df6 Part one of sql for mcRank 2013-01-15 18:35:21 -05:00
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
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
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
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
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
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
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
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
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