mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Maybe resolves #1834

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-05-01 11:25:42 +02:00
parent 189507844d
commit 085d10be0a
10 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -25,6 +25,7 @@
#### Fixes
* Fixed #1824
* Fixed #1833
* Fixed #1834
## Release Candidate 11 (25 Apr 2020)

2
src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PersistentDataService.java
View File

@ -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

1
src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Translators.java
View File

@ -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);

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Android.java
View File

@ -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;

4
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java
View File

@ -56,7 +56,9 @@ public abstract class WoodcutterAndroid extends ProgrammableAndroid {
log.setType(sapling.get());
}
}
else log.setType(Material.AIR);
else {
log.setType(Material.AIR);
}
}
}

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java
View File

@ -28,7 +28,7 @@ public class Bandage extends SimpleSlimefunItem<ItemUseHandler> {
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;
}

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Rag.java
View File

@ -28,7 +28,7 @@ public class Rag extends SimpleSlimefunItem<ItemUseHandler> {
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;
}

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java
View File

@ -27,7 +27,7 @@ public class Splint extends SimpleSlimefunItem<ItemUseHandler> {
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;
}

6
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EntityKillListener.java → src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MobDropListener.java
View File

@ -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());
}
}
}

4
src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
View File

@ -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);