Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Gamemode :D

This commit is contained in:
Sauilitired 2014-10-18 14:10:57 +02:00
parent dae0b00e35
commit 7f57b22e56
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.idea/workspace.xml
View File

@ -11,7 +11,6 @@
<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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="plot_news.iws" />
@ -70,8 +69,8 @@
<file leaf-file-name="AbstractFlag.java" pinned="false" current="false" current-in-tab="false">
<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.0" 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" />
<state vertical-scroll-proportion="0.0" vertical-offset="250" max-vertical-offset="918">
<caret line="28" column="7" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
<folding />
</state>
</provider>
@ -120,8 +119,8 @@
<file leaf-file-name="PlayerEvents.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3089431" vertical-offset="2020" max-vertical-offset="14858">
<caret line="146" column="34" selection-start-line="146" selection-start-column="34" selection-end-line="146" selection-end-column="34" />
<state vertical-scroll-proportion="0.25365853" vertical-offset="1986" max-vertical-offset="14858">
<caret line="142" column="29" selection-start-line="142" selection-start-column="29" selection-end-line="142" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1751#1752#0" expanded="true" />
@ -134,8 +133,8 @@
<file leaf-file-name="PlotWorld.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1865" max-vertical-offset="2788">
<caret line="142" column="79" selection-start-line="142" selection-start-column="79" selection-end-line="142" selection-end-column="79" />
<state vertical-scroll-proportion="0.0" vertical-offset="2052" max-vertical-offset="2975">
<caret line="151" column="0" selection-start-line="151" selection-start-column="0" selection-end-line="151" selection-end-column="0" />
<folding />
</state>
</provider>
@ -765,7 +764,7 @@
<workItem from="1413065609242" duration="214000" />
<workItem from="1413065904473" duration="9265000" />
<workItem from="1413125251335" duration="4054000" />
<workItem from="1413221404445" duration="17302000" />
<workItem from="1413221404445" duration="18630000" />
</task>
<task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created>
@ -935,11 +934,15 @@
<created>1413627152131</created>
<updated>1413627152131</updated>
</task>
<option name="localTasksCounter" value="43" />
<task id="LOCAL-00043" summary="Gamemode">
<created>1413632691993</created>
<updated>1413632691993</updated>
</task>
<option name="localTasksCounter" value="44" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="95873000" />
<option name="totallyTimeSpent" value="97201000" />
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@ -1037,7 +1040,6 @@
<option name="myTodoPanelSettings">
<TodoPanelSettings />
</option>
<MESSAGE value="Forgot to merge... Bleh..." />
<MESSAGE value="Well, I broke it, sorry :(" />
<MESSAGE value="Fixed some items on the to-do list." />
<MESSAGE value="Started working on rate system :D" />
@ -1062,7 +1064,8 @@
<MESSAGE value="Fixed the uuid saving functions, added ability to change caching methods.&#10;" />
<MESSAGE value="Some global settings :D" />
<MESSAGE value="Flags :D" />
<option name="LAST_COMMIT_MESSAGE" value="Flags :D" />
<MESSAGE value="Gamemode" />
<option name="LAST_COMMIT_MESSAGE" value="Gamemode" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -1438,8 +1441,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1865" max-vertical-offset="2788">
<caret line="142" column="79" selection-start-line="142" selection-start-column="79" selection-end-line="142" selection-end-column="79" />
<state vertical-scroll-proportion="0.0" vertical-offset="2052" max-vertical-offset="2975">
<caret line="151" column="0" selection-start-line="151" selection-start-column="0" selection-end-line="151" selection-end-column="0" />
<folding />
</state>
</provider>
@ -1462,8 +1465,8 @@
</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.0" 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" />
<state vertical-scroll-proportion="0.0" vertical-offset="250" max-vertical-offset="918">
<caret line="28" column="7" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
<folding />
</state>
</provider>
@ -1490,8 +1493,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3089431" vertical-offset="2020" max-vertical-offset="14858">
<caret line="146" column="34" selection-start-line="146" selection-start-column="34" selection-end-line="146" selection-end-column="34" />
<state vertical-scroll-proportion="0.25365853" vertical-offset="1986" max-vertical-offset="14858">
<caret line="142" column="29" selection-start-line="142" selection-start-column="29" selection-end-line="142" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1751#1752#0" expanded="true" />

6
PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -140,11 +140,11 @@ public class PlayerEvents implements Listener {
List<String> creative = Arrays.asList("creative" , "cr", "1");
List<String> survival = Arrays.asList("survival" , "su", "0");
List<String> adventure = Arrays.asList("adventure", "ad", "2");
if (creative.equals(str)) {
if (creative.contains(str)) {
return GameMode.CREATIVE;
} else if (survival.equals(str)) {
} else if (survival.contains(str)) {
return GameMode.SURVIVAL;
} else if (adventure.equals(str)) {
} else if (adventure.contains(str)) {
return GameMode.ADVENTURE;
} else {
return GameMode.SURVIVAL;