mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-07-22 07:14:44 +02:00
4054315c19
Fixed a glitch that let players remove the ingredient of a custom potion from the brewing stand without cancelling the brewing task (this doesn't seem to have caused any duplicates, once the task finished nothing happened).
112 lines
3.8 KiB
Java
112 lines
3.8 KiB
Java
package com.gmail.nossr50.runnables.skills;
|
|
|
|
import org.bukkit.Location;
|
|
import org.bukkit.Material;
|
|
import org.bukkit.block.BlockState;
|
|
import org.bukkit.block.BrewingStand;
|
|
import org.bukkit.entity.Player;
|
|
import org.bukkit.scheduler.BukkitRunnable;
|
|
|
|
import com.gmail.nossr50.mcMMO;
|
|
import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
|
|
import com.gmail.nossr50.datatypes.skills.SkillType;
|
|
import com.gmail.nossr50.events.skills.alchemy.McMMOPlayerBrewEvent;
|
|
import com.gmail.nossr50.events.skills.alchemy.McMMOPlayerCatalysisEvent;
|
|
import com.gmail.nossr50.skills.alchemy.Alchemy;
|
|
import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
|
|
import com.gmail.nossr50.util.Misc;
|
|
import com.gmail.nossr50.util.Permissions;
|
|
import com.gmail.nossr50.util.player.UserManager;
|
|
|
|
public class AlchemyBrewTask extends BukkitRunnable {
|
|
private static double DEFAULT_BREW_SPEED = 1.0;
|
|
private static int DEFAULT_BREW_TICKS = 400;
|
|
|
|
private BlockState brewingStand;
|
|
private Location location;
|
|
private double brewSpeed;
|
|
private double brewTimer;
|
|
private Player player;
|
|
private int fuel;
|
|
|
|
public AlchemyBrewTask(BlockState brewingStand, Player player) {
|
|
this.brewingStand = brewingStand;
|
|
this.location = brewingStand.getLocation();
|
|
this.player = player;
|
|
|
|
brewSpeed = DEFAULT_BREW_SPEED;
|
|
brewTimer = DEFAULT_BREW_TICKS;
|
|
|
|
if (player != null && !Misc.isNPCEntity(player) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CATALYSIS)) {
|
|
double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, SkillType.ALCHEMY));
|
|
|
|
McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis);
|
|
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
|
|
|
if (!event.isCancelled()) {
|
|
brewSpeed = catalysis;
|
|
}
|
|
}
|
|
|
|
if (Alchemy.brewingStandMap.containsKey(location)) {
|
|
Alchemy.brewingStandMap.get(location).cancel();
|
|
}
|
|
|
|
fuel = ((BrewingStand) brewingStand).getFuelLevel() - 1;
|
|
|
|
Alchemy.brewingStandMap.put(location, this);
|
|
this.runTaskTimer(mcMMO.p, 1, 1);
|
|
}
|
|
|
|
@Override
|
|
public void run() {
|
|
if (player == null || !player.isValid() || brewingStand == null || brewingStand.getType() != Material.BREWING_STAND || !AlchemyPotionBrewer.isValidIngredient(player, ((BrewingStand) brewingStand).getInventory().getContents()[Alchemy.INGREDIENT_SLOT])) {
|
|
if (Alchemy.brewingStandMap.containsKey(location)) {
|
|
Alchemy.brewingStandMap.remove(location);
|
|
}
|
|
|
|
this.cancel();
|
|
|
|
return;
|
|
}
|
|
|
|
((BrewingStand) brewingStand).setFuelLevel(fuel);
|
|
|
|
brewTimer -= brewSpeed;
|
|
|
|
// Vanilla potion brewing completes when BrewingTime == 1
|
|
if (brewTimer < Math.max(brewSpeed, 2)) {
|
|
this.cancel();
|
|
finish();
|
|
}
|
|
else {
|
|
((BrewingStand) brewingStand).setBrewingTime((int) brewTimer);
|
|
}
|
|
}
|
|
|
|
private void finish() {
|
|
McMMOPlayerBrewEvent event = new McMMOPlayerBrewEvent(player, brewingStand);
|
|
mcMMO.p.getServer().getPluginManager().callEvent(event);
|
|
|
|
if (!event.isCancelled()) {
|
|
AlchemyPotionBrewer.finishBrewing(brewingStand, player, false);
|
|
}
|
|
|
|
Alchemy.brewingStandMap.remove(location);
|
|
}
|
|
|
|
public void finishImmediately() {
|
|
this.cancel();
|
|
|
|
AlchemyPotionBrewer.finishBrewing(brewingStand, player, true);
|
|
Alchemy.brewingStandMap.remove(location);
|
|
}
|
|
|
|
public void cancelBrew() {
|
|
this.cancel();
|
|
|
|
((BrewingStand) brewingStand).setBrewingTime(-1);
|
|
Alchemy.brewingStandMap.remove(location);
|
|
}
|
|
}
|