Compare commits

..

No commits in common. "master" and "v2.4.3.7" have entirely different histories.

4 changed files with 9 additions and 20 deletions

View File

@ -6,7 +6,7 @@
<groupId>cn.lunadeer</groupId> <groupId>cn.lunadeer</groupId>
<artifactId>LiteWorldEdit</artifactId> <artifactId>LiteWorldEdit</artifactId>
<version>2.5.0.1</version> <version>2.4.3.7</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>LiteWorldEdit</name> <name>LiteWorldEdit</name>

View File

@ -5,7 +5,6 @@ import cn.lunadeer.liteworldedit.JobGenerator.Empty;
import cn.lunadeer.liteworldedit.JobGenerator.Fill; import cn.lunadeer.liteworldedit.JobGenerator.Fill;
import cn.lunadeer.liteworldedit.JobGenerator.OverLay; import cn.lunadeer.liteworldedit.JobGenerator.OverLay;
import cn.lunadeer.liteworldedit.Jobs.Job; import cn.lunadeer.liteworldedit.Jobs.Job;
import cn.lunadeer.liteworldedit.Managers.ConfigManager;
import cn.lunadeer.liteworldedit.Managers.Point; import cn.lunadeer.liteworldedit.Managers.Point;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -103,11 +102,11 @@ public class Commands implements TabExecutor {
if (!player.isOp()) { if (!player.isOp()) {
Notification.error(player, "你没有权限。"); Notification.error(player, "你没有权限。");
} else { } else {
LiteWorldEdit.config.reload(); LiteWorldEdit.instance.reloadConfig();
Notification.info(player, "已重载配置文件。"); Notification.info(player, "已重载配置文件。");
} }
} else { } else {
LiteWorldEdit.config.reload(); LiteWorldEdit.instance.reloadConfig();
LoggerX.info("已重载配置文件。"); LoggerX.info("已重载配置文件。");
} }
} }

View File

@ -91,12 +91,10 @@ public class Job {
} }
// 如果耐久小于10提示玩家 // 如果耐久小于10提示玩家
pickaxe_damage = (Damageable) pickaxe_meta; pickaxe_damage = (Damageable) pickaxe_meta;
if (!pickaxe_meta.isUnbreakable()) {
if (pickaxe_damage.getDamage() >= 2031 - 10) { if (pickaxe_damage.getDamage() >= 2031 - 10) {
LoggerX.debug(index + " 下界合金镐耐久太低!"); LoggerX.debug(index + " 下界合金镐耐久太低!");
continue; continue;
} }
}
pickaxe = p; pickaxe = p;
break; break;
} }
@ -106,13 +104,9 @@ public class Job {
public static ItemStack useNetherPickaxe(ItemStack pickaxe) { public static ItemStack useNetherPickaxe(ItemStack pickaxe) {
int durability = pickaxe.getEnchantmentLevel(Enchantment.DURABILITY); int durability = pickaxe.getEnchantmentLevel(Enchantment.DURABILITY);
double random = Math.random(); double random = Math.random();
Damageable pickaxe_damage = (Damageable) pickaxe.getItemMeta();
if (pickaxe_damage.isUnbreakable()) {
// 无限耐久则不损坏
return pickaxe;
}
if (random < 1.0 / (durability + 1)) { if (random < 1.0 / (durability + 1)) {
// 扣除耐久 // 扣除耐久
Damageable pickaxe_damage = (Damageable) pickaxe.getItemMeta();
pickaxe_damage.setDamage(pickaxe_damage.getDamage() + 1); pickaxe_damage.setDamage(pickaxe_damage.getDamage() + 1);
pickaxe.setItemMeta(pickaxe_damage); pickaxe.setItemMeta(pickaxe_damage);
} }

View File

@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
public class Remove extends Job { public class Remove extends Job {
@ -35,7 +34,7 @@ public class Remove extends Job {
} }
// 获取玩家背包中的下届合金镐 // 获取玩家背包中的下届合金镐
HashMap<Integer, ?> pickaxes = getNetherPickaxes(_creator); HashMap<Integer, ?> pickaxes = getNetherPickaxes(_creator);
if (pickaxes.isEmpty()) { if (pickaxes.size() == 0) {
return JobErrCode.NO_PICKAXE; return JobErrCode.NO_PICKAXE;
} }
ItemStack pickaxe = getUsableNetherPickaxe(pickaxes, _creator); ItemStack pickaxe = getUsableNetherPickaxe(pickaxes, _creator);
@ -46,12 +45,9 @@ public class Remove extends Job {
BlockBreakEvent event = new BlockBreakEvent(raw_block, _creator); BlockBreakEvent event = new BlockBreakEvent(raw_block, _creator);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
Collection<ItemStack> drops = raw_block.getDrops(pickaxe, _creator);
raw_block.setType(Material.AIR); raw_block.setType(Material.AIR);
if (LiteWorldEdit.instance.getConfigMgr().isDropItems()) { if (LiteWorldEdit.instance.getConfigMgr().isDropItems()) {
for (ItemStack drop : drops) { raw_block.getWorld().dropItemNaturally(raw_block.getLocation(), new ItemStack(raw_block.getType()));
raw_block.getWorld().dropItemNaturally(raw_block.getLocation(), drop);
}
} }
// 损坏镐 // 损坏镐
if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) { if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {