From 321a9ff8483f5b93547167df226f2d02d1897d76 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 4 Nov 2018 17:41:29 +0100
Subject: [PATCH] fixed usage of a client-side patchouli method

---
 .../ellpeck/naturesaura/blocks/tiles/TileEntityWoodStand.java  | 3 +--
 .../java/de/ellpeck/naturesaura/events/TerrainGenEvents.java   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityWoodStand.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityWoodStand.java
index ffebf9fc..c45cef02 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityWoodStand.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityWoodStand.java
@@ -1,7 +1,6 @@
 package de.ellpeck.naturesaura.blocks.tiles;
 
 import de.ellpeck.naturesaura.Helper;
-import de.ellpeck.naturesaura.blocks.ModBlocks;
 import de.ellpeck.naturesaura.blocks.Multiblocks;
 import de.ellpeck.naturesaura.packet.PacketHandler;
 import de.ellpeck.naturesaura.packet.PacketParticleStream;
@@ -137,7 +136,7 @@ public class TileEntityWoodStand extends TileEntityImpl implements ITickable {
 
     private boolean isRitualOkay() {
         if (!Multiblocks.TREE_RITUAL.forEachMatcher(this.world, this.ritualPos, Rotation.NONE, (char) 0, (start, actionPos, x, y, z, ch, matcher) ->
-                matcher.getDisplayedState().getBlock() == ModBlocks.WOOD_STAND || Multiblocks.TREE_RITUAL.test(this.world, start, x, y, z, Rotation.NONE))) {
+                ch == 'W' || Multiblocks.TREE_RITUAL.test(this.world, start, x, y, z, Rotation.NONE))) {
             return false;
         }
         if (this.timer < this.recipe.time / 2) {
diff --git a/src/main/java/de/ellpeck/naturesaura/events/TerrainGenEvents.java b/src/main/java/de/ellpeck/naturesaura/events/TerrainGenEvents.java
index d26ff6cd..ca060adb 100644
--- a/src/main/java/de/ellpeck/naturesaura/events/TerrainGenEvents.java
+++ b/src/main/java/de/ellpeck/naturesaura/events/TerrainGenEvents.java
@@ -28,7 +28,7 @@ public class TerrainGenEvents {
         BlockPos pos = event.getPos();
         if (!world.isRemote) {
             if (Multiblocks.TREE_RITUAL.forEachMatcher(world, pos, Rotation.NONE, (char) 0, (start, actionPos, x, y, z, ch, matcher) ->
-                    matcher.getDisplayedState().getBlock() == ModBlocks.WOOD_STAND || Multiblocks.TREE_RITUAL.test(world, start, x, y, z, Rotation.NONE))) {
+                    ch == 'W' || Multiblocks.TREE_RITUAL.test(world, start, x, y, z, Rotation.NONE))) {
                 IBlockState sapling = world.getBlockState(pos);
                 ItemStack saplingStack = sapling.getBlock().getItem(world, pos, sapling);
                 if (!saplingStack.isEmpty()) {