Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ziggeh
2014-03-02 15:27:17 +01:00
+3 -1
View File
@@ -575,7 +575,9 @@ public class PlayerService implements INetworkDispatch {
try {
String customServerTemplate = null;
if (!item.contains("/")) {
if (item.contains("/")) {
item = (item.substring(0, (item.lastIndexOf("/") + 1)) + "/shared_" + item.substring((item.lastIndexOf("/") + 1)));
} else {
customServerTemplate = item;
item = core.scriptService.callScript("scripts/roadmap/", "roadmap_rewards", "get", item).asString();
}