More merge fixes

This commit is contained in:
Luis C.M committed 2022-05-27 15:54:12 -05:00
1 parent ec5fc71413
commit 8d4a7ea0b6
10 files changed
+63 -393

No files matched your search

@@ -1,11 +1,8 @@
package noppes.npcs.scripted;
import noppes.npcs.controllers.Faction;
import noppes.npcs.controllers.FactionController;
import noppes.npcs.scripted.entity.ScriptNpc;
import noppes.npcs.scripted.entity.ScriptPlayer;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.controllers.data.Faction;
import noppes.npcs.controllers.FactionController;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.interfaces.entity.ICustomNpc;
import noppes.npcs.scripted.interfaces.entity.IPlayer;