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

Fix Conflict Names

Browse Source
This commit is contained in:
Meta-Win 2018-02-15 14:25:55 -02:00 committed by GitHub
parent 79cd64361a
commit 948c6a650b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java
View File

@ -106,7 +106,7 @@ public class ToolListener implements Listener {
FireworkShow.launchRandom(e.getPlayer(), 3); FireworkShow.launchRandom(e.getPlayer(), 3);
List<ItemStack> gifts = new ArrayList<ItemStack>(); List<ItemStack> gifts = new ArrayList<ItemStack>();
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
gifts.add(new CustomItem(SlimefunItems.HOT_CHOCOLATE, 1)); gifts.add(new CustomItem(SlimefunItems.CHRISTMAS_HOT_CHOCOLATE, 1));
gifts.add(new CustomItem(SlimefunItems.CHOCOLATE_APPLE, 4)); gifts.add(new CustomItem(SlimefunItems.CHOCOLATE_APPLE, 4));
gifts.add(new CustomItem(SlimefunItems.CARAMEL_APPLE, 4)); gifts.add(new CustomItem(SlimefunItems.CARAMEL_APPLE, 4));
gifts.add(new CustomItem(SlimefunItems.CHRISTMAS_CAKE, 4)); gifts.add(new CustomItem(SlimefunItems.CHRISTMAS_CAKE, 4));
@ -116,7 +116,7 @@ public class ToolListener implements Listener {
gifts.add(new CustomItem(SlimefunItems.MILK, 1)); gifts.add(new CustomItem(SlimefunItems.MILK, 1));
gifts.add(new CustomItem(SlimefunItems.APPLE_CIDER, 1)); gifts.add(new CustomItem(SlimefunItems.APPLE_CIDER, 1));
gifts.add(new CustomItem(SlimefunItems.FRUIT_CAKE, 4)); gifts.add(new CustomItem(SlimefunItems.FRUIT_CAKE, 4));
gifts.add(new CustomItem(SlimefunItems.APPLE_PIE, 4)); gifts.add(new CustomItem(SlimefunItems.CHRISTMAS_APPLE_PIE, 4));
} }
gifts.add(new SkullItem("mrCookieSlime")); gifts.add(new SkullItem("mrCookieSlime"));
gifts.add(new SkullItem("timtower")); gifts.add(new SkullItem("timtower"));