From ca018a63b3b7fb1134c1d82b4007713ac17cf0f2 Mon Sep 17 00:00:00 2001
From: Stephen Seo <seo.disparate@gmail.com>
Date: Wed, 12 Sep 2018 16:10:02 +0900
Subject: [PATCH] Fix for server/client setup

---
 .../com/seodisparate/TurnBasedMinecraft/common/Battle.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
index 80550cd..5cc2485 100644
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
@@ -14,7 +14,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import com.seodisparate.TurnBasedMinecraft.common.networking.PacketBattleInfo;
 import com.seodisparate.TurnBasedMinecraft.common.networking.PacketBattleMessage;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -590,7 +589,7 @@ public class Battle
                                     // have player look at attack target
                                     final Entity nextEntity = next.entity;
                                     final Entity targetEntity = target.entity;
-                                    Minecraft.getMinecraft().addScheduledTask(() -> {
+                                    next.entity.getServer().addScheduledTask(() -> {
                                         ((EntityPlayerMP)nextEntity).connection.setPlayerLocation(nextEntity.posX, nextEntity.posY, nextEntity.posZ, Utility.yawDirection(nextEntity.posX, nextEntity.posZ, targetEntity.posX, targetEntity.posZ), Utility.pitchDirection(nextEntity.posX, nextEntity.posY, nextEntity.posZ, targetEntity.posX, targetEntity.posY, targetEntity.posZ));
                                     });
                                     TurnBasedMinecraftMod.attackingEntity = next.entity;