Fixed block regen

Closes #473

Author: Lorenzo0111

src/main/java/me/zombie_striker/qg/guns/utils/GunUtil.java

@@ -18,6 +18,7 @@
 import me.zombie_striker.qg.handlers.*;
 import me.zombie_striker.qg.hooks.CoreProtectHook;
 import me.zombie_striker.qg.hooks.protection.ProtectionHandler;
+import me.zombie_striker.qg.utils.BlockRegenData;
 import org.bukkit.*;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
@@ -380,13 +381,13 @@ public static void shootInstantVector(Gun g, Player p, double sway, double damag
 					ParticleHandlers.spawnGunParticles(g, start);
 				}
 
-				final Map<Block,Material> regenBlocks = new HashMap<>();
+				final Map<Block, BlockRegenData> regenBlocks = new HashMap<>();
 				for (Block l : blocksThatWillBreak) {
 					QAMain.DEBUG("Breaking " + l.getX() + " " + l.getY() + " " + l.getZ() + ": " + l.getType());
 					QAWeaponDamageBlockEvent event = new QAWeaponDamageBlockEvent(p,g,l);
 					Bukkit.getPluginManager().callEvent(event);
 					if (!event.isCancelled()) {
-						if (!l.getType().isAir()) regenBlocks.put(l,l.getType());
+						if (!l.getType().equals(Material.AIR)) regenBlocks.put(l,new BlockRegenData(l));
 						if (QAMain.regenDestructableBlocksAfter > 0) {
 							l.setType(Material.AIR);
 						} else {
@@ -404,7 +405,7 @@ public void run() {
 							QAMain.DEBUG("Replacing " + regenBlocks.size() + " blocks");
 
 							for (Block l : regenBlocks.keySet()) {
-								l.setType(regenBlocks.get(l));
+								regenBlocks.get(l).place(l.getLocation());
 								CoreProtectHook.logPlace(l,p);
 							}
 						}
@@ -659,6 +660,7 @@ public void run() {
 	}
 
 	public static void updateXPBar(Player player, Gun g, int amount) {
+		if (g == null || player == null) return;
 		player.setLevel(amount);
 
 		if (amount > 0) {

src/main/java/me/zombie_striker/qg/handlers/IronsightsHandler.java

@@ -21,7 +21,7 @@ public class IronsightsHandler {
 	public static void aim(Player player){
 			if(!QualityArmory.isIronSights(player.getItemInHand())){
 				//offHandStorage.put(player, player.getInventory().getItemInOffHand());
-				if(player.getInventory().getItemInOffHand() != null && !player.getInventory().getItemInOffHand().getType().isAir()){
+				if(player.getInventory().getItemInOffHand() != null && !player.getInventory().getItemInOffHand().getType().equals(Material.AIR)){
 					if(player.getInventory().firstEmpty()==-1){
 						player.getWorld().dropItem(player.getLocation(),player.getInventory().getItemInOffHand());
 					}else {

src/main/java/me/zombie_striker/qg/utils/BlockRegenData.java

@@ -0,0 +1,28 @@
+package me.zombie_striker.qg.utils;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+
+public class BlockRegenData {
+    private final Material material;
+    private Object data;
+
+    public BlockRegenData(Block block) {
+        this.material = block.getType();
+        try {
+            this.data = block.getBlockData();
+        } catch (Exception | Error e) {
+            this.data = null;
+        }
+    }
+
+    public void place(Location location) {
+        location.getBlock().setType(material);
+
+        try {
+            location.getBlock().setBlockData((BlockData) data);
+        } catch (Exception | Error ignored) {}
+    }
+}

src/main/resources/changelog.txt

@@ -7,6 +7,7 @@
   - Added headshot blacklist
   - Fixed ammo in exp bar
   - Fixed medkit
+  - Fixed block regen
 
 2.0.18
   - Fixed resourcepack for 1.21.4