diff options
| author | Celtic Minstrel <celtic.minstrel.ca@some.place> | 2012-03-12 15:33:19 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-13 22:20:02 -0400 |
| commit | e30b8961630b6355032748ecf44df2fc0a512494 (patch) | |
| tree | 4c38c8ed99eea2145ea2dffcbab73a863000a749 /src/test/java/org | |
| parent | 668c369ecc3c06a68a46509fd8dcf3e820b1c369 (diff) | |
| download | bukkit-e30b8961630b6355032748ecf44df2fc0a512494.tar bukkit-e30b8961630b6355032748ecf44df2fc0a512494.tar.gz bukkit-e30b8961630b6355032748ecf44df2fc0a512494.tar.lz bukkit-e30b8961630b6355032748ecf44df2fc0a512494.tar.xz bukkit-e30b8961630b6355032748ecf44df2fc0a512494.zip | |
Added Enchantment.conflictsWith() and EnchantmentTarget.includes(). Addresses BUKKIT-1159 and addresses BUKKIT-1160
Diffstat (limited to 'src/test/java/org')
| -rw-r--r-- | src/test/java/org/bukkit/configuration/file/TestEnchantment.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/java/org/bukkit/configuration/file/TestEnchantment.java b/src/test/java/org/bukkit/configuration/file/TestEnchantment.java index ac3ec871..93569721 100644 --- a/src/test/java/org/bukkit/configuration/file/TestEnchantment.java +++ b/src/test/java/org/bukkit/configuration/file/TestEnchantment.java @@ -47,4 +47,9 @@ public class TestEnchantment extends Enchantment { return true;
}
+ @Override
+ public boolean conflictsWith(Enchantment other) {
+ return false;
+ }
+
}
|