mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Merge pull request #448 from dpkirchner/master

Browse Source 
Don't consume XP until we are about to unlock the requested research.
This commit is contained in:
TheBusyBiscuit 2017-10-07 09:15:57 +02:00 committed by GitHub
commit 5dd53540ee
1 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/me/mrCookieSlime/Slimefun/SlimefunGuide.java
View File

@ -672,34 +672,37 @@ public class SlimefunGuide {
@Override
public void run(final Player p) {
if (research.canUnlock(p)) {
p.setLevel(p.getLevel() - research.getCost());
if (research.hasUnlocked(p)) openCategory(p, category, true, selected_page, experimental);
else if (!Research.isResearching(p)) {
if (p.getGameMode() == GameMode.CREATIVE) {
research.unlock(p, true);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
@Override
public void run() {
openCategory(p, category, survival, selected_page, experimental);
}
}, 1L);
}
else {
research.unlock(p, false);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
@Override
public void run() {
openCategory(p, category, survival, selected_page, experimental);
}
}, 103L);
}
}
}
else Messages.local.sendTranslation(p, "messages.not-enough-xp", true);
if (!Research.isResearching(p)) {
if (research.canUnlock(p)) {
if (research.hasUnlocked(p))
openCategory(p, category, true, selected_page, experimental);
else {
if (!(p.getGameMode() == GameMode.CREATIVE && Research.creative_research)) {
p.setLevel(p.getLevel() - research.getCost());
}
if (p.getGameMode() == GameMode.CREATIVE) {
research.unlock(p, true);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
@Override
public void run() {
openCategory(p, category, survival, selected_page, experimental);
}
}, 1L);
} else {
research.unlock(p, false);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
@Override
public void run() {
openCategory(p, category, survival, selected_page, experimental);
}
}, 103L);
}
}
} else Messages.local.sendTranslation(p, "messages.not-enough-xp", true);
}
}
});
}
@ -859,30 +862,31 @@ public class SlimefunGuide {
@Override
public boolean onClick(final Player p, int slot, ItemStack item, ClickAction action) {
if (research.canUnlock(p)) {
if (!(p.getGameMode() == GameMode.CREATIVE && Research.creative_research)) {
p.setLevel(p.getLevel() - research.getCost());
}
if (research.hasUnlocked(p)) openCategory(p, category, true, selected_page, experimental);
else if (!Research.isResearching(p)) {
if (p.getGameMode() == GameMode.CREATIVE) {
research.unlock(p, Research.creative_research);
openCategory(p, category, survival, selected_page, experimental);
}
else {
research.unlock(p, false);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
@Override
public void run() {
openCategory(p, category, survival, selected_page, experimental);
}
}, 103L);
}
}
if (!Research.isResearching(p)) {
if (research.canUnlock(p)) {
if (research.hasUnlocked(p))
openCategory(p, category, true, selected_page, experimental);
else {
if (!(p.getGameMode() == GameMode.CREATIVE && Research.creative_research)) {
p.setLevel(p.getLevel() - research.getCost());
}
if (p.getGameMode() == GameMode.CREATIVE) {
research.unlock(p, Research.creative_research);
openCategory(p, category, survival, selected_page, experimental);
} else {
research.unlock(p, false);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
@Override
public void run() {
openCategory(p, category, survival, selected_page, experimental);
}
}, 103L);
}
}
} else Messages.local.sendTranslation(p, "messages.not-enough-xp", true);
}
else Messages.local.sendTranslation(p, "messages.not-enough-xp", true);
return false;
}
});