Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-18 22:21:26 +01:00
Code Issues Projects Releases Wiki Activity

optimize for vergy block check

Browse Source
This commit is contained in:
Zrips 2016-09-23 16:30:22 +03:00
parent 388512c820
commit 2285c5bc1c
2 changed files with 263 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
com/gamingmesh/jobs/config/RestrictedBlockManager.java
View File

@ -3,6 +3,8 @@ package com.gamingmesh.jobs.config;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
@ -14,7 +16,7 @@ import com.gamingmesh.jobs.stuff.ChatColor;
public class RestrictedBlockManager {
public ArrayList<String> restrictedBlocks = new ArrayList<String>();
public ArrayList<String> restrictedBlocksTimer = new ArrayList<String>();
public HashMap<Integer, Integer> restrictedBlocksTimer = new HashMap<Integer, Integer>();
public ArrayList<Integer> restrictedPlaceBlocksTimer = new ArrayList<Integer>();
private Jobs plugin;
@ -53,37 +55,56 @@ public class RestrictedBlockManager {
restrictedBlocks = (ArrayList<String>) c.getC().getStringList("restrictedblocks");
c.copySetting("restrictedblocks");
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "[Jobs] Loaded " + restrictedBlocks.size() + " restricted blocks!");
c.getW().addComment("blockstimer", "Block protected by timer in sec",
"141-60 means that carrot can be harvested after 60 sec (remember to use id's from placed objects, not from your inventory)");
restrictedBlocksTimer.add("2-60");
restrictedBlocksTimer.add("3-60");
restrictedBlocksTimer.add("6-60");
restrictedBlocksTimer.add("12-60");
restrictedBlocksTimer.add("18-60");
restrictedBlocksTimer.add("31-60");
restrictedBlocksTimer.add("32-60");
restrictedBlocksTimer.add("37-60");
restrictedBlocksTimer.add("38-60");
restrictedBlocksTimer.add("39-60");
restrictedBlocksTimer.add("40-60");
restrictedBlocksTimer.add("55-60");
restrictedBlocksTimer.add("59-60");
restrictedBlocksTimer.add("80-60");
restrictedBlocksTimer.add("81-60");
restrictedBlocksTimer.add("83-60");
restrictedBlocksTimer.add("103-60");
restrictedBlocksTimer.add("106-60");
restrictedBlocksTimer.add("111-60");
restrictedBlocksTimer.add("141-60");
restrictedBlocksTimer.add("142-60");
restrictedBlocksTimer.add("161-60");
restrictedBlocksTimer.add("171-60");
restrictedBlocksTimer.add("175-60");
c.getC().addDefault("blockstimer", restrictedBlocksTimer);
restrictedBlocksTimer = (ArrayList<String>) c.getC().getStringList("blockstimer");
ArrayList<String> ls = new ArrayList<String>();
ls.addAll(Arrays.asList("2-60",
"3-60",
"6-60",
"12-60",
"18-60",
"31-60",
"32-60",
"37-60",
"38-60",
"39-60",
"40-60",
"55-60",
"59-60",
"80-60",
"81-60",
"83-60",
"103-60",
"106-60",
"111-60",
"141-60",
"142-60",
"161-60",
"171-60",
"175-60"));
c.getC().addDefault("blockstimer", ls);
ls = (ArrayList<String>) c.getC().getStringList("blockstimer");
for (String one : ls) {
if (!one.contains("-"))
continue;
int id = 0;
int timer = 0;
try {
id = Integer.parseInt(one.split("-")[0]);
timer = Integer.parseInt(one.split("-")[1]);
} catch (NumberFormatException e) {
continue;
}
restrictedBlocksTimer.put(id, timer);
}
c.copySetting("blockstimer");
Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "[Jobs] Loaded " + restrictedBlocksTimer.size() + " restricted blocks timers!");

30
com/gamingmesh/jobs/listeners/PistonProtectionListener.java
View File

@ -43,37 +43,17 @@ public class PistonProtectionListener implements Listener {
@SuppressWarnings("deprecation")
public boolean CheckVegy(Block block) {
for (String ConfigOneBlock : Jobs.getRestrictedBlockManager().restrictedBlocksTimer) {
int ConfigPlacedBlockId = 0;
try {
ConfigPlacedBlockId = Integer.parseInt(ConfigOneBlock.split("-")[0]);
} catch (NumberFormatException e) {
continue;
}
if (block.getTypeId() == ConfigPlacedBlockId) {
return true;
}
}
if (!Jobs.getRestrictedBlockManager().restrictedBlocksTimer.containsKey(block.getTypeId()))
return false;
return true;
}
@SuppressWarnings("deprecation")
public boolean checkVegybreak(Block block, Player player) {
for (String ConfigOneBlock : Jobs.getRestrictedBlockManager().restrictedBlocksTimer) {
int ConfigPlacedBlockId = 0;
int ConfigPlacedBlockTimer = 0;
try {
ConfigPlacedBlockId = Integer.parseInt(ConfigOneBlock.split("-")[0]);
ConfigPlacedBlockTimer = Integer.parseInt(ConfigOneBlock.split("-")[1]);
} catch (NumberFormatException e) {
continue;
}
if (block.getTypeId() == ConfigPlacedBlockId) {
if (CheckVegyTimer(block, ConfigPlacedBlockTimer, player)) {
if (!Jobs.getRestrictedBlockManager().restrictedBlocksTimer.containsKey(block.getTypeId()))
return false;
if (CheckVegyTimer(block, Jobs.getRestrictedBlockManager().restrictedBlocksTimer.get(block.getTypeId()), player))
return true;
}
}
}
return false;
}