upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 06:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better DBC Loaded Handling

Browse Source
This commit is contained in:
Kam committed 2025-03-11 22:18:39 -04:00
1 parent 7e2ed41169
commit 53daf359cd
1 file changed
+7 -22
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/scripted/NpcAPI.java
+7 -22
View File
@@ -1,5 +1,6 @@
package noppes.npcs.scripted;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.EventBus;
import foxz.command.ScriptedCommand;
import kamkeel.npcs.controllers.ProfileController;
@@ -269,6 +270,8 @@ public class NpcAPI extends AbstractNpcAPI {
return biomes.toArray(new String[]{});
}
public static Boolean dbcLoaded = null;
public IEntity<?> getIEntity(Entity entity) {
if(entity == null)
return null;
@@ -276,30 +279,12 @@ public class NpcAPI extends AbstractNpcAPI {
return ((EntityNPCInterface)entity).wrappedNPC;
else{
ScriptEntityData data = (ScriptEntityData) entity.getExtendedProperties("ScriptedObject");
boolean isDBC = false;
if(entity instanceof EntityPlayerMP) {
Set<?> keySet = entity.getEntityData().getCompoundTag("PlayerPersisted").func_150296_c();
for (Object o : keySet) {
String s = (String) o;
if (s.contains("jrmc")) {
isDBC = true;
break;
}
}
}
if (data == null || data.base instanceof ScriptDBCPlayer != isDBC) {
if (data == null) {
if (entity instanceof EntityPlayerMP) {
ScriptEntityData newData;
if (isDBC) {
newData = new ScriptEntityData(new ScriptDBCPlayer<>((EntityPlayerMP) entity));
} else {
newData = new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity));
if(dbcLoaded == null){
dbcLoaded = Loader.isModLoaded("jinryuujrmcore");
}
if (data != null) {
((ScriptEntity<?>) newData.base).copyTempData(data.base);
}
data = newData;
data = dbcLoaded ? new ScriptEntityData(new ScriptDBCPlayer<>((EntityPlayerMP) entity)) : new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity));
}
else if (PixelmonHelper.isPixelmon(entity))
return new ScriptPixelmon<EntityTameable>((EntityTameable) entity);