Merge branch 'master_prb_gn' into master_test_gn
commit
3673e1b713
|
@ -196,7 +196,7 @@ public class AbstractWelfareBag extends MongoBase{
|
||||||
|
|
||||||
public int getLimit() {
|
public int getLimit() {
|
||||||
SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(modId);
|
SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(modId);
|
||||||
if (this instanceof PushWelfareBag){
|
if (this instanceof PushWelfareBag || config == null){
|
||||||
return limit;
|
return limit;
|
||||||
}
|
}
|
||||||
return config.getLimit();
|
return config.getLimit();
|
||||||
|
|
Loading…
Reference in New Issue