Commit Graph

6335 Commits

Author SHA1 Message Date
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
d80c275abb Part 1 of reworking ability tools 2020-08-01 14:42:38 -07:00
d1b7e88b7e Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-07-31 20:47:01 -07:00
c85ca2e2ca Dev mode 2020-07-31 20:46:52 -07:00
7828437414 Merge pull request #4235 from kn-km/patch-1
Fix McMMOPlayerSalvageCheckEvent Handling
2020-07-31 20:43:44 -07:00
0dba450b5a Merge pull request #4236 from kn-km/patch-2
Fix McMMOPlayerRepairCheckEvent Handling
2020-07-31 20:43:01 -07:00
916a747f88 More work on new super abilities 2020-07-31 19:41:28 -07:00
ea2e2bdc9a More cleanup on ability activation handling 2020-07-31 17:41:43 -07:00
03f1733387 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-30 19:24:20 -07:00
df7c9e0b1c SuperAbilityManager will handle super ability stuff 2020-07-30 19:23:10 -07:00
d490f4fd60 2.1.138 2020-07-30 16:28:47 -07:00
a05c015732 Fix Netherite not working for certain skills (like Skull Splitter) 2020-07-30 16:12:50 -07:00
2020fdd4ea Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-30 13:18:20 -07:00
9f9518eea0 2.1.137 - avoid npe on armor iterating 2020-07-30 13:05:19 -07:00
9266a54fce debug tweaks 2020-07-30 11:17:08 -07:00
2c64eadafa command tweaks for xbow 2020-07-29 10:42:38 -07:00
93eba8da2b more work on new skill commands 2020-07-29 10:25:16 -07:00
a82b899eb6 Add some missing things for new skill commands 2020-07-29 10:22:18 -07:00
8112973dbe Renamed Cone of Death to Super Shotgun 2020-07-29 10:05:12 -07:00
f390e6a78a Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-29 08:20:08 -07:00
270298c265 2.1.136 2020-07-29 07:41:47 -07:00
38122d8f17 Furnace ownership tweaks 2020-07-28 21:56:51 -07:00
3ca06f2518 More work on xbows 2020-07-28 18:17:57 -07:00
515d58f04f Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-27 21:53:12 -07:00
274a41f530 update changelog 2020-07-27 21:39:26 -07:00
8e3d203594 only cleanup furnaces without a job 2020-07-27 21:34:47 -07:00
4169dceca8 debug tweak for furnaces 2020-07-27 21:20:03 -07:00
567a5461e1 Add some more mmodebug related to furnaces 2020-07-27 21:19:25 -07:00
9eade9abc7 placeholder xbow code 2020-07-27 21:11:07 -07:00
70c934fa69 Merge pull request #4233 from SrBedrock/patch-1
Update CommandRegistrationManager.java
2020-07-27 20:26:26 -07:00
ed9521d4a0 Fix #4234 2020-07-27 23:18:55 +08:00
5d294d6dc3 Fix #4234 2020-07-27 22:55:44 +08:00
2eb924d433 Update CommandRegistrationManager.java 2020-07-26 22:04:43 -03:00
c97dc4181d Update CommandRegistrationManager.java 2020-07-26 22:01:30 -03:00
e0cf66c421 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-26 05:08:49 -07:00
a28d1cd537 2.1.135 2020-07-25 14:27:31 -07:00
65a95addb9 Merge pull request #4230 from Ineusia/AbilityNotificatioons
Add option to disable other-player ability notifications
2020-07-25 14:26:08 -07:00
81b31e49b8 Merge pull request #4231 from Ineusia/issue-4221
Use localized names for SuperAbility names
2020-07-25 14:25:36 -07:00
353fb80957 Use localized names for SuperAbility names 2020-07-25 12:13:54 -05:00
5298472c90 Add option to disable other-player ability notifications 2020-07-25 11:10:01 -05:00
36af6d2478 update changes 2020-07-25 08:40:20 -07:00
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
3ae1b5e987 Don't simulate block breaks when assigning furnace ownership 2020-07-25 08:37:19 -07:00
054c023330 Handle Fishing Event even if FishingExploitFix is set to false 2020-07-25 10:36:34 -05:00
2910240942 2.1.134 2020-07-23 21:16:58 -07:00
3ed0bd6be4 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-07-23 20:59:56 -07:00
35cde870ff Reworked a lot of stuff to do with Smelting 2020-07-23 20:59:34 -07:00
efcb2d0c14 Merge pull request #4226 from Durburz/master
Fix brewing stand not consuming items
2020-07-22 13:39:41 -07:00
16d7b51497 Fix brewing stand not consuming items
Fixes #4225
Negation in commit fdd951f1f1 is faulty.
2020-07-21 22:49:32 +02:00
f6c7049cac Furnaces can now change owners during server lifespan for Smelting XP 2020-07-13 13:16:47 -07:00