feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Update for 1.12 (#694)

Browse Source
This commit is contained in:
Niklas
2017-06-10 08:27:28 +10:00
committed by md-5
parent 207c66809f
commit 80de6eb383
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/diddiz/util/BukkitUtils.java
+1
View File
@@ -95,6 +95,7 @@ public class BukkitUtils {
relativeTopFallables.add(Material.GRAVEL);
relativeTopFallables.add(Material.DRAGON_EGG);
relativeTopFallables.add(Material.ANVIL);
relativeTopFallables.add(Material.CONCRETE_POWDER);
// Blocks that break falling entities
fallingEntityKillers = new HashSet<Material>(32);
src/main/java/de/diddiz/util/MaterialName.java
+4 -2
View File
@@ -178,10 +178,12 @@ public class MaterialName {
for (byte i = 0; i < 16; i++) {
cfg.set("351." + i, toReadable(Material.INK_SACK.getNewData(i)));
cfg.set("35." + i, COLORS[i] + " wool");
cfg.set("159." + i, COLORS[i] + " stained clay");
cfg.set("159." + i, COLORS[i] + " stained terracotta");
cfg.set("95." + i, COLORS[i] + " stained glass");
cfg.set("160." + i, COLORS[i] + " stained glass pane");
cfg.set("171." + i, COLORS[i] + " carpet");
cfg.set("251." + i, COLORS[i] + " concrete");
cfg.set("252." + i, COLORS[i] + " concrete powder");
}
for (byte i = 0; i < 6; i++) {
cfg.set("125." + i, toReadable(Material.WOOD_DOUBLE_STEP.getNewData(i)));
@@ -194,7 +196,7 @@ public class MaterialName {
getLogger().log(Level.WARNING, "Unable to save material.yml: ", ex);
}
}
if (cfg.getString("263.1") == null) {
if (cfg.getString("252.1") == null) {
getLogger().info("[Logblock-names] Logblock's default materials.yml file has been updated with more names");
getLogger().info("[Logblock-names] Consider deleting your current materials.yml file to allow it to be recreated");
}