Commit v0.5.1

Fixed new 1.14 plugin issues.
This commit is contained in:
CoolJWB 2019-08-03 02:18:40 +02:00
parent 7da3fb9b18
commit 462260af57
15 changed files with 316 additions and 231 deletions

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="VulnerabilityPatcher-Paper" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.version="v0.5" type="JAVA_MODULE" version="4">
<module external.linked.project.id="VulnerabilityPatcher-Paper" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.version="v0.5.1" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../..">

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="VulnerabilityPatcher-Paper:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v0.5" type="JAVA_MODULE" version="4">
<module external.linked.project.id="VulnerabilityPatcher-Paper:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v0.5.1" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="VulnerabilityPatcher-Paper:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v0.5" type="JAVA_MODULE" version="4">
<module external.linked.project.id="VulnerabilityPatcher-Paper:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v0.5.1" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>

View file

@ -1,37 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java" line="108" />
<bookmark url="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java" line="110" />
</component>
<component name="ChangeListManager">
<list default="true" id="4038a6e9-7d52-4dd0-91ef-d9a12aa1c1b2" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_destroystokyo_paper_paper_api_1_14_R0_1_SNAPSHOT.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_13.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Handswitch.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_destroystokyo_paper_paper_api_1_13_2_R0_1_SNAPSHOT.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher-Paper.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher-Paper.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher-Paper.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher-Paper.main.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher-Paper.test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher-Paper.test.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/SMG.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/SMG.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetNBT.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetNBT.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandVulnerabilityPatcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandVulnerabilityPatcher.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_13.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_13.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Arrows.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Arrows.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Blocks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Blocks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Books.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Books.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Crash_Items.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Crash_Items.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Potions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Potions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Entity_Tag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Entity_Tag.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Item_Frames.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Item_Frames.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Patches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Patches.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Rouge_Entity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Rouge_Entity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/plugin.yml" afterDir="false" />
@ -59,45 +41,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-281">
<caret line="55" column="17" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Patches.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="120" column="46" lean-forward="true" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#7367#7631#1" />
<element signature="method#notify#0;class#Patches#0" />
<element signature="method#notify#1;class#Patches#0" />
<element signature="method#notifyViolation#0;class#Patches#0" />
<element signature="method#notifyViolation#1;class#Patches#0" />
<element signature="method#log#0;class#Patches#0" />
<element signature="method#debug#0;class#Patches#0" />
<element signature="method#fired_countermeasure#0;class#Patches#0" />
<element signature="method#mode#0;class#Patches#0" />
<element signature="e#11334#11373#1" />
<element signature="e#11111#11112#0" expanded="true" />
<element signature="method#clearItemMeta#1;class#Patches#0" />
<element signature="method#itemInVisibleSlot#0;class#Patches#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="50" column="51" lean-forward="true" selection-start-line="50" selection-start-column="51" selection-end-line="50" selection-end-column="51" />
<state relative-caret-position="688">
<caret line="136" column="72" lean-forward="true" selection-start-line="136" selection-start-column="72" selection-end-line="136" selection-end-column="72" />
</state>
</provider>
</entry>
@ -125,6 +73,8 @@
<find>NBTTagCompound</find>
<find>System.out.p</find>
<find>System.out.</find>
<find>Egg</find>
<find>isPlayer(</find>
</findStrings>
<dirStrings>
<dir>C:\Users\William\.gradle\caches\modules-2\files-2.1\com.destroystokyo.paper\paper-api\1.13.2-R0.1-SNAPSHOT\c59a5eecaa5170937a7044fefd475b1373bb255\paper-api-1.13.2-R0.1-SNAPSHOT.jar!\org</dir>
@ -141,33 +91,34 @@
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Chunks.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Follow_Range.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Item_Frames.java" />
<option value="$PROJECT_DIR$/src/main/resources/config.yml" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Handswitch.java" />
<option value="$PROJECT_DIR$/src/main/resources/plugin.yml" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Books.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Crash_Items.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Potions.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Entity_Tag.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetNBT.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/SMG.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Rouge_Entity.java" />
<option value="$PROJECT_DIR$/gradle.properties" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandVulnerabilityPatcher.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_13.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Arrows.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Patches.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Arrows.java" />
<option value="$PROJECT_DIR$/src/main/resources/config.yml" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_13.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Rouge_Entity.java" />
<option value="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Potions.java" />
<option value="$PROJECT_DIR$/gradle.properties" />
<option value="$PROJECT_DIR$/src/main/resources/plugin.yml" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-106" />
<option name="y" value="6" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="30" />
<option name="y" value="189" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
@ -177,6 +128,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
@ -253,11 +205,10 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1564325093141" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1564618822636" />
<property name="project.structure.last.edited" value="SDKs" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
@ -321,7 +272,7 @@
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24520256" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.271855" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
@ -334,7 +285,7 @@
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info active="true" anchor="bottom" id="TODO" order="6" visible="true" weight="0.32936078" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="9" />
@ -364,13 +315,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/config.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
<caret line="51" column="20" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
@ -416,13 +360,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Potions.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1173">
<caret line="82" column="55" selection-start-line="82" selection-start-column="55" selection-end-line="82" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/libs/Spigot-1.13.jar!/net/minecraft/server/v1_13_R1/NBTBase.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-765">
@ -485,29 +422,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="32" column="47" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" />
<folding>
<element signature="method#getVersion#0;class#NBTModifier#0" />
<element signature="method#itemToString#0;class#NBTModifier#0" />
<element signature="method#removePlayerdata#0;class#NBTModifier#0" />
<element signature="method#resetMeta#0;class#NBTModifier#0" />
<element signature="method#isPlayer#0;class#NBTModifier#0" />
<element signature="method#getArrowDamage#0;class#NBTModifier#0" />
<element signature="method#setArrowDamage#0;class#NBTModifier#0" />
<element signature="method#isCrashItem#0;class#NBTModifier#0" />
<element signature="method#isCrashItem#1;class#NBTModifier#0" />
<element signature="method#isDeathItem#0;class#NBTModifier#0" />
<element signature="method#containsDeathItem#0;class#NBTModifier#0" />
<element signature="method#isDisconnectItem#0;class#NBTModifier#0" />
<element signature="method#containsDisconnectItem#0;class#NBTModifier#0" />
<element signature="method#isDangerousEgg#0;class#NBTModifier#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Follow_Range.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
@ -515,30 +429,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Rouge_Entity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640">
<caret line="58" column="94" selection-start-line="58" selection-start-column="94" selection-end-line="58" selection-end-column="94" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/plugin.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="12" lean-forward="true" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gradle.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="18" lean-forward="true" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Structure_Blocks.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
@ -577,12 +467,60 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Blocks.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Crash_Items.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/SMG.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="52" column="90" selection-start-line="52" selection-start-column="90" selection-end-line="52" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/libs/Spigot-1.14.jar!/org/bukkit/Material.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="118" column="12" selection-start-line="118" selection-start-column="12" selection-end-line="118" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/libs/Spigot-1.13.jar!/net/minecraft/server/v1_13_R1/Items.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="188" column="29" selection-start-line="188" selection-start-column="29" selection-end-line="188" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/libs/Spigot-1.13.jar!/org/bukkit/craftbukkit/v1_13_R1/inventory/CraftMetaFirework.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5576">
<caret line="358" lean-forward="true" selection-start-line="358" selection-end-line="358" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/libs/Spigot-1.14.jar!/org/bukkit/inventory/meta/FireworkMeta.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_14.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" />
<state relative-caret-position="493">
<caret line="127" column="114" lean-forward="true" selection-start-line="127" selection-start-column="16" selection-end-line="127" selection-end-column="114" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#log#0;class#NBTModifier_1_14#0" />
<element signature="method#fired_countermeasure#0;class#NBTModifier_1_14#0" />
<element signature="method#getItemNBT#0;class#NBTModifier_1_14#0" />
@ -594,6 +532,7 @@
<element signature="method#resetMeta#0;class#NBTModifier_1_14#0" />
<element signature="method#getArrowDamage#0;class#NBTModifier_1_14#0" />
<element signature="method#setArrowDamage#0;class#NBTModifier_1_14#0" />
<element signature="method#getFireworkEffectSize#0;class#NBTModifier_1_14#0" />
<element signature="method#isCrashItem#0;class#NBTModifier_1_14#0" />
<element signature="method#containsCrashItem#0;class#NBTModifier_1_14#0" />
<element signature="method#isDeathItem#0;class#NBTModifier_1_14#0" />
@ -609,29 +548,96 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Arrows.java">
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="4" />
<state relative-caret-position="34">
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/config.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Rouge_Entity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="51" column="70" selection-start-line="51" selection-start-column="70" selection-end-line="51" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Blocks.java">
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<state relative-caret-position="229">
<caret line="66" column="32" selection-start-line="66" selection-start-column="32" selection-end-line="66" selection-end-column="32" />
<folding>
<element signature="method#getVersion#0;class#NBTModifier#0" />
<element signature="method#itemToString#0;class#NBTModifier#0" />
<element signature="method#removePlayerdata#0;class#NBTModifier#0" />
<element signature="method#resetMeta#0;class#NBTModifier#0" />
<element signature="method#getArrowDamage#0;class#NBTModifier#0" />
<element signature="method#setArrowDamage#0;class#NBTModifier#0" />
<element signature="method#getFireworkEffectSize#0;class#NBTModifier#0" />
<element signature="method#hasFireworkLargeEffect#0;class#NBTModifier#0" />
<element signature="method#containsCrashItem#0;class#NBTModifier#0" />
<element signature="method#isDeathItem#0;class#NBTModifier#0" />
<element signature="method#containsDeathItem#0;class#NBTModifier#0" />
<element signature="method#isDisconnectItem#0;class#NBTModifier#0" />
<element signature="method#containsDisconnectItem#0;class#NBTModifier#0" />
<element signature="method#isDangerousEgg#0;class#NBTModifier#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Arrows.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="45" column="21" selection-start-line="45" selection-start-column="21" selection-end-line="45" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="50" column="51" selection-start-line="50" selection-start-column="51" selection-end-line="50" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gradle.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="20" selection-start-line="1" selection-start-column="20" selection-end-line="1" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/plugin.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Potions.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="552">
<caret line="79" column="17" lean-forward="true" selection-start-line="79" selection-start-column="17" selection-end-line="79" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_13.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="764">
<caret line="302" column="4" selection-start-line="302" selection-start-column="4" selection-end-line="302" selection-end-column="4" />
<state relative-caret-position="443">
<caret line="126" column="114" selection-start-line="126" selection-start-column="114" selection-end-line="126" selection-end-column="114" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#log#0;class#NBTModifier_1_13#0" />
<element signature="method#fired_countermeasure#0;class#NBTModifier_1_13#0" />
<element signature="method#getItemNBT#0;class#NBTModifier_1_13#0" />
@ -643,6 +649,7 @@
<element signature="method#resetMeta#0;class#NBTModifier_1_13#0" />
<element signature="method#getArrowDamage#0;class#NBTModifier_1_13#0" />
<element signature="method#setArrowDamage#0;class#NBTModifier_1_13#0" />
<element signature="method#getFireworkEffectSize#0;class#NBTModifier_1_13#0" />
<element signature="method#isCrashItem#0;class#NBTModifier_1_13#0" />
<element signature="method#containsCrashItem#0;class#NBTModifier_1_13#0" />
<element signature="method#isDeathItem#0;class#NBTModifier_1_13#0" />
@ -658,34 +665,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Crash_Items.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-281">
<caret line="55" column="17" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/SMG.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="52" column="90" selection-start-line="52" selection-start-column="90" selection-end-line="52" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Patches.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="120" column="46" lean-forward="true" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" />
<state relative-caret-position="1252">
<caret line="112" selection-start-line="112" selection-end-line="112" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#7367#7631#1" />
<element signature="method#notify#0;class#Patches#0" />
<element signature="method#notify#1;class#Patches#0" />
<element signature="method#notifyViolation#0;class#Patches#0" />
@ -694,18 +679,16 @@
<element signature="method#debug#0;class#Patches#0" />
<element signature="method#fired_countermeasure#0;class#Patches#0" />
<element signature="method#mode#0;class#Patches#0" />
<element signature="e#11334#11373#1" />
<element signature="e#11111#11112#0" expanded="true" />
<element signature="method#clearItemMeta#1;class#Patches#0" />
<element signature="method#itemInVisibleSlot#0;class#Patches#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java">
<entry file="file://$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="50" column="51" lean-forward="true" selection-start-line="50" selection-start-column="51" selection-end-line="50" selection-end-column="51" />
<state relative-caret-position="688">
<caret line="136" column="72" lean-forward="true" selection-start-line="136" selection-start-column="72" selection-end-line="136" selection-end-column="72" />
</state>
</provider>
</entry>

View file

@ -1,2 +1,2 @@
pluginGroup=me.cooljwb.vulnerabilitypatcher
pluginVersion=v0.5
pluginVersion=v0.5.1

View file

@ -34,8 +34,6 @@ import java.util.logging.Logger;
public final class VulnerabilityPatcher extends JavaPlugin {
// TODO: Make the EventPriority customizable.
// TODO: Check version command.
// TODO: Check version loader.
public static VulnerabilityPatcher main;
private Logger log = Logger.getLogger("Minecraft"); // Get the server logger.
@ -136,6 +134,7 @@ public final class VulnerabilityPatcher extends JavaPlugin {
case "Chunks": listeners.add(new Chunks()); break;
case "ItemFrames": listeners.add(new Item_Frames()); break;
case "Handswitch": listeners.add(new Handswitch()); break;
case "Fireworks": listeners.add(new Fireworks()); break;
} // Adds all events to the event register.
}
listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, this)); // Register the events.

View file

@ -2,6 +2,7 @@ package me.cooljwb.vulnerabilitypatcher.modifiers;
import org.bukkit.Bukkit;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Firework;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.projectiles.ProjectileSource;
@ -40,6 +41,7 @@ public class NBTModifier {
return "";
}
}
public boolean removePlayerdata(String player) {
switch(getVersion()) {
case "1.13":
@ -89,6 +91,26 @@ public class NBTModifier {
break;
}
}
public int getFireworkEffectSize(Firework firework) {
switch(getVersion()) {
case "1.13":
return nbt_1_13.getFireworkEffectSize(firework);
case "1.14":
return nbt_1_14.getFireworkEffectSize(firework);
default:
return 0;
}
}
public boolean hasFireworkLargeEffect(Firework firework) {
switch(getVersion()) {
case "1.13":
return nbt_1_13.hasFireworkLargeEffect(firework);
case "1.14":
return nbt_1_14.hasFireworkLargeEffect(firework);
default:
return false;
}
}
public boolean isCrashItem(ItemStack item) {
switch(getVersion()) {

View file

@ -13,6 +13,7 @@ import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftItemStack;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Firework;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BookMeta;
@ -112,6 +113,23 @@ public class NBTModifier_1_13 {
setEntityNBT(arrow, tag);
}
}
int getFireworkEffectSize(Firework firework) {
NBTTagCompound tag = getEntityNBT(firework);
if(tag.hasKey("FireworksItem") && tag.getCompound("FireworksItem").hasKey("tag") && tag.getCompound("FireworksItem").getCompound("tag").hasKey("Fireworks") && tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").hasKey("Explosions"))
return tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").getList("Explosions", 10).size();
return 0;
}
boolean hasFireworkLargeEffect(Firework firework) {
NBTTagCompound tag = getEntityNBT(firework);
if(tag.hasKey("FireworksItem") && tag.getCompound("FireworksItem").hasKey("tag") && tag.getCompound("FireworksItem").getCompound("tag").hasKey("Fireworks") && tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").hasKey("Explosions")) {
NBTTagList explosions = tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").getList("Explosions", 10);
for(int x = 0; x <= (explosions.size() - 1); x++) {
if(explosions.getCompound(x).getInt("Type") == 1 || explosions.getCompound(x).getInt("Type") == 3)
return true;
}
}
return false;
}
boolean isCrashItem(ItemStack item) {
if(item != null) {
@ -220,10 +238,10 @@ public class NBTModifier_1_13 {
}
else if(item.getCompound("BlockEntityTag").hasKey("Patterns")) {
NBTTagList list = item.getCompound("BlockEntityTag").getList("Patterns", 10);
for(int x = 0; x <= list.size(); x++) {
if(list.get(x).getTypeId() == 10) {
if(list.getCompound(x).hasKey("Color") && list.getCompound(x).getInt("Color") < 0)
NBTTagList patterns = item.getCompound("BlockEntityTag").getList("Patterns", 10);
for(int x = 0; x <= (patterns.size() - 1); x++) {
if(patterns.get(x).getTypeId() == 10) {
if(patterns.getCompound(x).hasKey("Color") && patterns.getCompound(x).getInt("Color") < 0)
return true;
}
}
@ -301,11 +319,10 @@ public class NBTModifier_1_13 {
}
boolean isDangerousEgg(ItemStack item) {
if (item != null && item.getType().name().equalsIgnoreCase("spawn_egg")) {
if(item != null && item.getType().name().equalsIgnoreCase("spawn_egg")) {
net.minecraft.server.v1_13_R1.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item);
if (nmsItemStack.hasTag() && VulnerabilityPatcher.main.getConfig().getStringList("BlockedEntityTags").contains(nmsItemStack.getTag().getCompound("EntityTag").getString("id").replaceAll("minecraft:", "")))
return true;
return nmsItemStack.hasTag() && VulnerabilityPatcher.main.getConfig().getStringList("BlockedEntityTags").contains(nmsItemStack.getTag().getCompound("EntityTag").getString("id").replaceAll("minecraft:", ""));
}
return false;
}

View file

@ -13,9 +13,11 @@ import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Firework;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.SpawnEggMeta;
import org.bukkit.projectiles.ProjectileSource;
import java.io.File;
@ -112,6 +114,23 @@ public class NBTModifier_1_14 {
setEntityNBT(arrow, tag);
}
}
int getFireworkEffectSize(Firework firework) {
NBTTagCompound tag = getEntityNBT(firework);
if(tag.hasKey("FireworksItem") && tag.getCompound("FireworksItem").hasKey("tag") && tag.getCompound("FireworksItem").getCompound("tag").hasKey("Fireworks") && tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").hasKey("Explosions"))
return tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").getList("Explosions", 10).size();
return 0;
}
boolean hasFireworkLargeEffect(Firework firework) {
NBTTagCompound tag = getEntityNBT(firework);
if(tag.hasKey("FireworksItem") && tag.getCompound("FireworksItem").hasKey("tag") && tag.getCompound("FireworksItem").getCompound("tag").hasKey("Fireworks") && tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").hasKey("Explosions")) {
NBTTagList explosions = tag.getCompound("FireworksItem").getCompound("tag").getCompound("Fireworks").getList("Explosions", 10);
for(int x = 0; x <= (explosions.size() - 1); x++) {
if(explosions.getCompound(x).getInt("Type") == 1 || explosions.getCompound(x).getInt("Type") == 3)
return true;
}
}
return false;
}
boolean isCrashItem(ItemStack item) {
if(item != null) {
@ -220,10 +239,10 @@ public class NBTModifier_1_14 {
}
else if(item.getCompound("BlockEntityTag").hasKey("Patterns")) {
NBTTagList list = item.getCompound("BlockEntityTag").getList("Patterns", 10);
for(int x = 0; x <= list.size(); x++) {
if(list.get(x).getTypeId() == 10) {
if(list.getCompound(x).hasKey("Color") && list.getCompound(x).getInt("Color") < 0)
NBTTagList patterns = item.getCompound("BlockEntityTag").getList("Patterns", 10);
for(int x = 0; x <= (patterns.size() - 1); x++) {
if(patterns.get(x).getTypeId() == 10) {
if(patterns.getCompound(x).hasKey("Color") && patterns.getCompound(x).getInt("Color") < 0)
return true;
}
}
@ -251,8 +270,8 @@ public class NBTModifier_1_14 {
NBTTagList items = nmsItemStack.getTag().getCompound("BlockEntityTag").getList("Items", 10);
if(items != null) {
for (int a = 0; a <= items.size(); a++) {
NBTTagCompound nmsitem = items.getCompound(a);
for (int x = 0; x <= (items.size() - 1); x++) {
NBTTagCompound nmsitem = items.getCompound(x);
return isDisconnectItem(nmsitem.getCompound("tag"));
}
}
@ -301,11 +320,9 @@ public class NBTModifier_1_14 {
}
boolean isDangerousEgg(ItemStack item) {
if (item != null && item.getType().name().equalsIgnoreCase("spawn_egg")) {
if(item != null && item.getItemMeta() instanceof SpawnEggMeta) {
net.minecraft.server.v1_14_R1.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item);
if (nmsItemStack.hasTag() && VulnerabilityPatcher.main.getConfig().getStringList("BlockedEntityTags").contains(nmsItemStack.getTag().getCompound("EntityTag").getString("id").replaceAll("minecraft:", "")))
return true;
return nmsItemStack.hasTag() && VulnerabilityPatcher.main.getConfig().getStringList("BlockedEntityTags").contains(nmsItemStack.getTag().getCompound("EntityTag").getString("id").replaceAll("minecraft:", ""));
}
return false;
}

View file

@ -68,18 +68,39 @@ public class Arrows extends Patches implements Listener {
@EventHandler(priority = EventPriority.HIGHEST)
public void onProjectileLaunchEvent(ProjectileLaunchEvent event) {
if(blockedEntityTypes.contains(event.getEntity().getType())) {
Arrow arrow = (Arrow) event.getEntity();
double damage = getArrowDamage(arrow);
if(event.getEntity() instanceof Arrow && blockedEntityTypes.contains(event.getEntity().getType())) {
double damage;
int knockback;
if (arrow.getKnockbackStrength() > 10) {
fired_countermeasure("ArrowKnockbackStrenght: " + arrow.getKnockbackStrength());
arrow.setKnockbackStrength(10);
if(event.getEntity() instanceof SpectralArrow) {
SpectralArrow spec_arrow = (SpectralArrow) event.getEntity();
damage = getArrowDamage(spec_arrow);
knockback = spec_arrow.getKnockbackStrength();
if(knockback > 10) {
fired_countermeasure("ArrowKnockbackStrenght: " + knockback);
spec_arrow.setKnockbackStrength(10);
}
if(damage < 0 || damage > 214748364) {
fired_countermeasure("ArrowDamage: " + damage);
setArrowDamage(spec_arrow, 0);
}
}
else {
Arrow arrow = (Arrow) event.getEntity();
damage = getArrowDamage(arrow);
knockback = arrow.getKnockbackStrength();
if(damage < 0 || damage > 214748364) {
fired_countermeasure("ArrowDamage: " + damage);
setArrowDamage(arrow, 0);
if(knockback > 10) {
fired_countermeasure("ArrowKnockbackStrenght: " + arrow.getKnockbackStrength());
arrow.setKnockbackStrength(10);
}
if(damage < 0 || damage > 214748364) {
fired_countermeasure("ArrowDamage: " + damage);
setArrowDamage(arrow, 0);
}
}
}

View file

@ -13,7 +13,6 @@ import org.bukkit.potion.PotionEffect;
import java.util.Collection;
import java.util.List;
import java.util.logging.Logger;
/*
* Copyright 2019 CoolJWB
@ -37,14 +36,11 @@ import java.util.logging.Logger;
public class Death_Potions extends Patches implements Listener {
private Logger log = Logger.getLogger("Minecraft");
public Death_Potions() {}
@EventHandler(priority = EventPriority.HIGHEST)
public void consumePotionEvent(PlayerItemConsumeEvent event) {
if(event.getItem().getType().name().equalsIgnoreCase("POTION")) {
PotionMeta meta = (PotionMeta) event.getItem().getItemMeta();
if(isDeathPotion(meta.getCustomEffects())) {
event.setCancelled(true);
@ -62,13 +58,15 @@ public class Death_Potions extends Patches implements Listener {
if(isDeathPotion(event.getPotion().getEffects())) {
event.setCancelled(true);
Player player = null;
if(isPlayer(event.getPotion().getShooter())) {
player = (Player) event.getEntity().getShooter();
msg(player, SMG.ITEM.msg);
}
try {
if (isPlayer(event.getPotion().getShooter())) {
Player player = (Player) event.getEntity().getShooter();
msg(player, SMG.ITEM.msg);
notifyViolation(player, "splash", "death potion", player.getLocation()); // NotifyViolation when not player.
}
} catch(NoSuchMethodError ignored) {
notifyViolation(player, "splash", "death potion", player.getLocation());
}
}
debug(event);
@ -79,19 +77,21 @@ public class Death_Potions extends Patches implements Listener {
if(isDeathPotion(event.getAreaEffectCloud().getCustomEffects())) {
event.setCancelled(true);
Player player = null;
if(isPlayer(event.getEntity().getShooter())) {
player = (Player) event.getEntity().getShooter();
msg(player, SMG.ITEM.msg);
}
try {
if(isPlayer(event.getEntity().getShooter())) {
Player player = (Player) event.getEntity().getShooter();
msg(player, SMG.ITEM.msg);
notifyViolation(player, "splash", "death potion", player.getLocation()); // NotifyViolation when not player.
}
} catch(NoSuchMethodError ignored) {
notifyViolation(player, "splash", "death potion", player.getLocation());
}
}
debug(event);
}
public boolean isDeathPotion(List<PotionEffect> effects) {
private boolean isDeathPotion(List<PotionEffect> effects) {
for(PotionEffect effect : effects) {
if(effect.getType().getName().equalsIgnoreCase("HEAL") && (effect.getAmplifier() == 125 || effect.getAmplifier() == 93 || effect.getAmplifier() == 61 || effect.getAmplifier() == 29)) {
fired_countermeasure("isDeathPotion");
@ -101,7 +101,7 @@ public class Death_Potions extends Patches implements Listener {
return false;
}
public boolean isDeathPotion(Collection<PotionEffect> effects) {
private boolean isDeathPotion(Collection<PotionEffect> effects) {
for(PotionEffect effect : effects) {
if (effect.getType().getName().equalsIgnoreCase("HEAL") && (effect.getAmplifier() == 125 || effect.getAmplifier() == 93 || effect.getAmplifier() == 61 || effect.getAmplifier() == 29)) {
fired_countermeasure("isDeathPotion");

View file

@ -0,0 +1,16 @@
package me.cooljwb.vulnerabilitypatcher.patches;
import org.bukkit.entity.Firework;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntitySpawnEvent;
public class Fireworks extends Patches {
@EventHandler
public void onEntitySpawnEvent(EntitySpawnEvent event) {
if(event.getEntity() instanceof Firework) {
if(getFireworkEffectSize((Firework)event.getEntity()) > 3 || hasFireworkLargeEffect((Firework)event.getEntity()))
event.setCancelled(true);
}
}
}

View file

@ -47,6 +47,14 @@ public class Rouge_Entity extends Patches implements Listener {
if(entity != null && (entity.getVelocity().getX() > 10.0D || entity.getVelocity().getY() > 10.0D || entity.getVelocity().getZ() > 10.0D || entity.getVelocity().getX() < -6.0D || entity.getVelocity().getY() < -6.0D || entity.getVelocity().getZ() < -6.0D)) {
if(entity.getName().equals("Firework Rocket"))
entity.remove();
else {
if(entity.getVelocity().getX() > 10.0D)
entity.getVelocity().setX(10);
else if(entity.getVelocity().getY() > 10.0D)
entity.getVelocity().setY(10);
else if(entity.getVelocity().getZ() > 10.0D)
entity.getVelocity().setZ(10);
}
}
}
}

View file

@ -18,6 +18,7 @@ Patches:
- Chunks
- ItemFrames
- Handswitch
- Fireworks
# All entities added below will be blocked to use in a spawn egg.
BlockedEntityTags:
@ -25,6 +26,7 @@ BlockedEntityTags:
- item_frame
- falling_block
- area_effect_cloud
- phantom
Commands:
Help:

View file

@ -1,5 +1,5 @@
name: VulnerabilityPatcher
version: 0.5
version: 0.5.1
main: me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher
api-version: 1.13
authors: [CoolJWB]