JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics

Browse Source
This commit is contained in:
xGamingDudex 2015-12-11 01:10:54 +01:00
commit 44a244caf4
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
View File

@ -93,6 +93,7 @@ public class InventoryManager extends MiniDbClientPlugin<ClientInventory>
public void addItemToInventory(final Callback<Boolean> callback, final Player player, final String item, final int count) public void addItemToInventory(final Callback<Boolean> callback, final Player player, final String item, final int count)
{ {
int accountId = getClientManager().getAccountId(player);
addItemToInventoryForOffline(new Callback<Boolean>() addItemToInventoryForOffline(new Callback<Boolean>()
{ {
public void run(Boolean success) public void run(Boolean success)
@ -105,7 +106,7 @@ public class InventoryManager extends MiniDbClientPlugin<ClientInventory>
if (callback != null) if (callback != null)
callback.run(success); callback.run(success);
} }
}, player.getUniqueId(), item, count); }, accountId, item, count);
} }
public boolean validItem(String item) public boolean validItem(String item)

10
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java
View File

@ -25,7 +25,15 @@ public enum TreasureStyle
ParticleType.LARGE_EXPLODE, ParticleType.LARGE_EXPLODE,
ParticleType.INSTANT_SPELL, ParticleType.INSTANT_SPELL,
Sound.PORTAL_TRAVEL, Sound.PORTAL_TRAVEL,
Sound.ANVIL_LAND); Sound.ANVIL_LAND),
CHRISTMAS(
ParticleType.SNOW_SHOVEL,
ParticleType.SNOWBALL_POOF,
ParticleType.FIREWORKS_SPARK,
Sound.FIZZ,
Sound.CHICKEN_EGG_POP
);
private ParticleType _secondaryParticle; private ParticleType _secondaryParticle;
private ParticleType _chestSpawnParticle; private ParticleType _chestSpawnParticle;

4
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureType.java
View File

@ -11,7 +11,9 @@ public enum TreasureType
ANCIENT(C.cGold + "Ancient Chest", "Ancient Chest", "Ancient", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.ANCIENT), ANCIENT(C.cGold + "Ancient Chest", "Ancient Chest", "Ancient", RewardType.AncientChest, Material.TRAPPED_CHEST, TreasureStyle.ANCIENT),
MYTHICAL(C.cRed + "Mythical Chest", "Mythical Chest", "Mythical", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.MYTHICAL); MYTHICAL(C.cRed + "Mythical Chest", "Mythical Chest", "Mythical", RewardType.MythicalChest, Material.ENDER_CHEST, TreasureStyle.MYTHICAL),
CHRISTMAS(C.cAqua + "Christmas Chest", "Christmas Chest", "Christmas", RewardType.MythicalChest, Material.CHEST, TreasureStyle.CHRISTMAS);
private final String _name; private final String _name;
private final RewardType _rewardType; private final RewardType _rewardType;