Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-01-25 08:51:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix generators acting strangely in 1.12.2-

Browse Source
This commit is contained in:
Esophose 2019-02-23 15:53:04 -07:00
parent 2c5289570c
commit 978ad7be0a
3 changed files with 36 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/me/goodandevil/skyblock/generator/GeneratorLocation.java
View File

@ -1,60 +0,0 @@
package me.goodandevil.skyblock.generator;
import org.bukkit.block.Block;
import me.goodandevil.skyblock.island.IslandWorld;
public class GeneratorLocation {
private IslandWorld world;
private int blockX;
private int blockY;
private int blockZ;
private int liquidX;
private int liquidY;
private int liquidZ;
public GeneratorLocation(IslandWorld world, Block block, Block liquid) {
this.world = world;
this.blockX = block.getLocation().getBlockX();
this.blockY = block.getLocation().getBlockY();
this.blockZ = block.getLocation().getBlockZ();
if (liquid != null) {
this.liquidX = liquid.getLocation().getBlockX();
this.liquidY = liquid.getLocation().getBlockY();
this.liquidZ = liquid.getLocation().getBlockZ();
}
}
public IslandWorld getWorld() {
return world;
}
public int getBlockX() {
return blockX;
}
public int getBlockY() {
return blockY;
}
public int getBlockZ() {
return blockZ;
}
public int getLiquidX() {
return liquidX;
}
public int getLiquidY() {
return liquidY;
}
public int getLiquidZ() {
return liquidZ;
}
}

123
src/main/java/me/goodandevil/skyblock/listeners/Block.java
View File

@ -10,7 +10,6 @@ import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.BlockFace;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -31,7 +30,6 @@ import org.bukkit.material.Crops;
import me.goodandevil.skyblock.SkyBlock;
import me.goodandevil.skyblock.config.FileManager.Config;
import me.goodandevil.skyblock.generator.Generator;
import me.goodandevil.skyblock.generator.GeneratorLocation;
import me.goodandevil.skyblock.generator.GeneratorManager;
import me.goodandevil.skyblock.island.Island;
import me.goodandevil.skyblock.island.IslandEnvironment;
@ -39,7 +37,6 @@ import me.goodandevil.skyblock.island.IslandLevel;
import me.goodandevil.skyblock.island.IslandManager;
import me.goodandevil.skyblock.island.IslandRole;
import me.goodandevil.skyblock.island.IslandWorld;
import me.goodandevil.skyblock.playerdata.PlayerDataManager;
import me.goodandevil.skyblock.stackable.Stackable;
import me.goodandevil.skyblock.stackable.StackableManager;
import me.goodandevil.skyblock.upgrade.Upgrade;
@ -62,8 +59,6 @@ public class Block implements Listener {
Player player = event.getPlayer();
org.bukkit.block.Block block = event.getBlock();
PlayerDataManager playerDataManager = skyblock.getPlayerDataManager();
GeneratorManager generatorManager = skyblock.getGeneratorManager();
IslandManager islandManager = skyblock.getIslandManager();
StackableManager stackableManager = skyblock.getStackableManager();
WorldManager worldManager = skyblock.getWorldManager();
@ -87,89 +82,41 @@ public class Block implements Listener {
return;
}
if (stackableManager != null
&& stackableManager.isStacked(block.getLocation())) {
Stackable stackable = stackableManager.getStack(block.getLocation(), block.getType());
if (stackable != null) {
stackable.takeOne();
if (stackable.getSize() <= 1) {
stackableManager.removeStack(stackable);
}
if (stackableManager != null
&& stackableManager.isStacked(block.getLocation())) {
Stackable stackable = stackableManager.getStack(block.getLocation(), block.getType());
if (stackable != null) {
stackable.takeOne();
if (stackable.getSize() <= 1) {
stackableManager.removeStack(stackable);
}
Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml"));
FileConfiguration configLoad = config.getFileConfiguration();
if (configLoad.getBoolean("Island.Block.Level.Enable")) {
Materials materials = Materials.getMaterials(block.getType(), block.getData());
if (configLoad.getBoolean("Island.Block.Level.Enable")) {
Materials materials = Materials.getMaterials(block.getType(), block.getData());
if (materials != null) {
if (materials != null) {
IslandLevel level = island.getLevel();
IslandLevel level = island.getLevel();
if (level.hasMaterial(materials.name())) {
if (level.hasMaterial(materials.name())) {
int materialAmount = level.getMaterialAmount(materials.name());
int materialAmount = level.getMaterialAmount(materials.name());
if (materialAmount - 1 <= 0) {
level.removeMaterial(materials.name());
} else {
level.setMaterialAmount(materials.name(), materialAmount - 1);
}
if (materialAmount - 1 <= 0) {
level.removeMaterial(materials.name());
} else {
level.setMaterialAmount(materials.name(), materialAmount - 1);
}
}
}
event.setCancelled(true);
block.getWorld().dropItemNaturally(block.getLocation().clone().add(.5, 1, .5), new ItemStack(block.getType()));
}
event.setCancelled(true);
block.getWorld().dropItemNaturally(block.getLocation().clone().add(.5, 1, .5), new ItemStack(block.getType()));
}
if (generatorManager != null
&& generatorManager.isGenerator(block)
&& playerDataManager.hasPlayerData(player)) {
org.bukkit.block.Block liquid = null;
if (NMSUtil.getVersionNumber() < 13) {
BlockFace[] blockFaces = new BlockFace[]{BlockFace.NORTH, BlockFace.EAST,
BlockFace.SOUTH, BlockFace.WEST};
for (BlockFace blockFaceList : blockFaces) {
if (event.getBlock().getRelative(blockFaceList)
.getType() == Materials.LEGACY_STATIONARY_LAVA.getPostMaterial()
|| event.getBlock().getRelative(blockFaceList).getType() == Materials.LAVA
.parseMaterial()) {
liquid = event.getBlock().getRelative(blockFaceList);
for (Player all : Bukkit.getOnlinePlayers()) {
if (!LocationUtil.isLocationAtLocationRadius(all.getLocation(),
island.getLocation(world, IslandEnvironment.Island), island.getRadius())) continue;
List<Generator> generators = new ArrayList<>(generatorManager.getGenerators());
Collections.reverse(generators);
for (Generator generator : generators) {
if (generator.isPermission()) {
if (!all.hasPermission(generator.getPermission())
&& !all.hasPermission("fabledskyblock.generator.*")
&& !all.hasPermission("fabledskyblock.*")) {
continue;
}
}
Bukkit.getScheduler().scheduleSyncDelayedTask(skyblock, () -> {
generatorManager.generateBlock(generator, block);
}, 10L);
return;
}
}
break;
}
}
}
playerDataManager.getPlayerData(player)
.setGenerator(new GeneratorLocation(world, block, liquid));
return;
}
Config config = skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml"));
@ -285,17 +232,17 @@ public class Block implements Listener {
if (island == null) return;
org.bukkit.block.Block block = event.getToBlock();
if (!LocationUtil.isLocationAtLocationRadius(block.getLocation(),
island.getLocation(world, IslandEnvironment.Island), island.getRadius() - 1.0D)) {
if (!LocationUtil.isLocationAtLocationRadius(block.getLocation(),
island.getLocation(world, IslandEnvironment.Island), island.getRadius() - 1.0D)) {
event.setCancelled(true);
} else if (LocationUtil.isLocationLocation(block.getLocation(),
island.getLocation(world, IslandEnvironment.Main)
.clone()
.subtract(0.0D, 1.0D, 0.0D))) {
if (configLoad.getBoolean("Island.Spawn.Protection")) {
event.setCancelled(true);
} else if (LocationUtil.isLocationLocation(block.getLocation(),
island.getLocation(world, IslandEnvironment.Main)
.clone()
.subtract(0.0D, 1.0D, 0.0D))) {
if (configLoad.getBoolean("Island.Spawn.Protection")) {
event.setCancelled(true);
}
}
}
}
@EventHandler
@ -407,9 +354,11 @@ public class Block implements Listener {
return;
}
Material material = event.getBlock().getType();
if (material != Material.WATER && material != Material.LAVA)
if (material != Materials.WATER.parseMaterial() &&
material != Materials.LEGACY_STATIONARY_WATER.parseMaterial() &&
material != Materials.LAVA.parseMaterial() &&
material != Materials.LEGACY_STATIONARY_LAVA.parseMaterial())
return;
Material type = event.getNewState().getType();

11
src/main/java/me/goodandevil/skyblock/playerdata/PlayerData.java
View File

@ -10,7 +10,6 @@ import org.bukkit.entity.Player;
import me.goodandevil.skyblock.SkyBlock;
import me.goodandevil.skyblock.config.FileManager.Config;
import me.goodandevil.skyblock.confirmation.Confirmation;
import me.goodandevil.skyblock.generator.GeneratorLocation;
import me.goodandevil.skyblock.utils.structure.Area;
public class PlayerData {
@ -35,8 +34,6 @@ public class PlayerData {
private Object viewer;
private GeneratorLocation generatorLocation;
public PlayerData(Player player) {
uuid = player.getUniqueId();
islandOwnerUUID = null;
@ -186,14 +183,6 @@ public class PlayerData {
this.viewer = viewer;
}
public GeneratorLocation getGenerator() {
return generatorLocation;
}
public void setGenerator(GeneratorLocation generatorLocation) {
this.generatorLocation = generatorLocation;
}
public void save() {
Config config = getConfig();
FileConfiguration configLoad = config.getFileConfiguration();