Commit Graph

5060 Commits

Author SHA1 Message Date
nossr50
bc71f586d7 Messy fix for now, code cleanup will happen later 2020-10-12 12:50:18 -07:00
nossr50
29722511b7 new config persistentdata.yml 2020-10-12 12:40:54 -07:00
nossr50
916eb76553 2.1.148 2020-10-08 19:30:36 -07:00
nossr50
80f910fc67 Add setting for enable/disable triple drops on super breaker 2020-10-08 19:21:39 -07:00
nossr50
d4699c0e20 Add player tamed experience multiplier 2020-10-08 19:14:44 -07:00
nossr50
80c89fe1e5 Revert this change for now 2020-10-08 19:07:42 -07:00
nossr50
f5294387b0 oopsy 2020-10-08 16:34:59 -07:00
nossr50
20c69b63af Memory leak fixes, optimizations, and persistence 2020-10-08 15:25:40 -07:00
nossr50
0767e62965 Only ignore 0 dmg if specific plugins are detected 2020-10-05 14:52:49 -07:00
nossr50
a6586e07cc final damage values of 0 are only ignored in certain circumstances, fixes a few bugs 2020-10-05 14:14:49 -07:00
nossr50
ee17707c6c Alchemy progression through ranks improved 2020-09-30 13:12:28 -07:00
nossr50
9e450adb0b reworking party code 2020-09-30 13:04:35 -07:00
nossr50
e057dfc482 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-09-30 11:35:03 -07:00
nossr50
c675c36601 adventure api update 2020-09-30 11:34:01 -07:00
nossr50
790ac99aa4 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-09-30 11:33:00 -07:00
nossr50
4005c21810 2.1.147 2020-09-28 17:36:33 -07:00
nossr50
8451f84083 dev mode 2020-09-25 11:36:42 -07:00
nossr50
6f99940540 Add missing includes 2020-09-25 10:40:26 -07:00
Riley Park
02fe8addb7 adventure 2020-09-24 17:57:04 -07:00
nossr50
0b20fc2c16 Some tweaks to tracking blocks as unnatural 2020-09-21 21:36:24 -07:00
nossr50
3fd5cd03ee Blocks that have double drops enabled are also worth marking 2020-09-21 21:29:21 -07:00
nossr50
959a74b139 Temporarily mark debarked wood as unnatural (will undo later) 2020-09-21 21:27:17 -07:00
nossr50
f496d795fb Always track blocks in BlockMultiPlaceEvent 2020-09-21 21:23:10 -07:00
nossr50
d4ab829812 Mark blocks always in BlockPlaceEvent 2020-09-21 21:20:53 -07:00
nossr50
934ba24b17 Applying the new design to DirtySet (formerly DirtyDataSet) as well 2020-09-17 18:46:30 -07:00
nossr50
0bfb3b23b6 DirtyMap (renamed from DirtyDataMap) treated as the map instead of a container 2020-09-17 18:26:46 -07:00
nossr50
5aaa749907 DirtyDataMap implements Map 2020-09-17 18:06:18 -07:00
nossr50
6f6f76532e Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-09-17 17:13:30 -07:00
nossr50
86fdafef08 More work on parties 2020-09-17 17:12:34 -07:00
nossr50
3badc26806 Hardcore mode won't bring players below level threshold anymore 2020-09-16 20:09:59 -07:00
nossr50
11c29c8299 silly git stash requirements 2020-09-10 15:56:50 -07:00
nossr50
d7099a69d8 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-09-10 15:13:07 -07:00
nossr50
621ccfed34 minor nms tweak 2020-09-08 19:38:35 -07:00
nossr50
4d8a57d119 upstream changes 2020-09-08 19:19:36 -07:00
nossr50
9e5c9ec567 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-09-01 13:40:01 -07:00
nossr50
973279cdb7 Revert listener behaviour for PlayerInteractEvent 2020-08-26 10:26:50 -07:00
nossr50
480f9afa80 2.1.144 2020-08-25 16:49:50 -07:00
nossr50
419a810a1e Steel Arm Style can now be customized in advanced.yml 2020-08-25 16:28:21 -07:00
nossr50
e4c5a3b8ee two deflect bugs down 2020-08-25 16:14:08 -07:00
nossr50
56abad5360 Fixed a bug where Roll didn't award XP at great heights 2020-08-25 14:53:06 -07:00
nossr50
bfa092a67c add fuel efficiency info for mmodebug 2020-08-25 14:33:31 -07:00
nossr50
f684b09276 brain no worky today 2020-08-25 14:11:43 -07:00
nossr50
8807d6c216 Fixed a taming NPE 2020-08-25 14:11:26 -07:00
nossr50
17137f3a08 Update SQL Queries + SQL DB Schema 2020-08-20 21:24:48 -07:00
nossr50
642a351bb5 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-20 17:30:21 -07:00
András Marczinkó
b35c58ec21
Update locale_hu_HU.properties (#4264) 2020-08-20 12:46:09 -07:00
nossr50
b8a38bf975 small tweak 2020-08-18 21:16:48 -07:00
nossr50
500ab628dd 2.1.143 2020-08-18 21:11:15 -07:00
nossr50
1feee7f312 1.13.2 fix round 3.. or 4 2020-08-18 20:38:56 -07:00
nossr50
7ea9ec5c2f Another 1.13.2 fix 2020-08-18 20:28:09 -07:00
nossr50
e5f1738168 1.13.2 related bugfixes for the new item tracking 2020-08-18 20:28:02 -07:00
nossr50
557cfe3944 Some bugfixes to the new ability tool tracking 2020-08-18 19:47:15 -07:00
nossr50
a7ded7e982 super boosted items are now tracked differently 2020-08-18 18:41:31 -07:00
nossr50
c6b2cba007 Reworked Iron Arm Style into Steel Arm Style which scales over 20 ranks 2020-08-17 23:32:13 -07:00
nossr50
daada1a643 Refactoring a bunch of stuff, more refactoring to come 2020-08-17 21:15:27 -07:00
nossr50
0e9e1f5133 A lot of spaghetti relating to player state has been moved into new managers 2020-08-17 21:12:16 -07:00
nossr50
3b0b3d7eb0 DirtyData type automatically marks data as dirty when modified 2020-08-17 21:10:29 -07:00
nossr50
2ae70dddaa Immutable Player Data involved in saving moved into its own class 2020-08-17 21:09:11 -07:00
nossr50
6d5e38bec2 Updating FlatFile schema for the new data 2020-08-17 21:07:30 -07:00
nossr50
9a0c9f36a8 Moved all persistent player data into its own class 2020-08-17 21:03:07 -07:00
nossr50
58432ce80e McMMOPlayer & PlayerProfile redesigned
This is part 1 of a huge refactor, I'm going to be separating this refactor into a few commits for a cleaner history.
2020-08-17 20:40:31 -07:00
Frank van der Heijden
dca2661ccb
Don't set double drop if result is already a full stack (#4263)
Thanks, merging because I can't think of anything bad that would result from this change.
2020-08-17 14:21:09 -07:00
nossr50
1d950be7e4 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-11 20:44:13 -07:00
nossr50
a2f2614b10 2.1.141 2020-08-11 16:13:28 -07:00
nossr50
9038abac8f Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-08 19:37:04 -07:00
nossr50
3a035e234a Scoreboards fixes 2020-08-08 15:56:53 -07:00
nossr50
0f1bfc4141 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-07 11:52:39 -07:00
nossr50
771ed9a8b4 oopsie 2020-08-07 11:50:44 -07:00
nossr50
d6ff1348eb Polish locale woodcutting rename 2020-08-07 11:49:12 -07:00
nossr50
ae5ee8957c Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-06 19:02:18 -07:00
emanondev
38017cabe7
fixed /mmoinfo roll (#4088)
* acrobatics roll mmoinfo fixes

LocaleLoader#getString() accepts Object arrays no need to call getStats twice

Max skill level is now configurable and so halfMaxSkillValue is now a variable which should be used on locale too instead of "50"

* Updated locale_it

Acrobatics.SubSkill.Roll.Mechanics supports half level variable instead of static level 50

* Updated locale_en_US

Acrobatics.SubSkill.Roll.Mechanics supports half level variable instead of static level 50

* Updated Locale it

fixed value
2020-08-06 18:46:12 -07:00
Flannery Lue Moore
375292c0b3
PR for gilded blackstone and nether gold ore to the mining skill, and nether gold ore to the smelting skill. (#4253)
* Added gilded blackstone and nether gold ore.

* Added nether gold ore to smelting xp.
2020-08-06 15:22:48 -07:00
t00thpick1
01f111f78d Switch to countdown latch so we don't need to bother with synchronization blocks. Fixes #4248 2020-08-02 12:56:27 -04:00
nossr50
d80c275abb Part 1 of reworking ability tools 2020-08-01 14:42:38 -07:00
Robert Alan Chapton
7828437414
Merge pull request #4235 from kn-km/patch-1
Fix McMMOPlayerSalvageCheckEvent Handling
2020-07-31 20:43:44 -07:00
Robert Alan Chapton
0dba450b5a
Merge pull request #4236 from kn-km/patch-2
Fix McMMOPlayerRepairCheckEvent Handling
2020-07-31 20:43:01 -07:00
nossr50
916a747f88 More work on new super abilities 2020-07-31 19:41:28 -07:00
nossr50
ea2e2bdc9a More cleanup on ability activation handling 2020-07-31 17:41:43 -07:00
nossr50
03f1733387 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-30 19:24:20 -07:00
nossr50
df7c9e0b1c SuperAbilityManager will handle super ability stuff 2020-07-30 19:23:10 -07:00
nossr50
a05c015732 Fix Netherite not working for certain skills (like Skull Splitter) 2020-07-30 16:12:50 -07:00
nossr50
2020fdd4ea Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-30 13:18:20 -07:00
nossr50
9f9518eea0 2.1.137 - avoid npe on armor iterating 2020-07-30 13:05:19 -07:00
nossr50
9266a54fce debug tweaks 2020-07-30 11:17:08 -07:00
nossr50
2c64eadafa command tweaks for xbow 2020-07-29 10:42:38 -07:00
nossr50
93eba8da2b more work on new skill commands 2020-07-29 10:25:16 -07:00
nossr50
a82b899eb6 Add some missing things for new skill commands 2020-07-29 10:22:18 -07:00
nossr50
8112973dbe Renamed Cone of Death to Super Shotgun 2020-07-29 10:05:12 -07:00
nossr50
f390e6a78a Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-29 08:20:08 -07:00
nossr50
270298c265 2.1.136 2020-07-29 07:41:47 -07:00
nossr50
38122d8f17 Furnace ownership tweaks 2020-07-28 21:56:51 -07:00
nossr50
3ca06f2518 More work on xbows 2020-07-28 18:17:57 -07:00
nossr50
515d58f04f Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-27 21:53:12 -07:00
nossr50
8e3d203594 only cleanup furnaces without a job 2020-07-27 21:34:47 -07:00
nossr50
4169dceca8 debug tweak for furnaces 2020-07-27 21:20:03 -07:00
nossr50
567a5461e1 Add some more mmodebug related to furnaces 2020-07-27 21:19:25 -07:00
nossr50
9eade9abc7 placeholder xbow code 2020-07-27 21:11:07 -07:00
kn-km
ed9521d4a0
Fix #4234 2020-07-27 23:18:55 +08:00
kn-km
5d294d6dc3
Fix #4234 2020-07-27 22:55:44 +08:00
srbedrock
2eb924d433
Update CommandRegistrationManager.java 2020-07-26 22:04:43 -03:00
srbedrock
c97dc4181d
Update CommandRegistrationManager.java 2020-07-26 22:01:30 -03:00
nossr50
e0cf66c421 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-26 05:08:49 -07:00
Robert Alan Chapton
65a95addb9
Merge pull request #4230 from Ineusia/AbilityNotificatioons
Add option to disable other-player ability notifications
2020-07-25 14:26:08 -07:00
Ineusia
353fb80957 Use localized names for SuperAbility names 2020-07-25 12:13:54 -05:00
Ineusia
5298472c90 Add option to disable other-player ability notifications 2020-07-25 11:10:01 -05:00
Robert Alan Chapton
1df2225aa2
Merge pull request #4229 from Ineusia/issue-4224
Handle Fishing Event even if FishingExploitFix is set to false
2020-07-25 08:38:04 -07:00
nossr50
3ae1b5e987 Don't simulate block breaks when assigning furnace ownership 2020-07-25 08:37:19 -07:00
Ineusia
054c023330 Handle Fishing Event even if FishingExploitFix is set to false 2020-07-25 10:36:34 -05:00
nossr50
3ed0bd6be4 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-07-23 20:59:56 -07:00
nossr50
35cde870ff Reworked a lot of stuff to do with Smelting 2020-07-23 20:59:34 -07:00
Ulrich Fink
16d7b51497
Fix brewing stand not consuming items
Fixes #4225
Negation in commit fdd951f1f1 is faulty.
2020-07-21 22:49:32 +02:00
nossr50
f6c7049cac Furnaces can now change owners during server lifespan for Smelting XP 2020-07-13 13:16:47 -07:00
nossr50
fdd951f1f1 Second Smelt makes use of its own section in Bonus Drops in config.yml
Co-authored-by: t00thpick1 <t00thpick1dirko@gmail.com>
2020-07-13 12:31:30 -07:00
nossr50
7eae59a0b3 Misc code fixes 2020-07-13 11:39:03 -07:00
nossr50
428c093ae4 UUID updater changes + locale fixes
Co-authored-by: t00thpick1 <t00thpick1dirko@gmail.com>
2020-07-13 11:18:16 -07:00
nossr50
ded7fd5bdf Potion NPE fix 2020-07-13 10:53:36 -07:00
nossr50
49a1a8916b Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-13 07:49:59 -07:00
nossr50
7eef87b2e0 Turn off unused NMS compatibility layers 2020-07-13 07:39:16 -07:00
nossr50
235fb937a2 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-07-13 07:29:07 -07:00
nossr50
039eb0ee9e Fix array out of bounds 2020-07-13 07:28:50 -07:00
Robert Alan Chapton
99f12fe0ed
Merge pull request #4195 from Draycia/master
Don't ready hand when player can't use skill
2020-07-13 07:27:33 -07:00
nossr50
c46f2534b8 Some work on craftable tridents 2020-07-13 07:23:28 -07:00
Frank van der Heijden
7f1944b61d
Update regex to also match colorless healthbar instances 2020-07-13 15:33:22 +02:00
nossr50
5ed415e453 Further separate crossbows from bows 2020-07-10 20:17:37 -07:00
Elikill58
59552f42d7
Update french translation - end of translation 2020-07-09 23:48:19 +02:00
nossr50
7543d8be12 Initial work on crossbows 2020-07-07 15:00:56 -07:00
nossr50
cf6af4630d proper InventoryClickEvent array index fix 2020-07-07 13:52:20 -07:00
nossr50
bb167b00eb Array out of index fix 2020-07-07 08:56:33 -07:00
nossr50
d578b7322a Smelting makes use of bonus drops for Second Smelt now
Co-authored-by: t00thpick1 <t00thpick1dirko@gmail.com>
2020-07-07 08:52:31 -07:00
nossr50
ae82571c56 sub-skill instead of ability 2020-07-07 08:41:54 -07:00
nossr50
5cd1419b21 some work on limit break for tridents/xbows 2020-07-07 08:34:59 -07:00
Elikill58
005f8c5478
Update french translation - begin with skills 2020-07-07 15:50:47 +02:00
nossr50
ea448dfa47 tridents/xbows WIP part 1 2020-07-06 20:44:10 -07:00
nossr50
7267b1501b Why did I use contains() :thonk: 2020-07-03 13:16:17 -07:00
nossr50
f05c4121d2 Temporary Spigot bug fix 2020-07-03 13:14:33 -07:00
nossr50
2fc1ba44d8 Oopsie 2020-07-02 21:06:19 -07:00
nossr50
900a534edb Inventory NPE fix 2020-07-02 21:04:06 -07:00
nossr50
254e1a1071 2.1.131 2020-06-30 11:51:46 -07:00
nossr50
75f404f387 Wire missing NMS 2020-06-30 11:35:36 -07:00
nossr50
420477149e Add Piglin Brute XP 2020-06-30 11:15:10 -07:00
nossr50
78eb367b86 Repair / Salvage fixes 2020-06-30 10:03:37 -07:00
nossr50
b0ce6fb170 Missing permission nodes + missing repair XP 2020-06-30 09:35:47 -07:00
nossr50
4638f22ade Missing 1.16 bonus drop entries 2020-06-30 09:17:48 -07:00
nossr50
ed69f843aa 2.1.130 2020-06-26 15:04:03 -07:00
nossr50
6b340838ee Use the correct default repair material for netherite gear 2020-06-26 15:00:52 -07:00
nossr50
cf78b51052 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-06-26 14:45:52 -07:00
nossr50
dab255254c Automatic spelling mistake correction on repair/salvage configs for
previously misspelled netherite materials
2020-06-26 14:45:26 -07:00
nossr50
83617b73b7 Fix repair 2020-06-24 23:39:14 -07:00
darbyjack
dd011c94c6
Implemented PlayerItemDamageEvent on TreeFeller 2020-06-22 17:10:29 -05:00
nossr50
36d0df1c54 Add Redstone Dust to bonus drops 2020-06-22 03:01:28 -07:00