OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-15 12:02:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implemented Enchantment.conflictsWith(). Addresses BUKKIT-1159

Browse source
This commit is contained in:
Celtic Minstrel 2012-03-12 15:32:46 -04:00 • committed by EvilSeph
parent 28c1f571d2
commit f219f0efe9
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
View file

@ -116,4 +116,16 @@ public class CraftEnchantment extends Enchantment {
return null;
}
@Override
public boolean conflictsWith(Enchantment other) {
if (other instanceof EnchantmentWrapper) {
other = ((EnchantmentWrapper) other).getEnchantment();
}
if (!(other instanceof CraftEnchantment)) {
return false;
}
CraftEnchantment ench = (CraftEnchantment) other;
return !target.a(ench.target);
}
}