1249 Commits

Author SHA1 Message Date
nossr50
cf245b02a5 WIP of reworking classes involved in querying data, also some work done to the party code rewrite 2020-10-15 16:19:47 -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
3fd5cd03ee Blocks that have double drops enabled are also worth marking 2020-09-21 21:29:21 -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
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
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
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
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
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
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
ae5ee8957c Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-06 19:02:18 -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
nossr50
d80c275abb Part 1 of reworking ability tools 2020-08-01 14:42:38 -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
a82b899eb6 Add some missing things for new skill commands 2020-07-29 10:22:18 -07:00
nossr50
f390e6a78a Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-29 08:20:08 -07:00