From df156444e7e23c0fedb355679d6c170da44db991 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 14 Oct 2021 21:24:19 -0400
Subject: [PATCH] Prioritize mod content in parser

---
 core/src/mindustry/mod/ContentParser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index b83af88097..93f6567667 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -566,8 +566,8 @@ public class ContentParser{
     }
 
     private <T extends MappableContent> T locate(ContentType type, String name){
-        T first = Vars.content.getByName(type, name); //try vanilla replacement
-        return first != null ? first : Vars.content.getByName(type, currentMod.name + "-" + name);
+        T first = Vars.content.getByName(type, currentMod.name + "-" + name); //try vanilla replacement
+        return first != null ? first : Vars.content.getByName(type, name);
     }
 
     private <T extends MappableContent> T locateAny(String name){