diff --git a/CHANGELOG.md b/CHANGELOG.md index 371004a44..43ba0b78b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ #### Fixes * Fixed #1824 * Fixed #1833 +* Fixed #1834 ## Release Candidate 11 (25 Apr 2020) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PersistentDataService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PersistentDataService.java index 0c7201537..67a1c7c8d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PersistentDataService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PersistentDataService.java @@ -11,7 +11,7 @@ import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; import me.mrCookieSlime.Slimefun.SlimefunPlugin; /** - * This interface is used to defer calls to Peristent Data and make sure they are only called + * This interface is used to defer calls to Persistent Data and make sure they are only called * if the {@link MinecraftVersion} supports it. * * @author TheBusyBiscuit diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Translators.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Translators.java index 635b87cb2..ea22c4352 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Translators.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Translators.java @@ -65,6 +65,7 @@ public class Translators { addTranslator("Thezerix", EmbeddedLanguage.CZECH, true); addTranslator("IsLineCZ", EmbeddedLanguage.CZECH, true); addTranslator("MrFriggo", EmbeddedLanguage.CZECH, true); + addTranslator("100petr", EmbeddedLanguage.CZECH, true); // Translators - Russian addTranslator("SoSeDiK", EmbeddedLanguage.RUSSIAN, false); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Android.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Android.java index 8d30a1949..03353e85f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Android.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Android.java @@ -116,7 +116,7 @@ abstract class Android extends SlimefunItem { int additional = commands.length == 54 ? 0 : 1; if (additional == 1) { - menu.addItem(i, new CustomItem(SkullItem.fromBase64("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTcxZDg5NzljMTg3OGEwNTk4N2E3ZmFmMjFiNTZkMWI3NDRmOWQwNjhjNzRjZmZjZGUxZWExZWRhZDU4NTIifX19"), "&7> Add new Command")); + menu.addItem(i, new CustomItem(SkullItem.fromHash("171d8979c1878a05987a7faf21b56d1b744f9d068c74cffcde1ea1edad5852"), "&7> Add new Command")); menu.addMenuClickHandler(i, (pl, slot, item, action) -> { openScriptComponentEditor(pl, b, script, index); return false; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java index 05eb9c6d5..32b4fdd88 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java @@ -56,7 +56,9 @@ public abstract class WoodcutterAndroid extends ProgrammableAndroid { log.setType(sapling.get()); } } - else log.setType(Material.AIR); + else { + log.setType(Material.AIR); + } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java index 042a20a67..1113a6098 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java @@ -28,7 +28,7 @@ public class Bandage extends SimpleSlimefunItem { Player p = e.getPlayer(); // Player is neither burning nor injured - if (p.getFireTicks() <= 0 && p.getHealth() == p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { + if (p.getFireTicks() <= 0 && p.getHealth() >= p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { return; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Rag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Rag.java index 938285456..31ccd18b2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Rag.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Rag.java @@ -28,7 +28,7 @@ public class Rag extends SimpleSlimefunItem { Player p = e.getPlayer(); // Player is neither burning nor injured - if (p.getFireTicks() <= 0 && p.getHealth() == p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { + if (p.getFireTicks() <= 0 && p.getHealth() >= p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { return; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java index 7ee22b4dd..437248c3d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java @@ -27,7 +27,7 @@ public class Splint extends SimpleSlimefunItem { Player p = e.getPlayer(); // Player is neither burning nor injured - if (p.getFireTicks() <= 0 && p.getHealth() == p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { + if (p.getFireTicks() <= 0 && p.getHealth() >= p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { return; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EntityKillListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MobDropListener.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EntityKillListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MobDropListener.java index 99a4ec623..70c71d7e0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EntityKillListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MobDropListener.java @@ -17,9 +17,9 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.handlers.EntityKillHandler; import me.mrCookieSlime.Slimefun.api.Slimefun; -public class EntityKillListener implements Listener { +public class MobDropListener implements Listener { - public EntityKillListener(SlimefunPlugin plugin) { + public MobDropListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -37,7 +37,7 @@ public class EntityKillListener implements Listener { continue; } - e.getDrops().add(drop); + e.getDrops().add(drop.clone()); } } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 09f77283e..dc055aede 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -55,7 +55,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.listeners.DeathpointLis import io.github.thebusybiscuit.slimefun4.implementation.listeners.DebugFishListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.DispenserListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.EnhancedFurnaceListener; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.EntityKillListener; +import io.github.thebusybiscuit.slimefun4.implementation.listeners.MobDropListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.ExplosionsListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.FireworksListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.GadgetsListener; @@ -197,7 +197,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { new MultiBlockListener(this); new GadgetsListener(this); new DispenserListener(this); - new EntityKillListener(this); + new MobDropListener(this); new BlockListener(this); new EnhancedFurnaceListener(this); new ItemPickupListener(this);