TotalFreedomMC/TF-Marriage
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-Marriage.git synced 2024-05-31 09:01:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix material issue with 1.13.2

Browse source
This commit is contained in:
Lennart ten Wolde 2018-12-31 17:46:47 +01:00
parent 2f63ca6ae5
commit c4a53b854e
2 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
.idea/workspace.xml
View file

@ -2,8 +2,6 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a73bffec-a6b5-40e9-b598-9c8ca0ca32ec" name="Default Changelist" comment=""> <list default="true" id="a73bffec-a6b5-40e9-b598-9c8ca0ca32ec" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java" afterDir="false" />
</list> </list>
@ -25,11 +23,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149"> <state relative-caret-position="578">
<caret line="34" column="30" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="30" /> <caret line="34" column="34" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -37,16 +35,16 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493"> <state relative-caret-position="238">
<caret line="79" column="27" lean-forward="true" selection-start-line="79" selection-start-column="27" selection-end-line="79" selection-end-column="27" /> <caret line="14" selection-start-line="14" selection-end-line="14" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.13.2-R0.1-SNAPSHOT/spigot-1.13.2-R0.1-SNAPSHOT.jar!/org/bukkit/World.class"> <entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.13.2-R0.1-SNAPSHOT/spigot-1.13.2-R0.1-SNAPSHOT.jar!/org/bukkit/World.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278"> <state relative-caret-position="-28">
<caret line="323" column="9" selection-start-line="323" selection-start-column="9" selection-end-line="323" selection-end-column="9" /> <caret line="323" column="9" selection-start-line="323" selection-start-column="9" selection-end-line="323" selection-end-column="9" />
</state> </state>
</provider> </provider>
@ -69,8 +67,8 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java" /> <option value="$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java" />
<option value="$PROJECT_DIR$/pom.xml" />
</list> </list>
</option> </option>
</component> </component>
@ -172,18 +170,17 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1546273969115</updated> <updated>1546273969115</updated>
<workItem from="1546273971821" duration="132000" /> <workItem from="1546273971821" duration="132000" />
<workItem from="1546274128819" duration="300000" /> <workItem from="1546274128819" duration="565000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="432000" /> <option name="totallyTimeSpent" value="697000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" /> <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25198728" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25198728" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
@ -200,7 +197,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32969603" /> <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32969603" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@ -231,13 +228,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="34" column="30" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.13.2-R0.1-SNAPSHOT/spigot-1.13.2-R0.1-SNAPSHOT.jar!/net/minecraft/server/v1_13_R2/Particles.class"> <entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.13.2-R0.1-SNAPSHOT/spigot-1.13.2-R0.1-SNAPSHOT.jar!/net/minecraft/server/v1_13_R2/Particles.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1323"> <state relative-caret-position="-1323">
@ -245,17 +235,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java"> <entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.13.2-R0.1-SNAPSHOT/spigot-1.13.2-R0.1-SNAPSHOT.jar!/org/bukkit/World.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493"> <state relative-caret-position="-28">
<caret line="79" column="27" lean-forward="true" selection-start-line="79" selection-start-column="27" selection-end-line="79" selection-end-column="27" /> <caret line="323" column="9" selection-start-line="323" selection-start-column="9" selection-end-line="323" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.13.2-R0.1-SNAPSHOT/spigot-1.13.2-R0.1-SNAPSHOT.jar!/org/bukkit/World.class"> <entry file="file://$PROJECT_DIR$/src/main/java/com/lenis0012/bukkit/marriage2/listeners/KissListener.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278"> <state relative-caret-position="238">
<caret line="323" column="9" selection-start-line="323" selection-start-column="9" selection-end-line="323" selection-end-column="9" /> <caret line="14" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="34" column="34" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>

4
src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandTeleport.java
View file

@ -17,7 +17,7 @@ import java.util.List;
* Created by Lennart on 7/9/2015. * Created by Lennart on 7/9/2015.
*/ */
public class CommandTeleport extends Command { public class CommandTeleport extends Command {
private static final List<Material> UNSAFE_TYPES = Arrays.asList(Material.LAVA, Material.STATIONARY_LAVA, Material.CACTUS); private static final List<Material> UNSAFE_TYPES = Arrays.asList(Material.LAVA, Material.CACTUS);
public CommandTeleport(Marriage marriage) { public CommandTeleport(Marriage marriage) {
super(marriage, "tp"); super(marriage, "tp");
@ -87,7 +87,7 @@ public class CommandTeleport extends Command {
} }
private boolean isSafeGround(Block block) { private boolean isSafeGround(Block block) {
return (block.getType().isSolid() || block.getType() == Material.WATER || block.getType() == Material.STATIONARY_WATER) return (block.getType().isSolid() || block.getType() == Material.WATER)
&& !UNSAFE_TYPES.contains(block.getRelative(0, 1, 0).getType()) && !UNSAFE_TYPES.contains(block.getRelative(0, 1, 0).getType())
&& !UNSAFE_TYPES.contains(block.getRelative(0, 2, 0).getType()); && !UNSAFE_TYPES.contains(block.getRelative(0, 2, 0).getType());
} }