mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-06-20 09:51:15 +02:00
commit 7c011d916a
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/mrCookieSlime/Slimefun/holograms/CargoHologram.java
View File

@ -25,7 +25,7 @@ public class CargoHologram {
} }
private static ArmorStand getArmorStand(Block b) { private static ArmorStand getArmorStand(Block b) {
Location l = new Location(b.getWorld(), b.getX() + 0.5, b.getY() - 0.7F, b.getZ() + 0.5); Location l = new Location(b.getWorld(), b.getX() + 0.5, b.getY() + 0.7F, b.getZ() + 0.5);
for (Entity n : l.getChunk().getEntities()) { for (Entity n : l.getChunk().getEntities()) {
if (n instanceof ArmorStand) { if (n instanceof ArmorStand) {

2
src/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java
View File

@ -32,7 +32,7 @@ public class EnergyHologram {
} }
private static ArmorStand getArmorStand(Block b) { private static ArmorStand getArmorStand(Block b) {
Location l = new Location(b.getWorld(), b.getX() + 0.5, b.getY() - 0.7F, b.getZ() + 0.5); Location l = new Location(b.getWorld(), b.getX() + 0.5, b.getY() + 0.7F, b.getZ() + 0.5);
for (Entity n : l.getChunk().getEntities()) { for (Entity n : l.getChunk().getEntities()) {
if (n instanceof ArmorStand) { if (n instanceof ArmorStand) {

2
src/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java
View File

@ -13,7 +13,7 @@ import me.mrCookieSlime.Slimefun.SlimefunStartup;
public class ReactorHologram { public class ReactorHologram {
public static ArmorStand getArmorStand(Location reactor) { public static ArmorStand getArmorStand(Location reactor) {
Location l = new Location(reactor.getWorld(), reactor.getX() + 0.5, reactor.getY(), reactor.getZ() + 0.5); Location l = new Location(reactor.getWorld(), reactor.getX() + 0.5, reactor.getY() + 0.7, reactor.getZ() + 0.5);
for (Entity n : l.getChunk().getEntities()) { for (Entity n : l.getChunk().getEntities()) {
if (n instanceof ArmorStand) { if (n instanceof ArmorStand) {

3
src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java
View File

@ -149,7 +149,8 @@ public class AncientAltarListener implements Listener {
} }
else { else {
ItemMeta im = stack.getItemMeta(); ItemMeta im = stack.getItemMeta();
im.setDisplayName(ChatColor.RESET + customName); if (!customName.startsWith(String.valueOf(ChatColor.COLOR_CHAR))) customName = ChatColor.RESET + customName;
im.setDisplayName(customName);
stack.setItemMeta(im); stack.setItemMeta(im);
} }
return stack; return stack;