Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-12-18 15:18:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'database' of https://github.com/tastybento/bskyblock.git

Browse Source 
into database

Conflicts:
	src/main/java/us/tastybento/bskyblock/database/objects/Island.java
This commit is contained in:
tastybento 2017-05-24 23:11:14 -07:00
commit ee80f616ff
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/us/tastybento/bskyblock/database/objects/Island.java
View File

@ -96,6 +96,9 @@ public class Island extends DataObject {
// Can open doors or trapdoors // Can open doors or trapdoors
DOOR, DOOR,
// Can dye sheeps
DYEING,
// Can use Elytras // Can use Elytras
ELYTRA, ELYTRA,
@ -798,5 +801,4 @@ public class Island extends DataObject {
this.uniqueId = uniqueId; this.uniqueId = uniqueId;
} }
} }