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

Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])

Browse Source
This commit is contained in:
NewGarbo 2015-10-25 12:28:12 +00:00
parent 1e4b3442fa
commit 327c129f46
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/PetReward.java
View File

@ -61,7 +61,7 @@ public class PetReward extends UnknownPackageReward
@Override
public boolean canGiveReward(Player player)
{
if (DonationManager.Get(player.getName()) == null)
if (_donationManager.Get(player.getName()) == null)
{
System.out.println("Could not give reward " + getPackageName() + " to Offline Player: " + player.getName());
return false;

5
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
View File

@ -9,13 +9,14 @@ import mineplex.core.reward.Reward;
import mineplex.core.reward.RewardData;
import mineplex.core.reward.RewardManager;
import mineplex.core.reward.RewardRarity;
import mineplex.core.reward.RewardType;
/**
* Created by shaun on 14-09-12.
*/
public class UnknownPackageReward extends Reward
{
private DonationManager _donationManager;
protected DonationManager _donationManager;
private ItemStack _itemStack;
private String _name;
private String _packageName;
@ -30,7 +31,7 @@ public class UnknownPackageReward extends Reward
}
@Override
protected RewardData giveRewardCustom(Player player)
protected RewardData giveRewardCustom(Player player, RewardType type)
{
_donationManager.PurchaseUnknownSalesPackage(null, player.getName(), _donationManager.getClientManager().Get(player).getAccountId(), _packageName, CurrencyType.Coins, 0, true);