EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-18 10:03:39 +02:00
Code Issues Projects Releases Wiki Activity
5,134 Commits 48 Branches 45 Tags 34 MiB
d81c3d06c5
Commit Graph

1003 Commits

Author SHA1 Message Date
R4zorax
a39a77f89e Fix fishing in 1.13 (#3528) 
* Fix fishing to use Material instead of BlockData (that was AIR)
 2018-08-02 20:27:15 -04:00
R4zorax
7800e48f61 Make BiomeAdaptor support Bukkit 1.13 and bump java-version to 1.8 (#3526) 2018-08-01 21:23:29 -04:00
Shane Robertson
ee324c77a9 Fixed errors with block-based skill experience (#3506) 
* Updated configs

* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain

* Fixed most block based experience gain & updated wooden_tools

* Removed debug prints
 2018-07-26 19:53:29 -04:00
t00thpick1
b73eced36f Remove sound adapter 2018-07-25 20:29:40 -04:00
t00thpick1
bff454f397 Wood is not planks. 2018-07-24 20:50:17 -04:00
t00thpick1
fbe26af2d7 Merge remote-tracking branch 'origin/master' 2018-07-23 22:14:44 -04:00
t00thpick1
0a1559511a Quick and dirty 1.13 update. I.e. it now compiles for 1.13. 2018-07-23 22:13:57 -04:00
t00thpick1
cbff8482ce
Merge pull request #3427 from joblo2213/master 
Add McMMOPlayerSalvageCheckEvent
 2018-06-09 11:50:32 -04:00
joblo.2213
0035762a71
Add McMMOPlayerSalvageCheckEvent 2018-06-09 09:46:06 +02:00
Glitchfinder
e77801f3c1 Ensure all entity types function in experience.yml 
Fixes #3443
 2018-05-16 08:07:07 -07:00
Gio
2c6543da9e
More descriptive text. 2018-04-30 13:30:41 -05:00
Gio
20bbdfc4ab
Check playerdata for corruption 
Fixed a null pointer exception that would occur if the offlinePlayer object did not have a defined string for .getName();
 2018-04-30 12:54:35 -05:00
Glitchfinder
5b2ebf4aa8 Prevent shulker boxes from activating abilities. 
Fixes #3438.
 2018-04-29 23:09:52 -07:00
t00thpick1
2b159adefd
Merge pull request #3330 from hoorigan/ench-book-fixes 
Enchanted book fixes
 2018-04-28 20:04:06 -04:00
Glitchfinder
be2de1d487 Fix a duping bug that uses a coordinate error. Fixes #2979 and fixes #3429. 2018-04-15 10:19:31 -07:00
t00thpick1
875db44afd Don't active skills on shulker blocks Fixes #3423 2018-04-07 13:33:28 -04:00
ezeiger92
6d2003d577 Remove offhand fishing rod if not in main hand 
Fixes mcMMO-Dev/mcMMO#3342
Fixed style error in last commit
 2018-02-15 13:59:10 -08:00
ezeiger92
40b609ccd8 Respect unbreakable tag on items when attempting durability changes 
Fixes mcMMO-Dev/mcMMO#3327
Fixes mcMMO-Dev/mcMMO#3391
 2018-02-15 13:38:10 -08:00
t00thpick1
d4f2f0e11b Use new recipe constructor to avoid deprecation errors. 2017-12-17 13:31:30 -05:00
hoorigan
916d9a7c8a
ItemUtils: add ENCHANTED_BOOK to isEnchantable() 
This will (hopefully) make mcMMO aware that ENCHATED_BOOK can have an enchantment.
 2017-10-31 16:47:46 -04:00
t00thpick1
9df72e61a2 Mob Health bars global toggle 2017-10-03 23:32:54 -04:00
t00thpick1
87ebf7023f Additional changes that are less important but related to the dupe fix. 2017-09-12 20:01:09 -04:00
t00thpick1
028f87653a Check length of the Y dimension of the array, not the x dimension, which will only be 16 2017-09-08 23:16:41 -04:00
t00thpick1
0e51983819 Y, not Z, very very important. 2017-09-06 00:23:35 -04:00
t00thpick1
f1f02fd005 Don't fail out of saves just because a single player fails. 2017-09-01 00:45:22 -04:00
t00thpick1
f279a979e3 Also handle bottom of world 2017-09-01 00:44:37 -04:00
t00thpick1
e0bbe9cea4 Fix error with pistons retracting near top of world. Fixes #3172 2017-09-01 00:43:11 -04:00
t00thpick1
d3cc23f6a0 Fix smelting vanilla xp boost. Fixes #3270 2017-09-01 00:32:11 -04:00
Erik
0e7ee41444 Follow spacing convention 2017-08-05 11:53:38 -07:00
Erik
b5f6b1d97f Fix for 3250 - HashSet<Byte> to HashSet<Material> for getTargetBlock 2017-08-05 11:50:24 -07:00
t00thpick1
f1ac5739e4 [bugfix] Resolve issues with Herbalism exp. 
Due to flaws the previous changes to the configuration system combined with some bad lines in the experience.config that I mistakenly recommended, herbalism was not granting experience in most cases, as it was marking newly planted crops and such as player placed no exp granting blocks, rather than ignoring them as it should.
block types now are evaluated in 3 steps:
1: Explicit Name  i.e. ("Crops|4", "Crops|0"), Which is the material name then data value
2: "friendly name"  i.e. ("Crops_Ripe", "Crops_Ungrown"), Which is a typically data valueless name,  some of which I make up in mcMMO, but most of which are just the Material name
3: Wildcard name  i.e. ("Crops|*") Which is any block with that block value, regardless of data value

In order to be sure herbalism grants exp for you once again, make sure your configuration for herbalism looks similar to this:
https://github.com/mcMMO-Dev/mcMMO/blob/master/src/main/resources/experience.yml#L151

In terms of which blocks are listed there.  Specifically, there should be no blocks marked "ungrown"
 2017-08-01 01:33:02 -04:00
t00thpick1
8cbb57df97 Fix herbalism I think 2017-07-23 18:06:45 -04:00
t00thpick1
755787f9ee Add sapling types 2017-06-10 14:30:06 -04:00
t00thpick1
15436b44da Update configurations and skill block checks to be more configurable. 2017-06-10 13:47:20 -04:00
t00thpick1
a43ae4178a Some cleanups to mob related XP code 2017-04-15 00:04:07 -04:00
t00thpick1
c9c2c483fa Remove unneccessary code. 2017-04-14 23:34:54 -04:00
TheComputerGeek2
d6a00eaf00 Prevent disarming, bleed, and axe passives when dealing thorns damage 2017-03-06 18:03:15 -08:00
t00thpick1
69151f0855 Forgot to actually add the funfetti 2017-02-22 00:01:39 -05:00
t00thpick1
789aaec186 I should probably compile before committing in the future. 2016-12-04 21:42:26 -05:00
t00thpick1
6c5fb5f398 Fix entity kill xp 2016-12-04 20:53:51 -05:00
t00thpick1
8901db4e18 Add Beetroot to herbalism skill 
Merge pull request #2918 from isokissa3/master

His was better.

(cherry picked from commit 3ed0fdf330)
 2016-06-26 17:14:19 -04:00
t00thpick1
2bed26f18a Fix scoreboard numbering being off 2016-06-19 17:47:38 -04:00
t00thpick1
70de0ba00b Enable Beetroot I think 2016-06-19 17:33:43 -04:00
t00thpick1
dcd79e87e1 This command probably works 2016-04-23 00:32:04 -04:00
Sid Shakal
2d4cf76825 ... (completing the previous style fix) 
Not sure how I missed this one. (Well, sure I do. I used the GitHub
editor for the re-casing of the variable name. Noob mistake.)
 2016-03-16 20:38:24 -05:00
Sid
4cb4a6224b Added javadoc for Misc.getBlockCenter(BlockState) 
And camel-cased the parameter name to conform to style.
 2016-03-16 15:47:24 -05:00
Sid Shakal
a6e445b7ef Minor formatting adjustments to keep my commit to code style. 
Whoops. Eclipse removed a line in imports, and I placed a brace on the
wrong line. Fixed.
 2016-03-16 12:01:52 -05:00
Sid Shakal
123a139e43 Moving the center of block drops to block center. Fixes #2544. 2016-03-16 11:47:40 -05:00
Dor
40c61149cf Treat grass paths as grass. 2016-03-12 08:12:27 +02:00
t00thpick1
f3a8208425 Add new enchants and fallback to bukkit enchant name map 2016-03-11 22:55:01 -05:00
Dor
a557fc7d3c Use getItemInMainHand() 
Add 1.9 blocks to be detected for experience rewards.
Add experience rewards for the Chorus plant.
Add experience rewards for the Shulker mob.
 2016-03-11 16:20:23 +02:00
t00thpick1
272e99d41f Master volume config option 2016-03-06 16:48:56 -05:00
Tslat
5f960fd80a Update ability blacklist to include 1.8 fence[gate] types 2016-03-06 14:36:21 +10:00
t00thpick1
f77ae6ee15 Biome needs to be in the enum compatability as well. 2016-03-01 13:25:51 -05:00
t00thpick1
88b99a3835 I *think* this should be backwards compatible, I may be wrong and it could break both. 2016-03-01 13:08:11 -05:00
t00thpick1
fde9ba86a2 Actually update all sounds 2016-03-01 12:39:05 -05:00
t00thpick1
6a0529f02d Fully remove metrics. 2016-01-28 15:20:36 -05:00
t00thpick1
760178c061 Give custom perk boost the highest priority. 2016-01-28 13:37:21 -05:00
t00thpick1
aa796266a7 Don't remember what this is for, but it was in my repo so its probably important 2015-11-04 13:26:47 -05:00
t00thpick1
bef28583f3 Fix missed compile error. Re-release 1.5.03 2015-07-28 17:48:24 -04:00
t00thpick1
2aade8b7ff Remove no longer needed DualSupport classes, we crossed that road long ago. 2015-07-25 22:29:19 -04:00
TfT_02
90b31a29f5 We can simplify this! 
Didn’t realize there was a event.getBlocks() method for
BlockPistonRetractEvent as well.
 2015-03-22 14:49:51 +01:00
TfT_02
cfa0daefc5 Fix the issues with sticky pistons and slime blocks 
This is a fix for issues #2419 and #2494
 2015-03-21 19:24:06 +01:00
TfT_02
385fe1bb05 Added option for XP gained by killing bred animals 
Fixes #2402
 2015-01-10 12:31:13 +01:00
mjkaufer
9426f44cdd Added isUnarmed Method 
Checks if the player is not holding a tool, as opposed to checking if
the player is holding air. This means that attacking with something such
as a dirt block would count as unarmed.
 2014-12-29 16:31:18 +01:00
TfT_02
eda18bc990 Only show the scoreboard tips a couple of times 
We can assume a player knows how scoreboards work after showing them
the tips a few times across multiple login sessions

Adds #1833
 2014-12-23 14:08:29 +01:00
TfT_02
3ea845cfd9 Changed Flux Mining mechanics 
Previously, Flux Mining would get unlocked at a specified level with a
specified chance. Once unlocked, the player would have no control over
this ability and some players complained they would like to be able to
turn it on and off.

By adding a new furnace recipe, to craft a special pickaxe - a Flux
Pickaxe - this issue is solved. If a player doesn’t want to use Flux
Mining, they simply shouldn’t mine using a Flux Pickaxe.

Crafting a Flux Pickaxe is simple, just place one of the vanilla
pickaxes in a furnace and cook it up.

Every time the ability is successful, extra durability damage is dealt
to the tool. Just like with other abilities.

Adds #2320
 2014-12-22 16:58:22 +01:00
TfT_02
ebeebbde72 Randomize spawn location of Call of the Wild pets 
So that when you’re spawning multiple pets at once, they don’t all
spawn at the same spot.
 2014-12-20 19:14:52 +01:00
t00thpick1
bfff5682b5 As a semi-temporary measure, lets move 1.8 specific objects into their own classes, so we can be 1.7 and 1.8 compatable. 2014-12-19 13:48:06 -05:00
TfT_02
262e711bcc Add option for Chimaera Wings to ignore bed spawns 
Adds #2365
 2014-12-18 23:04:38 +01:00
t00thpick1
8c2f3cff8f Silly me, prismarine isn't an ore. 2014-12-18 14:11:54 -05:00
t00thpick1
32336b712b Quick initial update for 1.8 
Adds default configuration for new blocks and entities.
Updates a few hardcoded utilities to account for new blocks and entities.
 2014-12-18 01:36:02 -05:00
riking
3b441073fd Change PROFILES_PER_REQUEST to 50 
@blood thinks this may fix the 429 issue
 2014-11-18 17:25:03 -08:00
TfT_02
0188629fe2 Should add these to the hash map to prevent a NPE 
Fixes #2333
 2014-10-25 17:33:55 +02:00
TfT_02
8e5340ebc3 Wolves attack a target when shot by their owner 2014-10-11 11:38:53 +02:00
TfT_02
c31281971c Summon amount limits and new ability 2014-10-11 11:38:52 +02:00
TfT_02
eda38cba66 Add lifespan to Taming summons 2014-10-11 11:25:57 +02:00
TfT_02
38cc7435dc Prevent strings from getting larger than 16 chars 
Fixes #2314
 2014-10-04 20:31:37 +02:00
TfT_02
0838cbb874 Add option to not show ability names on scoreboard 
Adds #2249
 2014-10-04 14:05:30 +02:00
riking
332860b9ce Use a DelayQueue to manage rolling diminished returns 2014-09-28 11:34:49 +02:00
NuclearW
f4d1004d32 Rolling xp diminishing returns 
This adds on top of the diminishing returns system a mechanic such that gains will expire the configured number of minutes after they occured, rather than all being reset at once.

This prevents someone from not getting diminishing returns on the xp gain they recieved just before the reset would have occured.

Obligatory explanatory graphs: http://i.imgur.com/uSzicIR.png
 2014-09-28 11:34:49 +02:00
TfT_02
eac5d1ee7a Improve auto mod config generator 2014-08-31 19:10:49 +02:00
TfT_02
087a0b079f Fixed bug with new Death API 2014-08-22 15:50:40 -07:00
TfT_02
a3943aab24 Add checks for loaded/unloaded profiles in commands 2014-08-19 22:23:19 -06:00
TfT_02
f10a1d0ffb Added McMMOPlayerPreDeathPenaltyEvent and McMMOPlayerStatLossEvent 
McMMOPlayerPreDeathPenaltyEvent is fired before hardcore calculations
take place, use this if you want to cancel hardcore penalties.

Use McMMOPlayerVampirismEvent and McMMOPlayerStatLossEvent when you
want to know how many levels or experience the player lost or if you
want to modify this.
 2014-08-16 21:13:46 -06:00
TfT_02
809779e508 Added McMMOPlayerVampirismEvent 
Expands API possibilities regarding death penalty features.
 2014-08-16 21:13:39 -06:00
TfT_02
80d358d1fd Fix dealing too much AOE damage 
Bandaid for #2170
 2014-08-13 21:24:32 -06:00
t00thpick1
f097aa4a67 Missed loaded profile check, Fix #2189 2014-08-07 23:46:22 -04:00
t00thpick1
d857bf483e Fix #2184 2014-08-07 11:23:02 -04:00
t00thpick1
b7774251eb Remove need for thread locks in profile loading, just reschedule as needed. also stagger based on number of previous attempts. 2014-08-05 23:02:41 -04:00
t00thpick1
df4fc8149d Stagger load attempts more. 2014-08-05 19:03:55 -04:00
t00thpick1
432ff95a98 More constants 2014-08-04 11:40:47 -04:00
t00thpick1
857e12b96e SQLDatabaseManager optimizations, async profile loading -t00thpick1, zreed 
This commit changes our shared connection into a connection pool utility to prevent
thread locks from multiple actions attempting to access the database at the same time.
In additon,  profile loading has been moved off the main thread at login time, to
allieviate the performance issues caused by it.

Fixes #2138, Fixes #2119, Fixes #1982, Fixes #1953
 2014-08-01 20:31:17 +02:00
TfT_02
c10525ada9 Add UUID support! - zreed, slipcor, t00thpick1 
This commit updates our database managers to use UUIDs instead
of usernames for persistent storage.

Fixes #1979
 2014-08-01 20:23:03 +02:00
TfT_02
a48ada306c Add magical mod importer 
Usage: Create a folder called 'import' inside /mcMMO/mods/. Place your latest Cauldron 1.7+ startup log in this folder and rename it to 'import.log'.
It is worth noting that it's advisable to create a short log by starting and stopping the server once, or by manually editing the log file to only include material mapping in order to speed up the import process.

When the server is running, use the command /mcimport. You will see the import progress in the console, once it is done the files are created in /mcMMO/mods/output/.

Any item that wasn't recognised gets placed in a .unknown.yml config file. Durability detection only works if the mod is installed when importing (it should be).
 2014-08-01 00:22:29 +02:00
zreed
48c7aa3e84 Add an UpgradeManager 2014-07-23 12:37:02 +02:00
TfT_02
8e3e1d5f11 Use deprecated events for damage dealing for now 2014-07-11 21:33:35 +02:00
TfT_02
d2d70089ca Update for modifierFunctions 2014-07-11 14:02:42 +02:00
TfT_02
daab095557 I was actually using the wrong Map 
Fixes #2113
 2014-07-03 12:33:03 +02:00
TfT_02
2b9b5df1ee Alter original event and stop firing FakeDamageEvents 
Fixes #2105
 2014-07-02 11:28:21 +02:00
TfT_02
e7e62b8d40 SecondaryAbilityEvent now implements Cancellable 
Fire SecondaryAbilityEvent for abilities with static chances

Also cleanup some of the event handling for Armor Impact, Greater
Impact and Fast Food
 2014-07-02 11:25:13 +02:00
TfT_02
3d242bbdb6 Always call back events 2014-07-02 11:25:13 +02:00
TfT_02
e796eae3c3 Update for new damage API 2014-07-02 11:25:08 +02:00
TfT_02
a257e83a62 Update for new getOnlinePlayers behavior 2014-06-29 14:04:36 +02:00
TfT_02
3a8f45a04d Fix bugs with pistons 
This commit improves piston tracking and fixes a couple of bugs with
block tracking.

Fixes #2043
 2014-06-15 14:26:02 +02:00
TfT_02
906609696b Workaround a CB bug by tracking piston events 
There is a bug in Craftbukkit that causes piston events to fire
multiple times. We need to keep track of the extend and retract events
to see which piston events should be processed.
 2014-06-15 14:26:02 +02:00
TfT_02
0185a30ec9 Fix an IndexOutOfBoundsException: Index: 0 
In SaveTimerTask.java

Fixes #2039
 2014-06-08 18:21:13 +02:00
TfT_02
38e1947302 Remove PvpLogger checks 
No longer needed when testing with Combat Tag v6.1.4, the NPCs have
metadata „NPC”.

Fixes #2017
 2014-06-08 18:11:18 +02:00
riking
4fb4d6fc0c Save users asynchronously 2014-06-08 14:12:25 +02:00
TfT_02
3403aef37d Don't display child skills on scoreboards 
This fixes an issue where the scoreboard would not display properly
when using /mcstats or /inspect.

Fixes #2037
 2014-05-23 17:03:02 +02:00
TfT_02
93d63dbca5 Minor cleanup of imports 2014-05-18 17:06:50 +02:00
TfT_02
4643cf1070 A whole bunch of more work to convert Salvage to a child skill 2014-05-18 17:04:39 +02:00
GJ
91bf54019e Convert Salvage to a child skill. 2014-05-18 17:04:38 +02:00
TfT_02
8fec1af257 Fix a bunch of small formatting issues 2014-05-11 15:15:44 +02:00
TfT_02
5825eb1696 Make sure to shorten long ability and skill names 
(cherry picked from commit 236ccd6ebdd0834f87b373794e1597ef36fb2ff6)
 2014-04-21 14:09:52 +02:00
TfT_02
bfebbd0095 Fix formatting 
(cherry picked from commit 4e36073e6e2dc3aeba087d605cef79fc4a8a9779)
 2014-04-21 14:09:41 +02:00
GJ
b204507a82 Use strings instead of OfflinePlayers for scoreboards. 
(cherry picked from commit 89b596591ec1974e0201395dc6e76353e4709572)
 2014-04-21 14:09:09 +02:00
TfT_02
9f53426511 Added API to XP events to get XP gain reason 2014-04-18 22:32:32 +02:00
TfT_02
20092d55fd Fix bug where dodge would check the wrong player 2014-04-18 00:49:40 +02:00
TfT_02
a9488bc18b Vanished players no longer get hit by AoE effects 
Fixes #1964
 2014-04-05 13:12:20 +02:00
t00thpick1
0b4b272223 Account for level 0 2014-04-01 14:58:24 -04:00
TfT_02
e1b8088c17 Improve holiday manager with 1.7 changes 2014-03-29 17:50:29 +01:00
TfT_02
09557e378b Update to the new ProjectileSource API 2014-03-29 17:12:54 +01:00
GJ
60ddd799de Update mcMMO for Minecraft 1.7.2 2014-03-29 17:12:35 +01:00
TfT_02
458dc7db42 Make database command cooldown configurable 2014-03-29 17:02:08 +01:00
TfT_02
beab794c0e Fixed some issues with the HolidayManager 
Was severely lacking more lols
 2014-03-29 16:52:41 +01:00
TfT_02
862d38b587 Clean up all of the imports 2014-03-03 18:27:45 +01:00
GJ
30f7521a3a Handle healthbars even when skills are disabled. Fixes #1194 2014-03-03 10:29:14 -05:00
TfT_02
34d6d867f2 Prevent combat abilities from damaging allied players 2014-02-28 22:08:48 +01:00
TfT_02
e56d5a0454 Exclude vanished players from tab complete list 
Part 2 of fixing #1745
 2014-02-28 21:56:30 +01:00
TfT_02
53fdf750f4 Pretend like the player is offline when he is vanished 
Part 1 of fixing #1745
 2014-02-28 21:56:30 +01:00
GJ
0056be2d5f Assorted cleanup. 2014-02-28 08:36:42 -05:00
TfT_02
c51fde7f1f Added new permission node to control who can check version number 
Negate this permission node to hide the version number from /mcmmo and
motd
 2014-02-17 16:31:59 +01:00
TfT_02
9f9de86d21 The defender isn't necessarily a player here 
Besides, the defender doesn’t need to have the player data key anyways
 2014-02-16 00:11:15 +01:00
t00thpick1
04a02cfdc8 Store McMMOPlayer objects as metadata 2014-02-15 14:21:25 +01:00
TfT_02
a2e32179bb Fix /mcstats command 
Fixes #1819
 2014-02-05 19:24:14 +01:00
GJ
0c9836eb03 Made mod config files modular. Addresses #1802 2014-02-03 14:48:43 -05:00
TfT_02
a1c1271d21 Fix issues pointed out by the FindBugs plugin 2014-01-20 23:20:51 +01:00
GJ
520f5cb116 Fix the broken build. Shame on me. 2014-01-20 14:53:31 -08:00
GJ
43e2c813d1 Clean up some of our messes. 2014-01-20 13:58:40 -08:00
TfT_02
c6ea32f0b0 Added Ender Dragon, Wither, and Witch to combat experience multipliers 
They do not give any XP by default.

Fixes #1763
 2014-01-19 19:40:33 +01:00
TfT_02
82509fb476 Added custom XP boost perk 2014-01-19 01:08:38 +01:00
TfT_02
c27d79cf25 Added new XP perk - 10% boost 
Adds #1698
 2014-01-19 01:08:37 +01:00
TfT_02
b460f7a564 Add more debug messages in onDisable() 
So that we can track down why the disable proces slows down
 2014-01-18 16:59:16 +01:00
TfT_02
818962e668 Added party levels 
Parties now have XP and Levels. Party features such as party teleport and party chat have to be unlocked before they can be used by the party members
 2014-01-17 18:56:27 +01:00
Eric Hildebrand
8f83e328b0 Introduction of new Alchemy skill! 2014-01-16 22:32:40 +01:00
TfT_02
b4a6ecc58c Abstract HolidayManager a little more 
Now we don’t have to manually edit this each year.
 2014-01-12 12:08:47 +01:00
TfT_02
103bf593f3 Check null here as well 
Fixes #1664
 2014-01-12 10:30:04 +01:00
Sean Porter
cc524bb2ab Map.remove() can return Null. 2014-01-09 22:52:25 -08:00
GJ
13a623ea1f Misc was getting crowded again. 2014-01-03 11:07:13 -05:00