Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 11:45:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flags :D

Browse Source
This commit is contained in:
Sauilitired 2014-10-18 12:12:32 +02:00
parent 7e62094152
commit e4cd1bdc56
2 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
.idea/workspace.xml
View File

@ -10,8 +10,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="plot_news.iws" />
@ -35,20 +34,10 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="UUIDHandler.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/UUIDHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="578" max-vertical-offset="3094">
<caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotMain.java" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="PlotMain.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.91122717" vertical-offset="20017" max-vertical-offset="20553">
<state vertical-scroll-proportion="0.0" vertical-offset="20017" max-vertical-offset="20553">
<caret line="1258" column="55" selection-start-line="1258" selection-start-column="55" selection-end-line="1258" selection-end-column="55" />
<folding>
<element signature="e#0#36822#0" expanded="true" />
@ -67,6 +56,26 @@
</provider>
</entry>
</file>
<file leaf-file-name="FlagManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="290" max-vertical-offset="1870">
<caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AbstractFlag.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5707071" vertical-offset="97" max-vertical-offset="765">
<caret line="19" column="76" selection-start-line="19" selection-start-column="76" selection-end-line="19" selection-end-column="76" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="plugin.yml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/plugin.yml">
<provider selected="true" editor-type-id="text-editor">
@ -147,18 +156,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="UUIDSaver.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/uuid/UUIDSaver.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="357">
<caret line="10" column="42" selection-start-line="10" selection-start-column="42" selection-end-line="10" selection-end-column="42" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindManager">
@ -177,7 +174,6 @@
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/SQLite.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Metrics.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" />
@ -223,6 +219,7 @@
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" />
</list>
</option>
</component>
@ -767,7 +764,7 @@
<workItem from="1413065609242" duration="214000" />
<workItem from="1413065904473" duration="9265000" />
<workItem from="1413125251335" duration="4054000" />
<workItem from="1413221404445" duration="12506000" />
<workItem from="1413221404445" duration="13605000" />
</task>
<task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created>
@ -929,11 +926,15 @@
<created>1413620688438</created>
<updated>1413620688438</updated>
</task>
<option name="localTasksCounter" value="41" />
<task id="LOCAL-00041" summary="Flags :D">
<created>1413622665156</created>
<updated>1413622665156</updated>
</task>
<option name="localTasksCounter" value="42" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="91077000" />
<option name="totallyTimeSpent" value="92176000" />
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@ -1031,7 +1032,6 @@
<option name="myTodoPanelSettings">
<TodoPanelSettings />
</option>
<MESSAGE value="Improved flag system." />
<MESSAGE value="Forgot to merge... Bleh..." />
<MESSAGE value="Well, I broke it, sorry :(" />
<MESSAGE value="Fixed some items on the to-do list." />
@ -1056,7 +1056,8 @@
<MESSAGE value="Started working on functions that will allow for a saved UUID cache (i.e mysql, sqlite, txt file etc...) for faster reading and in-caching.&#10;" />
<MESSAGE value="Fixed the uuid saving functions, added ability to change caching methods.&#10;" />
<MESSAGE value="Some global settings :D" />
<option name="LAST_COMMIT_MESSAGE" value="Some global settings :D" />
<MESSAGE value="Flags :D" />
<option name="LAST_COMMIT_MESSAGE" value="Flags :D" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -1068,20 +1069,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Merge.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2363">
<caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Denied.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2261">
<caret line="131" column="53" selection-start-line="131" selection-start-column="53" selection-end-line="131" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Helpers.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="80" max-vertical-offset="2091">
@ -1474,7 +1461,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.91122717" vertical-offset="20017" max-vertical-offset="20553">
<state vertical-scroll-proportion="0.0" vertical-offset="20017" max-vertical-offset="20553">
<caret line="1258" column="55" selection-start-line="1258" selection-start-column="55" selection-end-line="1258" selection-end-column="55" />
<folding>
<element signature="e#0#36822#0" expanded="true" />
@ -1492,6 +1479,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="290" max-vertical-offset="1870">
<caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5707071" vertical-offset="97" max-vertical-offset="765">
<caret line="19" column="76" selection-start-line="19" selection-start-column="76" selection-end-line="19" selection-end-column="76" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

2
PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java
View File

@ -17,7 +17,7 @@ public class AbstractFlag {
* in length
*/
public AbstractFlag(String key) {
if (!StringUtils.isAlpha(key)) {
if (!StringUtils.isAlpha(key.replaceAll("_", "").replaceAll("-", ""))) {
throw new IllegalArgumentException("Flag must be alphabetic characters");
}
if (key.length() > 16) {