From 30886da0ad6770572244cbedc4e95dd4f0c0aaea Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Thu, 28 Apr 2022 23:09:07 -0700
Subject: [PATCH] Fix compile error caused by merge

---
 src/main/java/emu/grasscutter/game/entity/EntityVehicle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
index 06e5ee14a..c7609f89b 100644
--- a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
@@ -25,7 +25,7 @@ import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
-public class EntityVehicle extends EntityGadget {
+public class EntityVehicle extends EntityBaseGadget {
 	private final Player owner;
 	private final Int2FloatOpenHashMap fightProp;