From 07305aecf49ea6e6da340e07ec7d1116e6d3416a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 3 Sep 2020 16:02:14 -0400
Subject: [PATCH] Unit bugfixes

---
 .../main/java/mindustry/annotations/entity/EntityIO.java    | 6 ++++++
 core/src/mindustry/entities/Effect.java                     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
index 341b26df3a..05872c155b 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
@@ -147,6 +147,12 @@ public class EntityIO{
 
                     io(field.type, "");
 
+                    //just assign the two values so jumping does not occur on de-possession
+                    if(sf){
+                        st(field.name + lastSuf + " = this." + field.name);
+                        st(field.name + targetSuf + " = this." + field.name);
+                    }
+
                     econt();
                 }
             }
diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java
index 7950c5375c..7681c1fb0c 100644
--- a/core/src/mindustry/entities/Effect.java
+++ b/core/src/mindustry/entities/Effect.java
@@ -89,6 +89,7 @@ public class Effect{
     public void render(int id, Color color, float life, float rotation, float x, float y, Object data){
         container.set(id, color, life, lifetime, rotation, x, y, data);
         Draw.z(ground ? Layer.debris : Layer.effect);
+        Draw.reset();
         renderer.get(container);
         Draw.reset();
     }