sigonasr2
/
SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finalized changes to regen_chunk generator. Disabled new mobs +

Browse Source 
bookshelf inventories due to game-breaking glitches. Prep for release
onto main server. (Albeit with many bugs+incomplete features, but
doesn't matter at this point)
dev
sigonasr2 11 years ago
parent f43440b680
commit e3e199c1e3
3 changed files with 36 additions and 63 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      BankEconomyMod/src/me/kaZep/Base/Main.java
  2. 42
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
  3. 44
      BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java

13
BankEconomyMod/src/me/kaZep/Base/Main.java
Unescape View File

@ -1518,7 +1518,7 @@ public void onDisable()
sign.update();
}
public boolean naturalBlock(Material mat) {
public static boolean naturalBlock(Material mat) {
List<Material> natural_mats = new ArrayList<Material>();
natural_mats.add(Material.DIRT);
natural_mats.add(Material.STONE);
@ -1530,6 +1530,14 @@ public void onDisable()
natural_mats.add(Material.WEB);
natural_mats.add(Material.LAVA);
natural_mats.add(Material.WATER);
natural_mats.add(Material.TORCH);
natural_mats.add(Material.RED_MUSHROOM);
natural_mats.add(Material.BROWN_MUSHROOM);
natural_mats.add(Material.MOB_SPAWNER);
natural_mats.add(Material.STATIONARY_WATER);
natural_mats.add(Material.STATIONARY_LAVA);
natural_mats.add(Material.OBSIDIAN);
natural_mats.add(Material.BEDROCK);
natural_mats.add(Material.AIR);
natural_mats.add(Material.MOSSY_COBBLESTONE);
natural_mats.add(Material.COAL_ORE);
@ -3154,6 +3162,7 @@ public void checkJukeboxes() {
LOGGING_UPDATE_COUNTS++; //2
Player[] list = Bukkit.getOnlinePlayers();
for (int i=0;i<list.length;i++) {
/*
if (getPlayerData(list[i]).furytime!=0 && Main.SERVER_TICK_TIME>getPlayerData(list[i]).furytime) {
getPlayerData(list[i]).furytime=0;
list[i].sendMessage(ChatColor.RED+""+ChatColor.ITALIC+"Fury Potion effect has worn off...");
@ -3161,7 +3170,7 @@ public void checkJukeboxes() {
if (getPlayerData(list[i]).invulntime!=0 && Main.SERVER_TICK_TIME>getPlayerData(list[i]).invulntime) {
getPlayerData(list[i]).invulntime=0;
list[i].sendMessage(ChatColor.RED+""+ChatColor.ITALIC+"Invulnerability Potion effect has worn off...");
}
}*/
if (hasJobBuff("Hunter", list[i],Job.JOB40)) {
if (Bukkit.getWorld("world").getTime()>13000) {
list[i].addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY,200,1,true));

42
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
Unescape View File

@ -251,31 +251,7 @@ implements Listener
CHILLING_GOLEM, POWERSURGE_ZOMBIE, LIGHTNING_MAGE }
public boolean naturalBlock(Material mat) {
List<Material> natural_mats = new ArrayList<Material>();
natural_mats.add(Material.DIRT);
natural_mats.add(Material.STONE);
natural_mats.add(Material.WOOD);
natural_mats.add(Material.FENCE);
natural_mats.add(Material.GRAVEL);
natural_mats.add(Material.SAND);
natural_mats.add(Material.CLAY);
natural_mats.add(Material.WEB);
natural_mats.add(Material.LAVA);
natural_mats.add(Material.WATER);
natural_mats.add(Material.AIR);
natural_mats.add(Material.MOSSY_COBBLESTONE);
natural_mats.add(Material.COAL_ORE);
natural_mats.add(Material.IRON_ORE);
natural_mats.add(Material.GOLD_ORE);
natural_mats.add(Material.DIAMOND_ORE);
natural_mats.add(Material.EMERALD_ORE);
natural_mats.add(Material.LAPIS_ORE);
natural_mats.add(Material.REDSTONE_ORE);
if (natural_mats.contains(mat)) {
return true;
} else {
return false;
}
return Main.naturalBlock(mat);
}
public void updateTopSPLEEFSigns() {
@ -2942,14 +2918,23 @@ implements Listener
double levelsmult=1.0;
double COUNTER_SLIME_SPAWN_RATE = 0.04,
/*double COUNTER_SLIME_SPAWN_RATE = 0.04,
VIRAL_SPIDER_SPAWN_RATE = 0.02,
SILENCER_SPAWN_RATE = 0.02,
HOUND_CALLER_SPAWN_RATE = 0.01,
FISH_CALLER_SPAWN_RATE = 0.04,
SUICIDAL_CREEPER_SPAWN_RATE = 0.05,
POWER_SURGE_ZOMBIE_SPAWN_RATE = 0.02,
LIGHTNING_MAGE_SPAWN_RATE = 0.04;
LIGHTNING_MAGE_SPAWN_RATE = 0.04;*/
double COUNTER_SLIME_SPAWN_RATE = 0,
VIRAL_SPIDER_SPAWN_RATE = 0,
SILENCER_SPAWN_RATE = 0,
HOUND_CALLER_SPAWN_RATE = 0,
FISH_CALLER_SPAWN_RATE = 0,
SUICIDAL_CREEPER_SPAWN_RATE = 0,
POWER_SURGE_ZOMBIE_SPAWN_RATE = 0,
LIGHTNING_MAGE_SPAWN_RATE = 0;
if (totallvs>60*levelsmult && e.getEntity().getLocation().getY()<50 && e.getEntity().getWorld().getName().equalsIgnoreCase("world")) {
//Try to spawn a counter slime.
@ -18448,10 +18433,11 @@ implements Listener
//******************************//End Job related buffs.
/* DISABLED FOR NOW. GLITCHY.
if (e.getAction()==Action.RIGHT_CLICK_BLOCK && !p.isSneaking() && e.getClickedBlock().getType()==Material.BOOKSHELF) {
viewBookshelf(p, e.getClickedBlock().getLocation());
e.setCancelled(true);
}
}*/
if (this.plugin.PlayerinJob(p, "Explorer")) {
for (int i=0;i<this.plugin.explorerlist.size();i++) {

44
BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java
Unescape View File

@ -134,31 +134,7 @@ public class commandBankEconomy
}
public boolean naturalBlock(Material mat) {
List<Material> natural_mats = new ArrayList<Material>();
natural_mats.add(Material.DIRT);
natural_mats.add(Material.STONE);
natural_mats.add(Material.WOOD);
natural_mats.add(Material.FENCE);
natural_mats.add(Material.GRAVEL);
natural_mats.add(Material.SAND);
natural_mats.add(Material.CLAY);
natural_mats.add(Material.WEB);
natural_mats.add(Material.LAVA);
natural_mats.add(Material.WATER);
natural_mats.add(Material.AIR);
natural_mats.add(Material.MOSSY_COBBLESTONE);
natural_mats.add(Material.COAL_ORE);
natural_mats.add(Material.IRON_ORE);
natural_mats.add(Material.GOLD_ORE);
natural_mats.add(Material.DIAMOND_ORE);
natural_mats.add(Material.EMERALD_ORE);
natural_mats.add(Material.LAPIS_ORE);
natural_mats.add(Material.REDSTONE_ORE);
if (natural_mats.contains(mat)) {
return true;
} else {
return false;
}
return Main.naturalBlock(mat);
}
public String convertToItemName(String val) {
@ -658,8 +634,8 @@ public String convertToItemName(String val) {
List<Integer> storedy = new ArrayList<Integer>();
for (int MASTER_i=-Integer.valueOf(args[1]);MASTER_i<Integer.valueOf(args[1])+1;MASTER_i++) {
p.getWorld().save();
storedy.clear();
for (int MASTER_j=-Integer.valueOf(args[2]);MASTER_j<Integer.valueOf(args[2])+1;MASTER_j++) {
storedy.clear();
iterations++;
//Bukkit.getLogger().info("");
Bukkit.getLogger().info("Correcting Chunk ("+MASTER_i+","+MASTER_j+")...");
@ -686,11 +662,12 @@ public String convertToItemName(String val) {
if (!found) {
boolean found2=false;
for (int x=0;x<16;x++) {
for (int yy=0;yy<8;yy++) {
for (int yy=0;yy<4;yy++) {
for (int z=0;z<16;z++) {
if (!naturalBlock(p.getWorld().getBlockAt(chunkx*16+x,y+yy,chunkz*16+z).getType())) {
if (!found2) {lowest-=8;}
y-=7;
if (!found2) {lowest-=4;}
Bukkit.getLogger().info("____>Found block "+p.getWorld().getBlockAt(chunkx*16+x,y+yy,chunkz*16+z).getType());
y-=3;
storedy.add(y);
break;
}
@ -718,11 +695,12 @@ public String convertToItemName(String val) {
ex.printStackTrace();
}
for (int i=0;i<storedy.size();i++) {
final Location loc1 = new Location(p.getWorld(),chunkx*16-16,storedy.get(i),chunkz*16-16);
final Location loc2 = new Location(p.getWorld(),chunkx*16+32,storedy.get(i)+8,chunkz*16+32);
Bukkit.getLogger().info("--Found unnatural at y:"+storedy.get(i)+".");
final Location loc1a = new Location(p.getWorld(),chunkx*16-16,storedy.get(i),chunkz*16-16);
final Location loc2a = new Location(p.getWorld(),chunkx*16+32,storedy.get(i)+4,chunkz*16+32);
final File saveFile2 = new File("plugins/WorldEdit/schematics/world_savey"+storedy.get(i));
try {
tm.saveTerrain(saveFile2, loc1, loc2);
tm.saveTerrain(saveFile2, loc1a, loc2a);
} catch (FilenameException ex) {
// TODO Auto-generated catch block
ex.printStackTrace();
@ -734,7 +712,6 @@ public String convertToItemName(String val) {
ex.printStackTrace();
}
}
}
//final ChunkSnapshot savedChunk = p.getWorld().getChunkAt(chunkx, chunkz).getChunkSnapshot();
final Player p2 = p;
final int chunkx2=chunkx,chunkz2=chunkz;
@ -759,6 +736,7 @@ public String convertToItemName(String val) {
e.printStackTrace();
}
for (int i=0;i<storedy.size();i++) {
Bukkit.getLogger().info("--Kept area at y:"+storedy.get(i)+".");
final File saveFile2 = new File("plugins/WorldEdit/schematics/world_savey"+storedy.get(i));
try {
tm.loadSchematic(saveFile2);

Write Preview
Loading…
Cancel
Save