Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-11-27 00:45:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed breaking blocks in 1.12

Browse Source
This commit is contained in:
Aria Sangarin 2020-02-15 00:29:20 +01:00
parent b7368d7ffd
commit 3e802ee522
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/Indyuce/mmocore/listener/BlockListener.java
View File

@ -24,6 +24,7 @@ import net.Indyuce.mmocore.manager.CustomBlockManager.BlockInfo;
import net.Indyuce.mmocore.manager.RestrictionManager.BlockPermissions; import net.Indyuce.mmocore.manager.RestrictionManager.BlockPermissions;
import net.Indyuce.mmoitems.MMOItems; import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.CustomBlock; import net.Indyuce.mmoitems.api.CustomBlock;
import net.mmogroup.mmolib.MMOLib;
public class BlockListener implements Listener { public class BlockListener implements Listener {
private static final BlockFace[] order = { BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH }; private static final BlockFace[] order = { BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH };
@ -34,7 +35,7 @@ public class BlockListener implements Listener {
if (player.getGameMode() == GameMode.CREATIVE) if (player.getGameMode() == GameMode.CREATIVE)
return; return;
String savedData = event.getBlock().getBlockData().getAsString(); String savedData = MMOLib.plugin.getVersion().isStrictlyHigher(1, 12) ? event.getBlock().getBlockData().getAsString() : "";
Block block = event.getBlock(); Block block = event.getBlock();
/* /*
* if custom mining enabled, check for item breaking restrictions * if custom mining enabled, check for item breaking restrictions
@ -104,8 +105,12 @@ public class BlockListener implements Listener {
/* /*
* enable block regen. * enable block regen.
*/ */
if (info.hasRegen()) if (info.hasRegen()) {
if(MMOLib.plugin.getVersion().isStrictlyHigher(1, 12))
MMOCore.plugin.mineManager.initialize(info.generateRegenInfo(Bukkit.createBlockData(savedData), block.getLocation())); MMOCore.plugin.mineManager.initialize(info.generateRegenInfo(Bukkit.createBlockData(savedData), block.getLocation()));
else
MMOCore.plugin.mineManager.initialize(info.generateRegenInfo(block.getLocation()));
}
} }
} }

9
src/main/java/net/Indyuce/mmocore/manager/CustomBlockManager.java
View File

@ -82,11 +82,11 @@ public class CustomBlockManager extends MMOManager {
if(MMOCore.plugin.isMILoaded() && info.getRegen().getCustomRegenBlockID() != 0) { if(MMOCore.plugin.isMILoaded() && info.getRegen().getCustomRegenBlockID() != 0) {
CustomBlock block = MMOItems.plugin.getCustomBlocks().getBlock(info.getRegen().getCustomRegenBlockID()); CustomBlock block = MMOItems.plugin.getCustomBlocks().getBlock(info.getRegen().getCustomRegenBlockID());
info.getLocation().getBlock().setType(block.getType()); info.getLocation().getBlock().setType(block.getType());
info.getLocation().getBlock().setBlockData(block.getBlockData()); if(MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) info.getLocation().getBlock().setBlockData(block.getBlockData());
} }
else info.getLocation().getBlock().setType(info.getRegen().getTemporaryBlock()); else info.getLocation().getBlock().setType(info.getRegen().getTemporaryBlock());
if(isPlayerSkull(info.getLocation().getBlock().getType())) { if(isPlayerSkull(info.getLocation().getBlock().getType())) {
if(isPlayerSkull(info.getRegen().getBlock())) info.getLocation().getBlock().setBlockData(info.getBlockData()); if(isPlayerSkull(info.getRegen().getBlock()) && MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) info.getLocation().getBlock().setBlockData(info.getBlockData());
MMOLib.plugin.getNMS().setSkullValue(info.getLocation().getBlock(), info.getRegen().getRegenHeadValue()); MMOLib.plugin.getNMS().setSkullValue(info.getLocation().getBlock(), info.getRegen().getRegenHeadValue());
} }
@ -96,6 +96,7 @@ public class CustomBlockManager extends MMOManager {
} }
private void regen(RegenInfo info) { private void regen(RegenInfo info) {
if(MMOLib.plugin.getVersion().isStrictlyHigher(1, 12))
info.getLocation().getBlock().setBlockData(info.getBlockData()); info.getLocation().getBlock().setBlockData(info.getBlockData());
if(isPlayerSkull(info.getLocation().getBlock().getType())) if(isPlayerSkull(info.getLocation().getBlock().getType()))
MMOLib.plugin.getNMS().setSkullValue(info.getLocation().getBlock(), info.getRegen().getHeadValue()); MMOLib.plugin.getNMS().setSkullValue(info.getLocation().getBlock(), info.getRegen().getHeadValue());
@ -216,6 +217,10 @@ public class CustomBlockManager extends MMOManager {
return new RegenInfo(data, loc, this); return new RegenInfo(data, loc, this);
} }
public RegenInfo generateRegenInfo(Location loc) {
return new RegenInfo(null, loc, this);
}
public int getCustomBlockID() { public int getCustomBlockID() {
return customBlockId; return customBlockId;
} }