summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/Enchantment.java
diff options
context:
space:
mode:
authorNate Mortensen <nate.richard.mortensen@gmail.com>2013-07-01 06:03:00 -0500
committerWesley Wolfe <weswolf@aol.com>2013-07-01 12:10:06 -0500
commit6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch)
tree573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/Enchantment.java
parentf887b76a259e12468b28d82d1eced93f0b73bd6d (diff)
downloadcraftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/Enchantment.java')
-rw-r--r--src/main/java/net/minecraft/server/Enchantment.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Enchantment.java b/src/main/java/net/minecraft/server/Enchantment.java
index fec45c46..54071dba 100644
--- a/src/main/java/net/minecraft/server/Enchantment.java
+++ b/src/main/java/net/minecraft/server/Enchantment.java
@@ -71,8 +71,8 @@ public abstract class Enchantment {
return 0;
}
- public int a(int i, EntityLiving entityliving) {
- return 0;
+ public float a(int i, EntityLiving entityliving) {
+ return 0.0F;
}
public boolean a(Enchantment enchantment) {
@@ -106,7 +106,6 @@ public abstract class Enchantment {
for (int j = 0; j < i; ++j) {
Enchantment enchantment = aenchantment[j];
-
if (enchantment != null) {
arraylist.add(enchantment);
}