From 6ebe534a29add8e3965c92f0d6be54d7a1a72a6f Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Wed, 27 May 2020 23:14:01 +0200
Subject: [PATCH] merged with master # Conflicts: #
 core/src/netwerkprog/game/util/game/GameCharacter.java

---
 core/src/netwerkprog/game/util/game/GameCharacter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java
index 1eeed48..21e6219 100644
--- a/core/src/netwerkprog/game/util/game/GameCharacter.java
+++ b/core/src/netwerkprog/game/util/game/GameCharacter.java
@@ -2,12 +2,13 @@ package netwerkprog.game.util.game;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.scenes.scene2d.Actor;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Objects;
 
-public abstract class GameCharacter implements Comparable<GameCharacter> {
+public abstract class GameCharacter extends Actor implements Comparable<GameCharacter> {
     protected String name;
     protected Faction faction;
     protected HashSet<Ability> abilities;