mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #1807

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-04-13 20:08:05 +02:00
parent 6dd02aaf6a
commit 5115175d7f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -80,6 +80,7 @@
* Fixed unpermitted items in the book guide triggering the search function
* Fixed #1803
* Fixed #1806
* Fixed #1807
## Release Candidate 10 (28 Mar 2020)

14
src/main/java/me/mrCookieSlime/Slimefun/Objects/Research.java
View File

@ -1,6 +1,6 @@
package me.mrCookieSlime.Slimefun.Objects;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@ -163,7 +163,7 @@ public class Research implements Keyed {
if (!isEnabled()) {
return true;
}
boolean creativeResearch = p.getGameMode() == GameMode.CREATIVE && SlimefunPlugin.getRegistry().isFreeCreativeResearchingEnabled();
return creativeResearch || p.getLevel() >= cost;
}
@ -239,12 +239,12 @@ public class Research implements Keyed {
migrate(id, path);
if (SlimefunPlugin.getResearchCfg().contains(path + ".enabled") && !SlimefunPlugin.getResearchCfg().getBoolean(path + ".enabled")) {
Iterator<SlimefunItem> iterator = items.iterator();
while (iterator.hasNext()) {
SlimefunItem item = iterator.next();
if (item != null) item.setResearch(null);
iterator.remove();
for (SlimefunItem item : new ArrayList<>(items)) {
if (item != null) {
item.setResearch(null);
}
}
return;
}