Commit Graph

4882 Commits

Author SHA1 Message Date
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
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