From 3b9cf0f8031a2614ff2a041a1f3be7cc7fb4bbf4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 1 Jul 2020 14:17:48 +1000 Subject: [PATCH] Improve code formatting --- nms-patches/BlockFireAbstract.patch | 2 +- nms-patches/EntityZombie.patch | 2 +- src/main/java/com/mojang/brigadier/tree/CommandNode.java | 1 + src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +- .../org/bukkit/craftbukkit/inventory/CraftSmithingRecipe.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nms-patches/BlockFireAbstract.patch b/nms-patches/BlockFireAbstract.patch index b11cf53220..42f69a61f5 100644 --- a/nms-patches/BlockFireAbstract.patch +++ b/nms-patches/BlockFireAbstract.patch @@ -22,7 +22,7 @@ if (!iblockdata1.a(iblockdata.getBlock())) { - if (world.getDimensionKey() != World.OVERWORLD && world.getDimensionKey() != World.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) { + // CraftBukkit - getTypeKey() -+ if (world.getTypeKey()!= DimensionManager.OVERWORLD && world.getTypeKey()!= DimensionManager.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) { ++ if (world.getTypeKey() != DimensionManager.OVERWORLD && world.getTypeKey() != DimensionManager.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) { if (!iblockdata.canPlace(world, blockposition)) { - world.a(blockposition, false); + fireExtinguished(world, blockposition); // CraftBukkit - fuel block broke diff --git a/nms-patches/EntityZombie.patch b/nms-patches/EntityZombie.patch index d276af182e..e674111da8 100644 --- a/nms-patches/EntityZombie.patch +++ b/nms-patches/EntityZombie.patch @@ -56,7 +56,7 @@ entityzombie.u(entityzombie.world.getDamageScaler(entityzombie.getChunkCoordinates()).d()); entityzombie.u(entityzombie.eL() && this.eV()); } -+ else { ((Zombie) getBukkitEntity()).setConversionTime(-1); } // SPIGOT-5208: End conversion to stop event spam ++ else { ((Zombie) getBukkitEntity()).setConversionTime(-1); } // CraftBukkit - SPIGOT-5208: End conversion to stop event spam } diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java index 98592a3e63..5b30532093 100644 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java @@ -1,5 +1,6 @@ package com.mojang.brigadier.tree; +// CHECKSTYLE:OFF import com.google.common.collect.ComparisonChain; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 727906838b..35b25a02c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1530,7 +1530,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { break; } } - AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> {}); + AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { }); dummy.setValue(scaledHealth ? healthScale : getMaxHealth()); collection.add(dummy); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingRecipe.java index 7364e58f0e..025ee588c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingRecipe.java @@ -24,6 +24,6 @@ public class CraftSmithingRecipe extends SmithingRecipe implements CraftRecipe { public void addToCraftingManager() { ItemStack result = this.getResult(); - MinecraftServer.getServer().getCraftingManager().addRecipe(new net.minecraft.server.RecipeSmithing(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getBase(), true), toNMS(this.getAddition(), true), CraftItemStack.asNMSCopy(result))); + MinecraftServer.getServer().getCraftingManager().addRecipe(new net.minecraft.server.RecipeSmithing(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getBase(), true), toNMS(this.getAddition(), true), CraftItemStack.asNMSCopy(result))); } }