Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6298f43
stop tracking this junk
intangir Jan 3, 2013
92b82da
catch harmless database error and ignore it
intangir Jan 3, 2013
39ec0da
added aggressive fire and lava grief protection
intangir Jan 3, 2013
65f749f
Adding water protection in addition to lava for rails.
remyroy Sep 8, 2012
5ef1c51
fixed the error i made when i changed remys change
intangir Jan 3, 2013
4175e98
Merge branch 'exultant' into intangir
intangir Jan 3, 2013
64304e8
changed priority so that the message is recieved sooner
intangir Jan 7, 2013
8fd6d12
3 changes:
intangir Jan 15, 2013
3bf79be
fixed a duplication, also added consideration for unbreaking tools
intangir Jan 29, 2013
c01e5d0
added default protection level, reinforcing by hand, auto bypassing a…
intangir Feb 18, 2013
d8b347a
allow fortify mode by hand also (helps with groups), default security…
intangir Feb 18, 2013
ed25241
made a flag to hide info from people who dont have access on the bloc…
intangir Feb 18, 2013
321280e
added reinforcing while in info mode also, made pistons bypass defaul…
intangir Feb 19, 2013
7ee9187
fix for by hand protection when toggling out of group mode, it must r…
intangir Apr 3, 2013
3a77229
cancel all transfers to hoppers, at least for now
intangir Apr 6, 2013
8d43730
added alot of new types to config, changed durability settings back
intangir Apr 6, 2013
5920839
improved chest, trapped chest, and hopper support
intangir Mar 1, 2014
3922983
multiple versions of updates, brings it upto 1.9+
intangir Jul 17, 2016
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
11 changes: 0 additions & 11 deletions .classpath

This file was deleted.

2 changes: 0 additions & 2 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

Binary file removed Citadel.jar
Binary file not shown.
2 changes: 0 additions & 2 deletions bin/META-INF/MANIFEST.MF

This file was deleted.

13 changes: 13 additions & 0 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ general:
autoModeReset: 30
redstoneDistance: 9
groupsAllowed: 60
reinforceNormal: true
inaccessibleInfo: false
materials:
- name: AIR
strength: 5
requirements: 1
flasher: GLASS
- name: STONE
strength: 25
requirements: 1
Expand All @@ -20,8 +26,14 @@ materials:
additionalSecurable:
- BED_BLOCK
- BOOKSHELF
- JUKEBOX
- BEACON
- HOPPER
- DROPPER
- TRAPPED_CHEST
- ANVIL
- ENDER_CHEST
- MOB_SPAWNER
nonReinforceable:
- SAPLING
- GRASS
Expand All @@ -38,6 +50,7 @@ nonReinforceable:
- SNOW
- ICE
- CACTUS
- CARROT
- SUGAR_CANE_BLOCK
- PORTAL
- CAKE_BLOCK
Expand Down
Binary file removed craftbukkit.jar
Binary file not shown.
73 changes: 0 additions & 73 deletions pom.xml

This file was deleted.

2 changes: 0 additions & 2 deletions src/META-INF/MANIFEST.MF

This file was deleted.

20 changes: 20 additions & 0 deletions src/com/untamedears/citadel/ConfigManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public class ConfigManager {
private int autoModeReset;
private boolean verboseLogging;
private double redstoneDistance;
private boolean reinforceNormal;
private boolean inaccessibleInfo;
private int groupsAllowed;
private long cacheMaxAge;
private int cacheMaxChunks;
Expand All @@ -34,6 +36,8 @@ public void load(){
autoModeReset = config.getInt("general.autoModeReset");
verboseLogging = config.getBoolean("general.verboseLogging");
redstoneDistance = config.getDouble("general.redstoneDistance");
reinforceNormal = config.getBoolean("general.reinforceNormal");
inaccessibleInfo = config.getBoolean("general.inaccessibleInfo");
groupsAllowed = config.getInt("general.groupsAllowed");
cacheMaxAge = config.getLong("caching.max_age");
cacheMaxChunks = config.getInt("caching.max_chunks");
Expand Down Expand Up @@ -88,6 +92,22 @@ public double getRedstoneDistance(){
public void setRedstoneDistance(double rd){
this.redstoneDistance = rd;
}

public boolean getReinforceNormal(){
return this.reinforceNormal;
}

public void setReinforceNormal(boolean rn){
this.reinforceNormal = rn;
}

public boolean getInaccessibleInfo(){
return this.inaccessibleInfo;
}

public void setInaccessibleInfo(boolean ii){
this.inaccessibleInfo = ii;
}

public int getAutoModeReset(){
return this.autoModeReset;
Expand Down
2 changes: 1 addition & 1 deletion src/com/untamedears/citadel/Metrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ private void postPlugin(final boolean isPing) throws IOException {
data.append(encode("guid")).append('=').append(encode(guid));
encodeDataPair(data, "version", description.getVersion());
encodeDataPair(data, "server", Bukkit.getVersion());
encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length));
encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().size()));
encodeDataPair(data, "revision", String.valueOf(REVISION));

// If we're pinging, append it
Expand Down
Loading