config.yml fix + hunger to rtp added

This commit is contained in:
SuperRonanCraft 2020-09-21 21:25:19 -04:00
parent 18f4ebb40e
commit 60458c35f9
3 changed files with 50 additions and 43 deletions

View File

@ -4,6 +4,7 @@ import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
import me.SuperRonanCraft.BetterRTP.Main; import me.SuperRonanCraft.BetterRTP.Main;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
import org.bukkit.GameMode;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
@ -15,11 +16,15 @@ public class DepEconomy {
public boolean charge(Player player, int price) { public boolean charge(Player player, int price) {
check(false); check(false);
//Hunger Stuff //Hunger Stuff
if (hunger != 0) { boolean took_food = false;
boolean has_hunger = player.getSaturation() > hunger; if (hunger != 0 && (player.getGameMode() == GameMode.SURVIVAL || player.getGameMode() == GameMode.ADVENTURE)) {
boolean has_hunger = player.getFoodLevel() > hunger;
if (!has_hunger) { if (!has_hunger) {
Main.getInstance().getText().getFailedHunger(player); Main.getInstance().getText().getFailedHunger(player);
return false; return false;
} else {
player.setFoodLevel(player.getFoodLevel() - hunger);
took_food = true;
} }
} }
//Economy Stuff //Economy Stuff
@ -27,8 +32,11 @@ public class DepEconomy {
try { try {
EconomyResponse r = e.withdrawPlayer(player, price); EconomyResponse r = e.withdrawPlayer(player, price);
boolean passed_economy = r.transactionSuccess(); boolean passed_economy = r.transactionSuccess();
if (passed_economy) if (!passed_economy) {
Main.getInstance().getText().getFailedPrice(player, price); Main.getInstance().getText().getFailedPrice(player, price);
if (took_food)
player.setFoodLevel(player.getFoodLevel() + hunger);
}
return passed_economy; return passed_economy;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

View File

@ -100,7 +100,6 @@ public class FileBasics {
config.options().copyDefaults(true); config.options().copyDefaults(true);
in.close(); in.close();
} }
Main.getInstance().saveDefaultConfig();
config.save(file); config.save(file);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();