Commit Graph

6334 Commits

Author SHA1 Message Date
d7099a69d8 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-09-10 15:13:07 -07:00
621ccfed34 minor nms tweak 2020-09-08 19:38:35 -07:00
4d8a57d119 upstream changes 2020-09-08 19:19:36 -07:00
9e5c9ec567 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-09-01 13:40:01 -07:00
2810d36e08 2.1.145 2020-08-26 10:45:53 -07:00
973279cdb7 Revert listener behaviour for PlayerInteractEvent 2020-08-26 10:26:50 -07:00
480f9afa80 2.1.144 2020-08-25 16:49:50 -07:00
419a810a1e Steel Arm Style can now be customized in advanced.yml 2020-08-25 16:28:21 -07:00
e4c5a3b8ee two deflect bugs down 2020-08-25 16:14:08 -07:00
56abad5360 Fixed a bug where Roll didn't award XP at great heights 2020-08-25 14:53:06 -07:00
bfa092a67c add fuel efficiency info for mmodebug 2020-08-25 14:33:31 -07:00
e3f21195c8 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-08-25 14:13:06 -07:00
f684b09276 brain no worky today 2020-08-25 14:11:43 -07:00
8807d6c216 Fixed a taming NPE 2020-08-25 14:11:26 -07:00
b0e8fedf6f Fixed a taming NPE 2020-08-25 14:10:53 -07:00
17137f3a08 Update SQL Queries + SQL DB Schema 2020-08-20 21:24:48 -07:00
642a351bb5 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-20 17:30:21 -07:00
b35c58ec21 Update locale_hu_HU.properties (#4264) 2020-08-20 12:46:09 -07:00
b8a38bf975 small tweak 2020-08-18 21:16:48 -07:00
500ab628dd 2.1.143 2020-08-18 21:11:15 -07:00
1feee7f312 1.13.2 fix round 3.. or 4 2020-08-18 20:38:56 -07:00
7ea9ec5c2f Another 1.13.2 fix 2020-08-18 20:28:09 -07:00
e5f1738168 1.13.2 related bugfixes for the new item tracking 2020-08-18 20:28:02 -07:00
557cfe3944 Some bugfixes to the new ability tool tracking 2020-08-18 19:47:15 -07:00
a7ded7e982 super boosted items are now tracked differently 2020-08-18 18:41:31 -07:00
59f52f6e7e 2.1.142 2020-08-17 23:36:47 -07:00
c6b2cba007 Reworked Iron Arm Style into Steel Arm Style which scales over 20 ranks 2020-08-17 23:32:13 -07:00
daada1a643 Refactoring a bunch of stuff, more refactoring to come 2020-08-17 21:15:27 -07:00
0e9e1f5133 A lot of spaghetti relating to player state has been moved into new managers 2020-08-17 21:12:16 -07:00
3b0b3d7eb0 DirtyData type automatically marks data as dirty when modified 2020-08-17 21:10:29 -07:00
2ae70dddaa Immutable Player Data involved in saving moved into its own class 2020-08-17 21:09:11 -07:00
6d5e38bec2 Updating FlatFile schema for the new data 2020-08-17 21:07:30 -07:00
9a0c9f36a8 Moved all persistent player data into its own class 2020-08-17 21:03:07 -07:00
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
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
1d950be7e4 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-11 20:44:13 -07:00
a2f2614b10 2.1.141 2020-08-11 16:13:28 -07:00
8ca6ef5782 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-08 22:11:19 -07:00
e890d4bae6 2.1.140 2020-08-08 21:16:06 -07:00
9038abac8f Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-08 19:37:04 -07:00
3a035e234a Scoreboards fixes 2020-08-08 15:56:53 -07:00
0f1bfc4141 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-07 11:52:39 -07:00
771ed9a8b4 oopsie 2020-08-07 11:50:44 -07:00
d6ff1348eb Polish locale woodcutting rename 2020-08-07 11:49:12 -07:00
ae5ee8957c Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-06 19:02:18 -07:00
8df15a4e55 dev mode 2020-08-06 19:01:36 -07:00
4a4fd9fb75 2.1.139 2020-08-06 18:50:24 -07:00
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
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
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