Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2024-11-27 21:15:28 +01:00
Code Issues Projects Releases Wiki Activity

touch ups

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-10-27 13:26:55 -04:00
parent a0da2bbbf8
commit 48bdc44b09
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/listeners/BlockListeners.java
View File

@ -151,8 +151,6 @@ public class BlockListeners implements Listener {
Farm farm = instance.getFarmManager().removeFarm(event.getBlock().getLocation()); Farm farm = instance.getFarmManager().removeFarm(event.getBlock().getLocation());
if (farm == null) { if (farm == null) {
if (event.getBlock().getType() == Material.END_ROD)
event.getBlock().getLocation().getWorld().dropItemNaturally(event.getBlock().getLocation().add(.5,.5,.5), new ItemStack(Material.END_ROD));
return; return;
} }
instance.getFarmTask().getCrops(farm, false); instance.getFarmTask().getCrops(farm, false);

4
EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/storage/StorageItem.java
View File

@ -10,7 +10,7 @@ public class StorageItem {
private String key = null; private String key = null;
private final Object object; private Object object;
public StorageItem(Object object) { public StorageItem(Object object) {
this.object = object; this.object = object;
@ -22,8 +22,10 @@ public class StorageItem {
} }
public StorageItem(String key, List<ItemStack> material) { public StorageItem(String key, List<ItemStack> material) {
if (material == null || material.isEmpty()) return;
StringBuilder object = new StringBuilder(); StringBuilder object = new StringBuilder();
for (ItemStack m : material) { for (ItemStack m : material) {
if (m == null) continue;
object.append(Serializers.serialize(m)); object.append(Serializers.serialize(m));
object.append(";;"); object.append(";;");
} }

2
EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/storage/types/StorageMysql.java
View File

@ -66,7 +66,7 @@ public class StorageMysql extends Storage {
@Override @Override
public void clearFile() { public void clearFile() {
try { try {
database.getConnection().createStatement().execute("TRUNCATE `" + instance.getConfig().getString("Database.Prefix") + "sync`"); database.getConnection().createStatement().execute("TRUNCATE `" + instance.getConfig().getString("Database.Prefix") + "farms`");
database.getConnection().createStatement().execute("TRUNCATE `" + instance.getConfig().getString("Database.Prefix") + "boosts`"); database.getConnection().createStatement().execute("TRUNCATE `" + instance.getConfig().getString("Database.Prefix") + "boosts`");
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();

2
EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/utils/MySQLDatabase.java
View File

@ -27,7 +27,7 @@ public class MySQLDatabase {
"\t`location` TEXT NULL,\n" + "\t`location` TEXT NULL,\n" +
"\t`level` INT NULL,\n" + "\t`level` INT NULL,\n" +
"\t`placedby` TEXT NULL,\n" + "\t`placedby` TEXT NULL,\n" +
"\t`contents` TEXT NULL, \n"+ "\t`contents` TEXT NULL \n"+
")"); ")");
connection.createStatement().execute("CREATE TABLE IF NOT EXISTS `" + instance.getConfig().getString("Database.Prefix") + "boosts` (\n" + connection.createStatement().execute("CREATE TABLE IF NOT EXISTS `" + instance.getConfig().getString("Database.Prefix") + "boosts` (\n" +

2
EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/utils/SettingsManager.java
View File

@ -207,7 +207,7 @@ public class SettingsManager implements Listener {
d2("Database.Username","root"), d2("Database.Username","root"),
d3("Database.Password","password"), d3("Database.Password","password"),
d4("Database.Database Name","EpicFarming"), d4("Database.Database Name","EpicFarming"),
d5("Database.Prefix","EF-"), d5("Database.Prefix","EFA-"),
o12("Interfaces.Economy Icon", "SUNFLOWER"), o12("Interfaces.Economy Icon", "SUNFLOWER"),
o13("Interfaces.XP Icon", "EXPERIENCE_BOTTLE"), o13("Interfaces.XP Icon", "EXPERIENCE_BOTTLE"),