Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
@@ -60,7 +60,7 @@ public class CraftEffect {
            break;
        case STEP_SOUND:
            Validate.isTrue(((Material) data).isBlock(), "Material is not a block!");
-            datavalue = Block.getCombinedId(CraftMagicNumbers.getBlock((Material) data).getBlockData());
+            datavalue = Block.getId(CraftMagicNumbers.getBlock((Material) data).defaultBlockState());
            break;
        case COMPOSTER_FILL_ATTEMPT:
            datavalue = ((Boolean) data) ? 1 : 0;