Skip to content

Commit

Permalink
Changed internal name for heads definitions - was causing name conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jascotty2 committed Nov 26, 2012
1 parent eb8dee1 commit f92da1d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions changelog
Expand Up @@ -2,6 +2,10 @@
BetterShop Changelog: (the (?) means plugin didn't report that as the version.. sorry :))
===============================================================================

Version 2.1.4.4 - 11/26/12
Changed internal name for heads definitions - was causing name conflicts


Version 2.1.4.3 - 11/16/12
Updated internal item definitions - should resolve unknown item errors

Expand Down
2 changes: 1 addition & 1 deletion src/me/jascotty2/bettershop/BetterShop.java
Expand Up @@ -64,7 +64,7 @@
*/
public class BetterShop extends JavaPlugin {

public final static String lastUpdatedStr = "11/16/12 12:40 -0500"; // "MM/dd/yy HH:mm Z"
public final static String lastUpdatedStr = "11/26/12 17:00 -0500"; // "MM/dd/yy HH:mm Z"
public final static int lastUpdated_gracetime = 20; // how many minutes off before out of date
protected static Plugin bettershopPlugin = null;
protected final static BSConfig config = new BSConfig();
Expand Down
10 changes: 5 additions & 5 deletions src/me/jascotty2/lib/bukkit/item/JItems.java
Expand Up @@ -218,11 +218,11 @@ public enum JItems {
COBBLESTONE_WALL("Cobblestone Wall", 139),
FLOWER_POT_BLOCK("Flower Pot", 140, false),
WOODEN_BUTTON("Wooden Button", 143),
SKELETON_HEAD_BLOCK("Skeleton Head", 144, false),
WITHER_SKELETON_HEAD_BLOCK("Wither Skeleton Head", 144, (short) 1, false),
ZOMBIE_HEAD_BLOCK("Zombie Head", 144, (short) 2, false),
HUMAN_HEAD_BLOCK("Human Head", 144, (short) 3, false),
CREEPER_HEAD_BLOCK("Creeper Head", 144, (short) 4, false),
SKELETON_HEAD_BLOCK("Skeleton Head Block", 144, false),
WITHER_SKELETON_HEAD_BLOCK("Wither Skeleton Head Block", 144, (short) 1, false),
ZOMBIE_HEAD_BLOCK("Zombie Head Block", 144, (short) 2, false),
HUMAN_HEAD_BLOCK("Human Head Block", 144, (short) 3, false),
CREEPER_HEAD_BLOCK("Creeper Head Block", 144, (short) 4, false),
ANVIL("Anvil", 145),
// Items
IRON_SPADE("Iron Shovel", 256, "280@2+265", (short) 251),
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.yml
@@ -1,6 +1,6 @@
name: BetterShop
main: me.jascotty2.bettershop.BetterShop
version: 2.1.4.3
version: 2.1.4.4
website: http://github.com/BetterShop/BetterShop
author: jascotty2
softdepend: [Spout, Vault]
Expand Down

0 comments on commit f92da1d

Please sign in to comment.