mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Fixes #1807
This commit is contained in:
parent
6dd02aaf6a
commit
5115175d7f
@ -80,6 +80,7 @@
|
|||||||
* Fixed unpermitted items in the book guide triggering the search function
|
* Fixed unpermitted items in the book guide triggering the search function
|
||||||
* Fixed #1803
|
* Fixed #1803
|
||||||
* Fixed #1806
|
* Fixed #1806
|
||||||
|
* Fixed #1807
|
||||||
|
|
||||||
## Release Candidate 10 (28 Mar 2020)
|
## Release Candidate 10 (28 Mar 2020)
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package me.mrCookieSlime.Slimefun.Objects;
|
package me.mrCookieSlime.Slimefun.Objects;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.ArrayList;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -163,7 +163,7 @@ public class Research implements Keyed {
|
|||||||
if (!isEnabled()) {
|
if (!isEnabled()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean creativeResearch = p.getGameMode() == GameMode.CREATIVE && SlimefunPlugin.getRegistry().isFreeCreativeResearchingEnabled();
|
boolean creativeResearch = p.getGameMode() == GameMode.CREATIVE && SlimefunPlugin.getRegistry().isFreeCreativeResearchingEnabled();
|
||||||
return creativeResearch || p.getLevel() >= cost;
|
return creativeResearch || p.getLevel() >= cost;
|
||||||
}
|
}
|
||||||
@ -239,12 +239,12 @@ public class Research implements Keyed {
|
|||||||
migrate(id, path);
|
migrate(id, path);
|
||||||
|
|
||||||
if (SlimefunPlugin.getResearchCfg().contains(path + ".enabled") && !SlimefunPlugin.getResearchCfg().getBoolean(path + ".enabled")) {
|
if (SlimefunPlugin.getResearchCfg().contains(path + ".enabled") && !SlimefunPlugin.getResearchCfg().getBoolean(path + ".enabled")) {
|
||||||
Iterator<SlimefunItem> iterator = items.iterator();
|
for (SlimefunItem item : new ArrayList<>(items)) {
|
||||||
while (iterator.hasNext()) {
|
if (item != null) {
|
||||||
SlimefunItem item = iterator.next();
|
item.setResearch(null);
|
||||||
if (item != null) item.setResearch(null);
|
}
|
||||||
iterator.remove();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user