Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2024-09-29 07:07:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixed issue with FabledSkyblock.

Browse Source
This commit is contained in:
Brianna 2019-10-09 15:57:02 -04:00
parent b4839a8a0b
commit a911036da4
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -61,7 +61,7 @@
<repositories>
<repository>
<id>private</id>
<url>http://repo.songoda.com/artifactory/private/</url>
<url>https://repo.songoda.com/artifactory/private/</url>
</repository>
</repositories>
<dependencies>

4
src/main/java/com/songoda/epicfarming/EpicFarming.java
View File

@ -17,6 +17,7 @@ import com.songoda.epicfarming.farming.Level;
import com.songoda.epicfarming.farming.LevelManager;
import com.songoda.epicfarming.listeners.BlockListeners;
import com.songoda.epicfarming.listeners.InteractListeners;
import com.songoda.epicfarming.listeners.UnloadListeners;
import com.songoda.epicfarming.settings.Settings;
import com.songoda.epicfarming.storage.Storage;
import com.songoda.epicfarming.storage.StorageRow;
@ -124,7 +125,7 @@ public class EpicFarming extends SongodaPlugin {
int level = 1;
int configLevel = row.get("level").asInt();
if (configLevel != 0 && configLevel > 0) {
if (configLevel > 0) {
level = configLevel;
}
List<ItemStack> items = new ArrayList<ItemStack>();
@ -172,6 +173,7 @@ public class EpicFarming extends SongodaPlugin {
PluginManager pluginManager = Bukkit.getPluginManager();
pluginManager.registerEvents(new BlockListeners(this), this);
pluginManager.registerEvents(new InteractListeners(this), this);
pluginManager.registerEvents(new UnloadListeners(this), this);
// Start tasks
this.growthTask = GrowthTask.startTask(this);

3
src/main/java/com/songoda/epicfarming/listeners/InteractListeners.java
View File

@ -1,13 +1,16 @@
package com.songoda.epicfarming.listeners;
import com.songoda.epicfarming.EpicFarming;
import com.songoda.epicfarming.farming.Farm;
import com.songoda.epicfarming.settings.Settings;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.world.ChunkUnloadEvent;
/**
* Created by songoda on 3/14/2017.

32
src/main/java/com/songoda/epicfarming/listeners/UnloadListeners.java Normal file
View File

@ -0,0 +1,32 @@
package com.songoda.epicfarming.listeners;
import com.songoda.epicfarming.EpicFarming;
import com.songoda.epicfarming.farming.Farm;
import com.songoda.epicfarming.settings.Settings;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.world.ChunkUnloadEvent;
public class UnloadListeners implements Listener {
private EpicFarming instance;
public UnloadListeners(EpicFarming instance) {
this.instance = instance;
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onUnload(ChunkUnloadEvent event) {
Material type = Settings.FARM_BLOCK_MATERIAL.getMaterial().getMaterial();
for (Farm farm : instance.getFarmManager().getFarms().values()) {
int x = farm.getLocation().getBlockX() >> 4;
int z = farm.getLocation().getBlockZ() >> 4;
if (event.getChunk().getX() == x && event.getChunk().getZ() == z) {
if (farm.getLocation().getBlock().getType() != type)
instance.getFarmManager().removeFarm(farm.getLocation());
}
}
}
}