EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-01 20:15:28 +02:00
Code Issues Projects Releases Wiki Activity

Remove Static Abuse - Scoreboards... (Yuck)

Browse Source
This commit is contained in:
nossr50
2019-07-02 21:12:50 -07:00
parent e7b80cbce5
commit 5ec59536c7
103 changed files with 696 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/dumpster/AlchemyBrewTask.java
View File

@@ -38,9 +38,9 @@
// if (player != null
// && !Misc.isNPCEntity(player)
// && Permissions.isSubSkillEnabled(player, SubSkillType.ALCHEMY_CATALYSIS)
// && UserManager.getPlayer(player) != null) {
// && pluginRef.getUserManager().getPlayer(player) != null) {
//
// double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, PrimarySkillType.ALCHEMY));
// double catalysis = pluginRef.getUserManager().getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, PrimarySkillType.ALCHEMY));
//
// McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis);
// mcMMO.p.getServer().getPluginManager().callEvent(event);

8
src/main/java/com/gmail/nossr50/dumpster/AlchemyPotionBrewer.java
View File

@@ -88,11 +88,11 @@
// }
//
// private static List<ItemStack> getValidIngredients(Player player) {
// if (player == null || UserManager.getPlayer(player) == null) {
// if (player == null || pluginRef.getUserManager().getPlayer(player) == null) {
// return PotionManager.getInstance().getIngredients(1);
// }
//
// return PotionManager.getInstance().getIngredients(!Permissions.isSubSkillEnabled(player, SubSkillType.ALCHEMY_CONCOCTIONS) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
// return PotionManager.getInstance().getIngredients(!Permissions.isSubSkillEnabled(player, SubSkillType.ALCHEMY_CONCOCTIONS) ? 1 : pluginRef.getUserManager().getPlayer(player).getAlchemyManager().getTier());
// }
//
// public static void finishBrewing(BlockState brewingStand, Player player, boolean forced) {
@@ -142,8 +142,8 @@
// PotionStage potionStage = PotionStage.getPotionStage(input, output);
//
// //TODO: hmm
// if (UserManager.hasPlayerDataKey(player)) {
// UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(potionStage, 1);
// if (pluginRef.getUserManager().hasPlayerDataKey(player)) {
// pluginRef.getUserManager().getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(potionStage, 1);
// }
// }
// }

2
src/main/java/com/gmail/nossr50/dumpster/HolidayManager.java
View File

@@ -367,7 +367,7 @@
// if(!Config.getInstance().isAprilFoolsAllowed())
// return;
//
// int levelTotal = Misc.getRandom().nextInt(1 + UserManager.getPlayer(player).getSkillLevel(PrimarySkillType.MINING)) + 1;
// int levelTotal = Misc.getRandom().nextInt(1 + pluginRef.getUserManager().getPlayer(player).getSkillLevel(PrimarySkillType.MINING)) + 1;
// SoundManager.sendSound(player, player.getLocation(), SoundType.LEVEL_UP);
// mcMMO.getNotificationManager().sendPlayerInformation(player, NotificationType.HOLIDAY, "Holiday.AprilFools.Levelup", StringUtils.getCapitalized(fakeSkillType.toString()), String.valueOf(levelTotal));
//// ParticleEffectUtils.fireworkParticleShower(player, ALL_COLORS.get(Misc.getRandom().nextInt(ALL_COLORS.size())));