summaryrefslogtreecommitdiffstats
path: root/src/test/java/org/bukkit
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2014-06-26 13:05:08 -0500
committerTravis Watkins <amaranth@ubuntu.com>2014-07-08 14:31:10 -0500
commitdbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch)
tree062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/test/java/org/bukkit
parenta8628fd645e12ec22bc525f49dd25f68d094f3ef (diff)
downloadcraftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar
craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz
craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz
craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz
craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/test/java/org/bukkit')
-rw-r--r--src/test/java/org/bukkit/StatisticsAndAchievementsTest.java2
-rw-r--r--src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java b/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java
index 41e6a89a..0a6c277a 100644
--- a/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java
+++ b/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java
@@ -39,7 +39,7 @@ public class StatisticsAndAchievementsTest extends AbstractTestingBase {
@SuppressWarnings("unchecked")
public void verifyStatisticMapping() throws Throwable {
HashMultiset<Statistic> statistics = HashMultiset.create();
- for (net.minecraft.server.Statistic statistic : (List<net.minecraft.server.Statistic>) StatisticList.b) {
+ for (net.minecraft.server.Statistic statistic : (List<net.minecraft.server.Statistic>) StatisticList.stats) {
if (statistic instanceof net.minecraft.server.Achievement) {
continue;
}
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
index 610293f1..f5bcbdbe 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
@@ -33,7 +33,7 @@ public class ItemFactoryTest extends AbstractTestingBase {
for (final Field field : clazz.getDeclaredFields()) {
if (IAttribute.class.isAssignableFrom(field.getType()) && Modifier.isStatic(field.getModifiers())) {
field.setAccessible(true);
- final String attributeName = ((IAttribute) field.get(null)).a();
+ final String attributeName = ((IAttribute) field.get(null)).getName();
assertThat("Logical error: duplicate name `" + attributeName + "' in " + clazz.getName(), names.add(attributeName), is(true));
assertThat(clazz.getName(), CraftItemFactory.KNOWN_NBT_ATTRIBUTE_NAMES, hasItem(attributeName));
}