Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 08:09:39 +01:00
Code Issues Projects Releases Wiki Activity

Merging

Browse Source
This commit is contained in:
nossr50 2019-04-06 06:10:52 -07:00
commit abda53641f
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.txt
View File

@ -154,6 +154,10 @@ Version 2.2.0
Added API method to grab the level cap of a skill by its PrimarySkillType ENUM definition
Added API method to check if a skill was being level capped
Version 2.1.37
Fixed a potential IndexOutOfBoundsException when informing a disconnected player that their Blast Mining was off CD
Updated hu_HU locale (thanks andris)
Version 2.1.36
Updated German locale (Thanks OverCrave)
Fixed a bug preventing Villagers from giving combat XP

2
src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java
View File

@ -17,7 +17,7 @@ public class AbilityCooldownTask extends BukkitRunnable {
@Override
public void run() {
if (mcMMOPlayer.getAbilityInformed(ability)) {
if (!mcMMOPlayer.getPlayer().isOnline() || mcMMOPlayer.getAbilityInformed(ability)) {
return;
}

2
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -119,7 +119,7 @@ public class MiningManager extends SkillManager {
mcMMOPlayer.setAbilityDATS(SuperAbilityType.BLAST_MINING, System.currentTimeMillis());
mcMMOPlayer.setAbilityInformed(SuperAbilityType.BLAST_MINING, false);
new AbilityCooldownTask(mcMMOPlayer, SuperAbilityType.BLAST_MINING).runTaskLaterAsynchronously(mcMMO.p, SuperAbilityType.BLAST_MINING.getCooldown() * Misc.TICK_CONVERSION_FACTOR);
new AbilityCooldownTask(mcMMOPlayer, SuperAbilityType.BLAST_MINING).runTaskLater(mcMMO.p, SuperAbilityType.BLAST_MINING.getCooldown() * Misc.TICK_CONVERSION_FACTOR);
}
/**

21
src/main/resources/locale/locale_hu_HU.properties
View File

@ -166,6 +166,9 @@ Archery.SubSkill.Daze.Description=\u00D6sszezavarja az ellenfeleket \u00E9s extr
Archery.SubSkill.ArrowRetrieval.Name=Nyilak Visszaszerz\u00E9se
Archery.SubSkill.ArrowRetrieval.Description=Es\u00E9ly a nyilak visszaszerz\u00E9sre a hull\u00E1kb\u00F3l
Archery.SubSkill.ArrowRetrieval.Stat=Ny\u00EDl helyre\u00E1ll\u00EDt\u00E1si es\u00E9ly
Archery.SubSkill.ArcheryLimitBreak.Name=\u00CDj\u00E1szat Korl\u00E1t \u00C1tl\u00E9p\u00E9s
Archery.SubSkill.ArcheryLimitBreak.Description=L\u00E9pj t\u00FAl a korl\u00E1taidon.
Archery.SubSkill.ArcheryLimitBreak.Stat=B\u00F3nusz Sebz\u00E9s Korl\u00E1t \u00C1tl\u00E9p\u00E9ssel
Archery.Listener=\u00CDj\u00E1szat:
Archery.SkillName=\u00CDJ\u00C1SZAT
#AXES
@ -190,6 +193,9 @@ Axes.SubSkill.CriticalStrikes.Description=Dupla Sebz\u00E9s
Axes.SubSkill.CriticalStrikes.Stat=Es\u00E9ly Kritikus Csap\u00E1sra
Axes.SubSkill.AxeMastery.Name=Balta Mesters\u00E9g
Axes.SubSkill.AxeMastery.Description=B\u00F3nusz sebz\u00E9st ad
Axes.SubSkill.AxesLimitBreak.Name=Balt\u00E1szat Korl\u00E1t \u00C1tl\u00E9p\u00E9s
Axes.SubSkill.AxesLimitBreak.Description=L\u00E9pj t\u00FAl a korl\u00E1taidon.
Axes.SubSkill.AxesLimitBreak.Stat=B\u00F3nusz Sebz\u00E9s Korl\u00E1t \u00C1tl\u00E9p\u00E9ssel
Axes.SubSkill.ArmorImpact.Name=P\u00E1nc\u00E9l \u00DCt\u00E9s
Axes.SubSkill.ArmorImpact.Description=El\u00E9g er\u0151vel csap le ahhoz, hogy p\u00E1nc\u00E9lt t\u00F6rj\u00F6n
Axes.SubSkill.GreaterImpact.Name=Er\u0151s \u00DCt\u00E9s
@ -404,6 +410,12 @@ Swords.SubSkill.SerratedStrikes.Description=Az AOE r\u00E9szleges k\u00E1rosod\u
Swords.SubSkill.SerratedStrikes.Stat=Fogazott Penge Hossza
Swords.SubSkill.Rupture.Name=T\u00F6r\u00E9s
Swords.SubSkill.Rupture.Description=Alkalmaz egy er\u0151s v\u00E9rz\u00E9s pontot
Swords.SubSkill.Stab.Name=D\u00F6f\u00E9s
Swords.SubSkill.Stab.Description={0} B\u00F3nusz sebz\u00E9st ad a t\u00E1mad\u00E1sokkor.
Swords.SubSkill.Stab.Stat=D\u00F6f\u00E9s Sebz\u00E9s
Swords.SubSkill.SwordsLimitBreak.Name=Kardok Korl\u00E1t \u00C1tl\u00E9p\u00E9s
Swords.SubSkill.SwordsLimitBreak.Description=L\u00E9pj t\u00FAl a korl\u00E1taidon.
Swords.SubSkill.SwordsLimitBreak.Stat=B\u00F3nusz Sebz\u00E9s Korl\u00E1t \u00C1tl\u00E9p\u00E9ssel
Swords.SubSkill.Rupture.Stat=Es\u00E9ly T\u00F6r\u00E9sre
Swords.SubSkill.Rupture.Stat.Extra=T\u00F6r\u00E9s Hossza: [[GREEN]]{0} tick [{1} s\u00E9r\u00FCl\u00E9s j\u00E1t\u00E9kosok ellen] [{2} s\u00E9r\u00FCl\u00E9s \u00E9l\u0151l\u00E9nyek ellen]
Swords.Effect.4=Fogazott Penge T\u00F6r\u00E9s+
@ -480,6 +492,9 @@ Unarmed.SubSkill.Berserk.Stat=Vadul\u00E1s Hossza
Unarmed.SubSkill.Disarm.Name=Lefegyverz\u00E9s (J\u00E1t\u00E9kosok)
Unarmed.SubSkill.Disarm.Description=Ellenfeleid elejtik a kez\u00FCkben lev\u0151 t\u00E1rgyakat
Unarmed.SubSkill.Disarm.Stat=Es\u00E9ly Lefegyverz\u00E9sre
Unarmed.SubSkill.UnarmedLimitBreak.Name=Pusztakezek Korl\u00E1t \u00C1tl\u00E9p\u00E9s
Unarmed.SubSkill.UnarmedLimitBreak.Description=L\u00E9pj t\u00FAl a korl\u00E1taidon.
Unarmed.SubSkill.UnarmedLimitBreak.Stat=B\u00F3nusz Sebz\u00E9s Korl\u00E1t \u00C1tl\u00E9p\u00E9ssel
Unarmed.SubSkill.IronArmStyle.Name=Vas-\u00D6k\u00F6l St\u00EDlus
Unarmed.SubSkill.IronArmStyle.Description=Id\u0151vel megkem\u00E9ny\u00EDti az \u00F6kleidet
Unarmed.SubSkill.ArrowDeflect.Name=Nyilak Kit\u00E9r\u00EDt\u00E9se
@ -872,7 +887,7 @@ Guides.Mining.Section.0=[[DARK_AQUA]]A B\u00E1ny\u00E1sz\u00E1sr\u00F3l:\n[[YELL
Guides.Mining.Section.1=[[DARK_AQUA]]Kompatibilis Anyagok:\n[[YELLOW]]K\u0151, Sz\u00E9n\u00E9rc, Vas\u00E9rc, Arany\u00E9rc, Gy\u00E9m\u00E1nt\u00E9rc, V\u00F6r\u00F6sk\u0151\u00E9rc,\n[[YELLOW]]Lazurit\u00E9rc, Obszidi\u00E1n, Moh\u00E1s Z\u00FAzottk\u0151, V\u00E9gk\u0151,\n[[YELLOW]]Izz\u00F3k\u0151, \u00E9s Alvil\u00E1gi K\u0151.
Guides.Mining.Section.2=[[DARK_AQUA]]Hogyan haszn\u00E1ld a Szuper T\u00F6r\u00E9st? \n[[YELLOW]]Jobb klikkelj cs\u00E1k\u00E1nnyal a kezedben, hogy el\u0151k\u00E9sz\u00EDtsd az eszk\u00F6zt.\n[[YELLOW]]Ebben a m\u00F3dban tov\u00E1bb\u00E1 4 m\u00E1sodperc \u00E1ll a rendelkez\u00E9sedre, hogy\n[[YELLOW]]kapcsolatba l\u00E9pj valamely B\u00E1ny\u00E1sz\u00E1ssal kompatibilis anyaggal a\n[[YELLOW]]Szuper T\u00F6r\u0151 aktiv\u00E1l\u00E1s\u00E1hoz.
Guides.Mining.Section.3=[[DARK_AQUA]]Mi az a Szuper T\u00F6r\u0151?\n[[YELLOW]]A Szuper T\u00F6r\u0151 egy v\u00E1rakoz\u00E1si id\u0151vel rendelkez\u0151 k\u00E9pess\u00E9g, \n[[YELLOW]]amely a B\u00E1ny\u00E1sz\u00E1shoz kapcsol\u00F3dik. Megtripl\u00E1zza az \n[[YELLOW]]extra t\u00E1rgyak tal\u00E1l\u00E1s\u00E1nak es\u00E9ly\u00E9t, \u00E9s instant ki\u00FCti a\n[[YELLOW]]B\u00E1ny\u00E1sz\u00E1ssal kompatibilis anyagokat.
Guides.Mining.Section.4=[[DARK_AQUA]]Hogyan haszn\u00E1ld a Robbant\u00E1sb\u00E1ny\u00E1szatot:\n[[YELLOW]]Deton\u00E1torral a kezedben, ami alap\u00E9rtelmez\u00E9s szerint kovak\u0151 \u00E9s ac\u00E9l,\n[[YELLOW]]hajolj oda \u00E9s jobb gombbal kattints a TNT-re t\u00E1volr\u00F3l. Ett\u0151l a TNT\n[[YELLOW]]azonnal felrobban.
Guides.Mining.Section.4=[[DARK_AQUA]]Hogyan haszn\u00E1ld Robbant\u00E1sb\u00E1ny\u00E1szatot:\n[[YELLOW]]Egy cs\u00E1k\u00E1nnyal a kezedben,\n[[YELLOW]]guggolj, \u00E9s jobb klikkelj a TNT-re t\u00E1volr\u00F3l. Ezzel a TNT\n[[YELLOW]]azonnal felrobban.
Guides.Mining.Section.5=[[DARK_AQUA]]Hogyan m\u0171k\u00F6dik a Robbant\u00E1sb\u00E1ny\u00E1szat?\n[[YELLOW]]A Robbant\u00E1sb\u00E1ny\u00E1szat egy olyan k\u00E9pess\u00E9g, ami a b\u00E1ny\u00E1szati\n[[YELLOW]]k\u00E9pess\u00E9ghez k\u00F6t\u0151dik. B\u00F3nuszokat ad, amikor TNT-vel b\u00E1ny\u00E1szol, \u00E9s lehet\u0151s\u00E9ged van\n[[YELLOW]]a t\u00E1voli robbant\u00E1sra is. H\u00E1rom r\u00E9sze van a Robbant\u00E1sb\u00E1ny\u00E1szatnak.\n[[YELLOW]]Az els\u0151 a \u201ENagyobb Robban\u00E1s\u201D, ami a robban\u00E1s hat\u00F3sugar\u00E1t n\u00F6veli.\n[[YELLOW]]A m\u00E1sodik a \u201ERobbant\u00E1si szak\u00E9rt\u0151", ami cs\u00F6kkenti\n[[YELLOW]]a TNT robban\u00E1s okozta k\u00E1rokat. A harmadik egyszer\u0171en csak n\u00F6veli\n[[YELLOW]] a TNT robban\u00E1sb\u00F3l kies\u0151 \u00E9rcek mennyis\u00E9g\u00E9t \n[[YELLOW]]\u00E9s cs\u00F6kkenti a t\u00F6rmel\u00E9kek hull\u00E1s\u00E1t.
##Repair
Guides.Repair.Section.0=[[DARK_AQUA]]A Jav\u00EDt\u00E1sr\u00F3l:\n[[YELLOW]]A Jav\u00EDt\u00E1s lehet\u0151v\u00E9 teszi a p\u00E1nc\u00E9l \u00E9s eszk\u00F6z\u00F6k\n[[YELLOW]]Vast\u00F6mb\u00F6n val\u00F3 jav\u00EDt\u00E1s\u00E1t.\n\n[[DARK_AQUA]]TAPASZTALAT SZERZ\u00C9S:\n[[YELLOW]]Jav\u00EDts p\u00E1nc\u00E9lt \u00E9s eszk\u00F6z\u00F6ket mcMMO \u00FCll\u0151 seg\u00EDts\u00E9g\u00E9vel. Alapb\u00F3l ez egy Vast\u00F6mb, nem \u00F6sszekeverend\u0151 a sima \u00FCll\u0151vel.
@ -947,7 +962,7 @@ Skills.ChildStats={0}[[GREEN]]{1}
Skills.TooTired=T\u00FAl f\u00E1radt vagy, hogy \u00FAjra haszn\u00E1lhasd ezt a k\u00E9pess\u00E9get. [[YELLOW]]({0}s)
Skills.Cancelled=[[GOLD]]{0} [[RED]]Megszak\u00EDtva!
Skills.ConfirmOrCancel=[[GREEN]]Jobb klikkelj a meger\u0151s\u00EDt\u00E9shez. [[GOLD]]{0}[[GREEN]]. Bal klikkelj a megszak\u00EDt\u00E1shoz.
Skills.AbilityGateRequirementFail=[[GRAY]]M\u00E9g [[YELLOW]]{0}[[GRAY]] szint sz\u00FCks\u00E9ges [[DARK_AQUA]]{1}[[GRAY]], hogy haszn\u00E1lhasd ezt a szuper k\u00E9pess\u00E9get.
Skills.AbilityGateRequirementFail=[[GRAY]]M\u00E9g [[YELLOW]]{0}[[GRAY]] szint sz\u00FCks\u00E9ges a(z) [[DARK_AQUA]]{1}[[GRAY]]b\u00F3l/b\u0151l, hogy haszn\u00E1lhasd ezt a szuper k\u00E9pess\u00E9get.
#STATISTICS
Stats.Header.Combat=[[GOLD]]-=HARCI K\u00C9PESS\u00C9GEK=-
Stats.Header.Gathering=[[GOLD]]-=GY\u0170JT\u00D6GET\u0150 K\u00C9PESS\u00C9GEK=-
@ -1059,3 +1074,5 @@ Profile.Loading.AdminFailureNotice=[[DARK_RED]][A][[RED]]Az mcMMO nem tudta bet\
#Holiday
Holiday.AprilFools.Levelup=[[GOLD]]{0} jelenlegi szint [[GREEN]]{1}[[GOLD]]!
Holiday.Anniversary=[[BLUE]]Boldog {0}. \u00C9vfordul\u00F3t!\n[[BLUE]]nossr50, \u00E9s az \u00F6sszes fejleszt\u0151 tisztelet\u00E9re itt egy t\u0171zij\u00E1t\u00E9k show!
#Reminder Messages
Reminder.Squelched=[[GRAY]]Eml\u00E9keztet\u0151: jelenleg nem kapsz \u00E9rtes\u00EDt\u00E9seket az mcMMO-t\u00F3l. Ahhoz, hogy enged\u00E9lyezd az \u00E9rtes\u00EDt\u00E9seket, futtasd \u00FAjra a /mcnotify parancsot. Ez egy automatikus, \u00F3r\u00E1nk\u00E9nti eml\u00E9keztet\u0151.