GH-2026 implement changes necessary to support 1.13 snapshots

2017-11-11 01:38:31 +01:00
parent 17c8f31a09
commit 85ae710d40
51 changed files with 2632 additions and 1058 deletions
--- a/api/logic/meta/BaseEntity.cpp
+++ b/api/logic/meta/BaseEntity.cpp
@ -99,7 +99,7 @@ bool Meta::BaseEntity::loadLocalFile()
 	}
 }

-void Meta::BaseEntity::load()
+void Meta::BaseEntity::load(Net::Mode loadType)
 {
 	// load local file if nothing is loaded yet
 	if(!isLoaded())
@ -110,7 +110,7 @@ void Meta::BaseEntity::load()
 		}
 	}
 	// if we need remote update, run the update task
-	if(!shouldStartRemoteUpdate())
+	if(loadType == Net::Mode::Offline || !shouldStartRemoteUpdate())
 	{
 		return;
 	}