Skip to content

Opimisation of unbreakable- and protectionblocks #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hermelijn15 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Opimisation of unbreakable- and protectionblocks #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/stanuwu/fragmentcore2/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
package stanuwu.fragmentcore2;

import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;

import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;

public class Config implements CommandExecutor {
private final Plugin plugin;

public static List<Material> protectedBlocks = new ArrayList<>();
public static List<Material> unbreakableBlocks = new ArrayList<>();

public Config(Plugin plugin) {
this.plugin = plugin;
}
Expand All @@ -24,6 +31,13 @@ public static void initConfig(Plugin plugin) {
}
plugin.getConfig().options().copyDefaults(true);
plugin.saveConfig();

for(String s : config.getStringList("fragmentcore.cannoning.protection-blocks")){
protectedBlocks.add(Material.valueOf(s.toUpperCase(Locale.ROOT)));
}
for(String s : config.getStringList("fragmentcore.cannoning.unbreakable-blocks")){
unbreakableBlocks.add(Material.valueOf(s.toUpperCase(Locale.ROOT)));
}
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/stanuwu/fragmentcore2/features/ProtectionBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityExplodeEvent;
import stanuwu.fragmentcore2.Config;
import stanuwu.fragmentcore2.FragmentCore2;

import java.util.Iterator;
Expand All @@ -22,7 +23,7 @@ public void onEntityExplode(EntityExplodeEvent e) {
World world = explosionLoc.getWorld();
for (int y = -64; y <= 320; y++) {
Material materialType = world.getBlockAt(explosionLoc.getBlockX(), y, explosionLoc.getBlockZ()).getType();
if(FragmentCore2.config.getStringList("fragmentcore.cannoning.protection-blocks").contains(materialType.name().toLowerCase())){
if(Config.protectedBlocks.contains(materialType)){
isProtected = true;
break;
}
Expand All @@ -34,13 +35,13 @@ public void onEntityExplode(EntityExplodeEvent e) {
while(iterator.hasNext())
{
Block b = iterator.next();
if(FragmentCore2.config.getStringList("fragmentcore.cannoning.unbreakable-blocks").contains(b.getType().name().toLowerCase())){
if(Config.unbreakableBlocks.contains(b.getType())){
iterator.remove();
continue;
}
for (int y = -64; y <= 320; y++) {
Material materialType = world.getBlockAt(b.getX(), y, b.getZ()).getType();
if(FragmentCore2.config.getStringList("fragmentcore.cannoning.protection-blocks").contains(materialType.name().toLowerCase())){
if(Config.protectedBlocks.contains(materialType)){
iterator.remove();
break;
}
Expand Down