Skip to content

Commit e69971d

Browse files
committed
Cleaned up some config settings.
1 parent 74fa473 commit e69971d

File tree

2 files changed

+5
-171
lines changed

2 files changed

+5
-171
lines changed

config.yml

Lines changed: 2 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ general:
2929
# balance at the start of an island.
3030
starting-money: 10.0
3131

32-
# Use the control panel as the default display for /island
33-
# /island will always create an island if one does not exist
34-
# If the control panel is not used, then /island will teleport the player home
35-
# Players can change this setting using /island cp on or /island cp off
36-
# Changing this setting will only apply to new players.
37-
use-control-panel: true
38-
3932
### Purge-related Settings ###
4033
purge:
4134
# Only islands below this level will be removed if they are abandoned and admins issue the purge command
@@ -170,86 +163,6 @@ world:
170163
end:
171164
generate: true
172165
islands: true
173-
174-
### Entities-related Settings ###
175-
entities:
176-
# Sets the limit for number of entities that can spawn in a chunk in this world.
177-
# Note: this does not limit the number of them, just how many spawn naturally.
178-
# Note: If set to a negative number the world will use the server-wide spawn limit instead.
179-
spawn-per-chunk:
180-
# Limit monsters spawn
181-
monsters: 100
182-
# Limits animals spawn
183-
animals: 15
184-
# Limits water animals (Squid) spawn
185-
water-animals: 15
186-
187-
# General entity limiting
188-
# Use this section to limit how many entities can be added to an island.
189-
# 0 means the item will be blocked from placement completely.
190-
# Uncomment to set the limit. The numbers are just suggested values.
191-
# The limit is per-world, so a hopper limit of 30 means up to 30 in the overworld and
192-
# up to 30 in the nether.
193-
limits:
194-
# Mobs, animals and other living entities
195-
#BAT: 10
196-
#BLAZE: 10
197-
#BOAT: 10
198-
#CAVE_SPIDER: 10
199-
#CHICKEN: 10
200-
#COW: 10
201-
#CREEPER: 10
202-
#DONKEY: 10
203-
#ENDERMAN: 10
204-
#HORSE: 10
205-
#HUSK: 10
206-
#IRON_GOLEM: 10
207-
#LLAMA: 10
208-
#MAGMA_CUBE: 10
209-
#MULE: 10
210-
#MUSHROOM_COW: 10
211-
#OCELOT: 10
212-
#PIG: 10
213-
#PIG_ZOMBIE: 10
214-
#POLAR_BEAR: 10
215-
#RABBIT: 10
216-
#SHEEP: 10
217-
#SKELETON: 10
218-
#SKELETON_HORSE: 10
219-
#SLIME: 10
220-
#SNOWMAN: 10
221-
#SPIDER: 10
222-
#SQUID: 10
223-
#STRAY: 10
224-
#WITCH: 10
225-
#WITHER: 10
226-
#WITHER_SKELETON: 10
227-
#WOLF: 10
228-
#ZOMBIE: 10
229-
#ZOMBIE_HORSE: 10
230-
#ZOMBIE_VILLAGER: 10
231-
# These are the ONLY blocks that can be limited (because they are entities).
232-
#BANNER: 20
233-
#ITEM_FRAME: 30
234-
#FURNACE: 10
235-
#CHEST: 50
236-
#TRAPPED_CHEST: 50
237-
#ENDER_CHEST: 1
238-
#JUKEBOX: 5
239-
#DISPENSER: 5
240-
#DROPPER: 5
241-
#SIGN: 10
242-
#MOB_SPAWNER: 10
243-
#NOTE_BLOCK: 5
244-
#ENCHANTMENT_TABLE: 5
245-
#BEACON: 12
246-
#SKULL: 50
247-
#DAYLIGHT_DETECTOR: 10
248-
HOPPER: 30
249-
#REDSTONE_COMPARATOR: 30
250-
#FLOWER_POT: 20
251-
#PAINTING: 5
252-
#ARMOR_STAND: 5
253166

254167
# Disable redstone operation on islands unless a team member is online.
255168
# This may reduce lag but it can cause problems with visitors needing to use a redstone system.
@@ -282,13 +195,6 @@ island:
282195
# Permission size cannot be less than the default below.
283196
max-team-size: 4
284197

285-
# Ranks for players
286-
# Pre-defined ranks are:
287-
# Owner (1000), Member (700), Visitor (0) and Banned (-1)
288-
# Rank names should be references to locale settings and must be in quotes
289-
# like "ranks.coop".
290-
"ranks.coop": 100
291-
292198
# Default maximum number of homes a player can have. Min = 1
293199
# Accessed via sethome <number> or go <number>
294200
# Use this permission to set for specific user groups: askyblock.island.maxhomes.<number>
@@ -385,34 +291,7 @@ island:
385291

386292
# Have player's respawn on their island if they die
387293
respawn-on-island: false
388-
389-
# Only allow the island leader to coop players.
390-
# Island members wont be able to coop other players.
391-
only-leader-can-coop: false
392-
393-
# Island and Team Chat
394-
chat:
395-
# Team Chat
396-
# The prefix [Team Chat] that goes in front of team chats is in the locale files
397-
team:
398-
# This enables player to set is so their chat goes to their team mates only
399-
# using the /island teamchat command.
400-
use: true
401-
402-
# Log all messages sent in TeamChats to console.
403-
log: true
404-
405-
# Set this to true will include trust players in the TeamChat.
406-
include-trust: true
407-
408-
# Set this to true will include coop players in the TeamChat.
409-
include-coop: false
410-
411-
# TODO
412-
island:
413-
use: true
414-
log: true
415-
294+
416295
# Ask the player to confirm the command he is using by typing it again.
417296
# The "wait" value is the number of seconds to wait for confirmation.
418297
require-confirmation:
@@ -489,58 +368,10 @@ protection:
489368

490369
# PVP cooldown in seconds. Players cannot toggle PVP off and on until this timeout
491370
toggle-pvp-cooldown: 60
492-
371+
493372
# TODO
494373
flags: []
495374

496-
### Acid Settings ###
497-
# Originally designed for AcidIsland, but can be used for BSkyBlock as well.
498-
acid:
499-
# Ops receive damage from acid (Set to true if you want Ops to play properly)
500-
damage-op: false
501-
502-
# Damage chickens in acid - true or false - chickens tend to go swimming...
503-
damage-chickens: false
504-
505-
damage:
506-
# Water is acid
507-
acid:
508-
# Acid damage to player per second by being in acid if they have no armor on.
509-
# A fully health player has 20 health points. Players will regen some health
510-
# so the default will give players about 3 seconds to get out the acid
511-
# 0 = no damage, 10 = default damage, 20 = instant death
512-
player: 0
513-
514-
# Damage that monsters will experience in acid.
515-
monster: 0
516-
517-
# Damage that animals will experience in acid.
518-
animal: 0
519-
520-
# Destroy items in water after this many seconds. Timing is variable and may occur
521-
# up to 2x this time. If 0, items will not be removed. Acid damage does not need to
522-
# be on for this setting to work. i.e., it'll work with water too.
523-
# Items fizz when they are destroyed.
524-
item: 0
525-
526-
# Damage that rain does.
527-
rain: 0
528-
529-
# Damage type to apply in addition to acid damage
530-
# Types can be : SLOW, SLOW_DIGGING, CONFUSION, BLINDNESS, HUNGER, WEAKNESS and POISON
531-
# If you just want these to act, then make the acid damage 0 above
532-
# Note - these are potion effects and so can be cured by milk
533-
effects:
534-
#- confusion
535-
536-
# Armor protection
537-
protection:
538-
# Protect players from acid rain if they have a helmet on
539-
helmet: false
540-
541-
# Protect players from all acid if they have a full set of armor on
542-
full-armor: false
543-
544375
### Schematics Settings ###
545376
schematics:
546377
# These are the default settings applied to the schematics

src/main/java/us/tastybento/bskyblock/database/AbstractDatabaseHandler.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,8 @@ protected AbstractDatabaseHandler(BSkyBlock plugin, Class<T> type, DatabaseConne
8080
*/
8181
public abstract boolean objectExists(String key);
8282

83+
/**
84+
* Closes the database
85+
*/
8386
public abstract void close();
8487
}

0 commit comments

Comments
 (0)