Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity
2,768 Commits 46 Branches 44 Tags 36 MiB
4931ff6e4a
Commit Graph

2060 Commits

Author SHA1 Message Date
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
e40095977a Remove ac command alias due to Essentials compatibility issues. 2013-02-02 00:14:59 -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
aca3d5c4c6 Add back the descriptions to plugin.yml for documentation purposes. 2013-02-01 15:09:22 -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
01723b2d36 Locale file updates. 2013-02-01 10:45:14 -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
GJ
a1d710fe3d Fixed the remnants of my attempt at refactoring serialized classes... 2013-01-30 19:44:34 -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
GJ
637442149c Updated locale files, added the start of Hungarian locale file (hu_Hu) 2013-01-30 11:20:09 -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
GJ
755b9bc2a1 Removed files I didn't even know we had... 2013-01-29 19:19:36 -05: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
f5259decab Update the locale files with recent /ptp command changes 2013-01-28 21:28:52 +01: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
00c84e775f For the sake of consistency, this should be 1.0 instead of 1 2013-01-26 16:26:32 +01:00
TfT_02
a1a630bad2 Update the local files with new party strings 2013-01-26 16:26:32 +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
4639b8b939 Fix typo in /smelting command display. Fixes #580 2013-01-24 20:29:04 -05:00