1 files changed, 13 insertions, 8 deletions
diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index 0c174feca..99b20b015 100644
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -24,11 +24,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common/c_content.h"
 #include "itemdef.h"
 #include "nodedef.h"
-#include "server.h"
 #include "content_sao.h"
 #include "inventory.h"
 #include "log.h"
-
+#include "script/cpp_api/s_base.h"
+#ifndef SERVER
+#include "client/client.h"
+#include "client/renderingengine.h"
+#include "client/shader.h"
+#endif
 
 // garbage collector
 int LuaItemStack::gc_object(lua_State *L)
@@ -513,9 +517,9 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 
 	// Get the writable item and node definition managers from the server
 	IWritableItemDefManager *idef =
-			getServer(L)->getWritableItemDefManager();
+			getGameDef(L)->getWritableItemDefManager();
 	NodeDefManager *ndef =
-			getServer(L)->getWritableNodeDefManager();
+			getGameDef(L)->getWritableNodeDefManager();
 
 	// Check if name is defined
 	std::string name;
@@ -563,8 +567,9 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 					+ itos(MAX_REGISTERED_CONTENT+1)
 					+ ") exceeded (" + name + ")");
 		}
+		
 	}
-
+	
 	return 0; /* number of results */
 }
 
@@ -575,12 +580,12 @@ int ModApiItemMod::l_unregister_item_raw(lua_State *L)
 	std::string name = luaL_checkstring(L, 1);
 
 	IWritableItemDefManager *idef =
-			getServer(L)->getWritableItemDefManager();
+			getGameDef(L)->getWritableItemDefManager();
 
 	// Unregister the node
 	if (idef->get(name).type == ITEM_NODE) {
 		NodeDefManager *ndef =
-			getServer(L)->getWritableNodeDefManager();
+			getGameDef(L)->getWritableNodeDefManager();
 		ndef->removeNode(name);
 	}
 
@@ -598,7 +603,7 @@ int ModApiItemMod::l_register_alias_raw(lua_State *L)
 
 	// Get the writable item definition manager from the server
 	IWritableItemDefManager *idef =
-			getServer(L)->getWritableItemDefManager();
+			getGameDef(L)->getWritableItemDefManager();
 
 	idef->registerAlias(name, convert_to);