EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 06:06:45 +01:00
Code Issues Projects Releases Wiki Activity
6,124 Commits 48 Branches 45 Tags 34 MiB
d9f98b1aa9
Commit Graph

4423 Commits

Author SHA1 Message Date
nossr50
c6b2cba007 Reworked Iron Arm Style into Steel Arm Style which scales over 20 ranks 2020-08-17 23:32:13 -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
a2f2614b10 2.1.141 2020-08-11 16:13:28 -07:00
nossr50
3a035e234a Scoreboards fixes 2020-08-08 15:56:53 -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
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
a05c015732 Fix Netherite not working for certain skills (like Skull Splitter) 2020-07-30 16:12:50 -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
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
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
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
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
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
Frank van der Heijden
7f1944b61d
Update regex to also match colorless healthbar instances 2020-07-13 15:33:22 +02: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
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
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
795b1ffff5 Ignore soul campfires when activating abilities 2020-06-22 02:32:45 -07:00
nossr50
3fe0b44ce8 Add respawn anchors to blacklist 2020-06-22 02:28:56 -07:00
nossr50
c60fbf1761 Add lodestone to ability / tool blacklists 2020-06-22 02:25:41 -07:00
Draycia
23cf9edf9c Don't handle activation when player can't use skill 2020-05-27 01:17:10 -07:00
nossr50
899a0152ba Add /mmoxpbar disable 2020-05-06 09:19:17 -07:00
nossr50
dce9a3b58d More Blast Mining bugfixes 2020-05-05 20:28:37 -07:00
nossr50
ede5b3fd31 Blast Mining debris yield bugfix 2020-05-05 20:15:46 -07:00
nossr50
402283806d Database choice is now logged 2020-05-05 19:51:53 -07:00
nossr50
fe2b7a8d61 Add ExperienceAPI::addCombatXP 2020-05-05 19:45:56 -07:00
nossr50
15e4dbfd92 Another oopsie 2020-05-05 19:32:22 -07:00
nossr50
d1116418be whoops 2020-05-05 19:30:26 -07:00
nossr50
9f455f5a0d Fix some locale errors 2020-05-05 19:23:55 -07:00
nossr50
c5ce7bd23b Revert blast mining nerf 2020-05-05 19:19:20 -07:00
nossr50
74f8c2901d Iron Arm Rank 1 Nerf 2020-05-05 19:08:55 -07:00
nossr50
d023b89189 Declare p right away 2020-05-01 14:43:48 -07:00
nossr50
7114ff02e5 Fix compile issue 2020-05-01 14:38:58 -07:00
Robert Alan Chapton
53c5fb7328
Merge pull request #4152 from FlXME/master 
Fix various bugs
 2020-05-01 14:29:35 -07:00
draycia
25389429ae Don't use the Logger here 2020-04-29 01:14:55 -07:00
draycia
6c5f438099 Use logger instead of sysout 2020-04-29 01:06:53 -07:00
nossr50
239200a3d2 child skills can have their xp bars turned on 2020-04-28 13:47:33 -07:00
nossr50
07b838db0f 2.1.126 2020-04-27 19:31:22 -07:00
nossr50
666729cadc Localize more things 2020-04-27 19:13:24 -07:00
nossr50
92c4ddce87 NPE fix 2020-04-27 19:09:37 -07:00
nossr50
2325c4eb6b New Command mmoxpbar 2020-04-27 19:01:40 -07:00
nossr50
34fe19e35c Less verbose unsupported material warnings 2020-04-27 17:28:27 -07:00
nossr50
145b2432e0 Combat fix 2020-04-27 17:04:01 -07:00
Mads U. Jensen
76536f0a18
Update EntityListener.java (#4169) 
Remove debug broadcasts
 2020-04-25 18:32:39 +01:00
nossr50
5984230bf3 CompatibilityLayer framework 2020-04-24 20:21:21 -07:00
Josh Taylor
4a5bcaa92d
Fix fishing exploit prevention 2020-04-16 05:44:26 +01:00
Shane Freeder
3a4de97c9b
Always use localized names for skills, vs just non-english 2020-04-14 02:53:44 +01:00
Felix Bergmann
69a4ec80cd
Fix resource leak on exception 
When an exception is hit in the try statement, the readers will never get closed and leak resources
 2020-04-07 10:02:22 +02:00
Felix Bergmann
877ef15374
Close resources in UUIDFetcher 
Resource leak by not closing the InputStreamReader
 2020-04-07 09:54:57 +02:00
Felix Bergmann
8dc955542d
Introduce buffering in HashChunkletManager 
Improve the performance by introducing buffering. The current usage of FileInputStream and ObjectInputStream don't use buffering.
 2020-04-07 09:45:18 +02:00
Felix Bergmann
bffabb4a05
Fix BlockStoreConversion bug on folder check 
If dataDir.exists() is true, dataDir.isDirectory() will always also be true. You probably wanted to check whether it is a folder.
This bug could lead to a critical bug when a file with the name of the folder exists.
 2020-04-07 09:27:28 +02:00
Shane Freeder
3c272a3e31
register a valid skill for AprilCommand (Fixes #4147) 2020-04-01 14:41:53 +01:00
Shane Freeder
9c342f24cd
Fix NPE from unloaded profiles in HolidayManager 2020-04-01 14:40:29 +01:00
nossr50
e8021e81e6 move namefix to monitor 2020-03-21 20:24:40 -07:00
nossr50
296d8ee7c1 nothing to see here Kappa Keepo 2020-03-19 19:04:15 -07:00
nossr50
8d7f1cb595 Fixed not being able to place blocks on top of certain repair/salvage 
anvils
 2020-03-19 19:00:50 -07:00
nossr50
42952dc420 repair/salvage anvils will override vanilla functions of a block 2020-03-18 19:44:27 -07:00
nossr50
f8dbace9f0 add comment 2020-03-17 16:00:32 -07:00
nossr50
fd1b1fe124 treat new vines as multi block plants 2020-03-11 17:52:35 -07:00
Shane Freeder
1bd4454a6b
Show correct minimum level in adept salvage message 2020-03-07 23:20:18 +00:00
nossr50
8f8dfcf556 Update ability black lists 2020-03-03 22:32:24 -08:00
nossr50
ce1051c364 2.1.122 2020-03-03 22:24:35 -08:00
nossr50
3aa9f385e5 Wart blocks are now treated like leaves 2020-03-03 22:09:57 -08:00
nossr50
ff8c94bf44 2.1.121 2020-03-03 18:14:56 -08:00
nossr50
325cbcad9d 2.1.120 2020-03-03 17:52:02 -08:00
nossr50
3a81d94b32 1.16 support part 5 2020-03-03 17:14:57 -08:00
nossr50
89a990f0cb Another dupe fix + 1.16 support part 4 2020-03-03 16:37:13 -08:00
nossr50
d585b1c2f7 1.16 support part 3 2020-03-02 14:52:51 -08:00
nossr50
1101815f18 1.16 Support part 2 2020-02-28 16:44:37 -08:00
nossr50
12abd68add Rupture fires a FakeEntityDamageByEntityEvent fixes #4122 2020-02-28 15:43:32 -08:00
nossr50
326ff1cd70 Update blast mining info in /mining 2020-02-28 15:27:57 -08:00
nossr50
9f0fe26778 Blast Mining Tweaks 2020-02-27 12:45:35 -08:00
nossr50
441125dbd1 2.1.117 2020-02-27 07:36:41 -08:00
Shane Freeder
d4ba9d7605
Reduce mojang profile API call limit (Fixes #4121) 2020-02-22 11:12:52 +00:00
nossr50
4cd91350db 2.1.116 2020-02-20 17:35:33 -08:00
nossr50
6168309ec9 2.1.115 2020-02-19 17:41:47 -08:00
nossr50
95c403a467 More tweaks to GT 2020-02-19 17:31:00 -08:00
nossr50
a598796c99 More tweaks to GT 2020-02-19 17:20:05 -08:00
nossr50
a333f36fd8 Fix sneak check on GT 2020-02-19 16:19:19 -08:00
nossr50
7c6d5c476d Green Thumb requires a hoe, sneak to break with a hoe 2020-02-19 16:14:21 -08:00
nossr50
e2073ff9f7 Immature crop replanting, green thumb tweaks, replant accidental break 
protection
 2020-02-19 15:58:53 -08:00
nossr50
8f26544188 Immature plants will be replanted if weilding a hoe 2020-02-19 13:51:10 -08:00
nossr50
4e21f1a200 tweak and fix salvage result chance 2020-02-19 13:27:21 -08:00
nossr50
ab6dbe306d Fix potential NPE for salvage 2020-02-19 11:38:48 -08:00
Shane Freeder
4f161812aa
Use minimum level of salvagable properly 2020-02-09 22:47:20 +00:00
Shane Freeder
11ca0d9ff1
Fix 1.13.x archery compat 2020-02-04 23:36:54 +00:00
Shane Freeder
4eef4a3e41
Fix CCE from spectral arrows (Fixes #4114) 2020-02-04 23:29:51 +00:00
Shane Freeder
816b64cb70
Track spectral arrows for combat 2020-01-28 16:37:02 +00:00
Shane Freeder
dceee5554d
Fix CombatUtils NPE due to arrows from unloaded players 2020-01-28 16:33:30 +00:00
nossr50
ea70c937f2 Fix rank for new versions of MySQL 2020-01-27 18:45:19 -08:00
Shane Freeder
550a3df616
place SnowGolemExcavation exploit fix under the correct section 2020-01-28 00:12:50 +00:00
apachezy
657abb76a7 "EndermanEndermiteFarms" does not work. (#4111) 
This error causes the "ExploitFix.EndermanEndermiteFarms" option in ExperienceConfig to not work.
 2020-01-28 00:11:57 +00:00
Shane Freeder
0ffcff53b3
Further address locale issues (Targets #4083) 2020-01-26 17:48:14 +00:00
nossr50
33f4ac14b5 Add toggle for snow golem exploit to experience.yml - SnowGolemExcavation 2020-01-24 18:28:41 -08:00
nossr50
15d3119627 Berserk now breaks a soft block if it was used to activate it 2020-01-24 01:25:55 -08:00
nossr50
ac731258c7 Berserk now breaks glass and makes noise when doing so 2020-01-24 01:09:19 -08:00
nossr50
7b8c90d362 BlockCracker fix for infested stone bricks 2020-01-24 00:56:16 -08:00
nossr50
055391e908 Hacky fix for spigot bug 2020-01-24 00:43:18 -08:00
Shane Freeder
406429f4e3
Use ThreadedLocalRandom for RNG utils 2020-01-16 18:21:35 +00:00
t00thpick1
421a394f68 Another check for PTP exploit 2020-01-15 13:49:11 -08:00
t00thpick1
d4adb490e2 Fixing PTP exploit 2020-01-15 13:32:10 -08:00
nossr50
ceaff0c862 SkillShot tweaks 2020-01-14 20:09:41 -08:00
nossr50
7c156319be Skill Shot is now multiplicative instead of additive 2020-01-14 19:53:37 -08:00
nossr50
24b3bf1100 NPE fix for combat on unloaded profiles 2020-01-14 19:44:17 -08:00
Shane Freeder
3cbbf1bee0
Move valid check higher up, no need to set additional metadata 2019-12-31 12:17:03 +00:00
Shane Freeder
8fd1af4cbf
Don't cache mob infomation in the updater task 2019-12-31 12:16:12 +00:00
Shane Freeder
601297799f
Enforce locale usage for enums to ensure correct casing (Fixes #4086) 2019-12-16 01:05:47 +00:00
Shane Freeder
b7dd491c01
Prevent nesting of bleed damage 
This commit prevents the nesting of damage event processing in general in
regards to bleed, health related stuff will need a further glance over down
the line, however; This will fix a major problematic area
 2019-11-13 19:53:02 +00:00
Ineusia
c5cbab39b6
Update RepairConfig.java 
Removed accidental whitespace
 2019-11-10 11:56:32 -06:00
Ineusia
ca1906fbc5 Added error message for missing Salvageables section (rather than throw NPE) 2019-11-08 01:15:32 -06:00
Ineusia
7eab20ef56 Added error message for missing Repairables section (rather than throw NPE) 2019-11-08 01:11:29 -06:00
nossr50
e6c9cc6fdd Actually fixed BlockCracker + One more type of block can be cracked 2019-10-18 15:48:12 -07:00
nossr50
76ca7cc88f Additional dupe failsafes 2019-10-18 15:37:36 -07:00