diff options
| author | md_5 <git@md-5.net> | 2017-05-19 21:00:13 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-05-19 21:00:13 +1000 |
| commit | 10043529907a4ba913ebe2712876e4b1911263b8 (patch) | |
| tree | 37f3cbb2527d02eac320ed0900bf92a4f3c8407c /src/main | |
| parent | 3ecbb59cbb9e20064d04628d26387742705ab9ac (diff) | |
| download | craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.gz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.lz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.xz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.zip | |
Update to Minecraft 1.12-pre5
Diffstat (limited to 'src/main')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 5fbd1247..825ca934 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -551,13 +551,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @Override public void setAI(boolean ai) { if (this.getHandle() instanceof EntityInsentient) { - ((EntityInsentient) this.getHandle()).setAI(!ai); + ((EntityInsentient) this.getHandle()).setNoAI(!ai); } } @Override public boolean hasAI() { - return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).hasAI(): false; + return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).isNoAI(): false; } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java index 26e94558..44df9301 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java @@ -51,7 +51,7 @@ public class CraftShapedRecipe extends ShapedRecipe implements CraftRecipe { for (int i = 0; i < shape.length; i++) { String row = shape[i]; for (int j = 0; j < row.length(); j++) { - data.set(i * width + j, new RecipeItemStack(CraftItemStack.asNMSCopy(ingred.get(row.charAt(j))))); + data.set(i * width + j, RecipeItemStack.a(new net.minecraft.server.ItemStack[]{CraftItemStack.asNMSCopy(ingred.get(row.charAt(j)))})); } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java index 7ba9502a..211898c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java @@ -40,7 +40,7 @@ public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe List<ItemStack> ingred = this.getIngredientList(); NonNullList<RecipeItemStack> data = NonNullList.a(ingred.size(), RecipeItemStack.a); for (int i = 0; i < ingred.size(); i++) { - data.set(i, new RecipeItemStack(CraftItemStack.asNMSCopy(ingred.get(i)))); + data.set(i, RecipeItemStack.a(new net.minecraft.server.ItemStack[]{CraftItemStack.asNMSCopy(ingred.get(i))})); } CraftingManager.a(CraftNamespacedKey.toMinecraft(this.getKey()), new ShapelessRecipes("", CraftItemStack.asNMSCopy(this.getResult()), data)); |