From 2647dbcf916a6057974c1d1c9829e4e9ef92c988 Mon Sep 17 00:00:00 2001 From: gsand Date: Fri, 28 Nov 2014 13:53:48 -0600 Subject: [PATCH] Configurable game mechanics changes diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index dc4f526..45b5ac5 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -340,13 +340,7 @@ public class EntityBoat extends Entity { if (!destroyEvent.isCancelled()) { this.die(); - for (k = 0; k < 3; ++k) { - this.a(Item.getItemOf(Blocks.PLANKS), 1, 0.0F); - } - - for (k = 0; k < 2; ++k) { - this.a(Items.STICK, 1, 0.0F); - } + breakNaturally(); // PaperSpigot } // CraftBukkit end } @@ -452,15 +446,7 @@ public class EntityBoat extends Entity { if (!destroyEvent.isCancelled()) { this.die(); - int i; - - for (i = 0; i < 3; ++i) { - this.a(Item.getItemOf(Blocks.PLANKS), 1, 0.0F); - } - - for (i = 0; i < 2; ++i) { - this.a(Items.STICK, 1, 0.0F); - } + breakNaturally(); // PaperSpigot } // CraftBukkit end } @@ -496,4 +482,21 @@ public class EntityBoat extends Entity { public int m() { return this.datawatcher.getInt(18); } + + /** + * PaperSpigot - Handles boat drops depending on the user's config setting + */ + public void breakNaturally() { + if (this.world.paperSpigotConfig.boatsDropBoats) { + this.a(Items.BOAT, 1, 0.0F); + } else { + for (int k = 0; k < 3; ++k) { + this.a(Item.getItemOf(Blocks.PLANKS), 1, 0.0F); + } + + for (int k = 0; k < 2; ++k) { + this.a(Items.STICK, 1, 0.0F); + } + } + } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java index 9507ab5..7f02e29 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -180,4 +180,10 @@ public class PaperSpigotWorldConfig removeUnloadedTNTEntities = getBoolean( "remove-unloaded.tnt-entities", true ); removeUnloadedFallingBlocks = getBoolean( "remove-unloaded.falling-blocks", true ); } + + public boolean boatsDropBoats; + private void mechanicsChanges() + { + boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false ); + } } -- 1.9.1