Port flat bedrock (generator settings) to 1.18 (#6960)

2021-12-01 02:31:13 +01:00 · 2021-12-01 02:31:13 +01:00 · cd9fe9ca64
commit cd9fe9ca64
parent effa3bad36
475 changed files with 270 additions and 234 deletions
--- a/patches/server/0615-Add-Block-isValidTool.patch
+++ b/patches/server/0615-Add-Block-isValidTool.patch
@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Mon, 6 Jul 2020 12:44:31 -0700
+Subject: [PATCH] Add Block#isValidTool
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+index 4c30b6d0d70a48b39bd99b5e9761f950b8b0c340..011f34034bf6d8481e91b08894c68d87de41f2c1 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+@@ -672,5 +672,9 @@ public class CraftBlock implements Block {
+         }
+         return speed;
+     }
+
+    public boolean isValidTool(ItemStack itemStack) {
+        return getDrops(itemStack).size() != 0;
+    }
+     // Paper end
+ }