From 08da63ca6748ad115166bf38d56e16123ab15178 Mon Sep 17 00:00:00 2001 From: Rumen Nikiforov <unafraid89@gmail.com> Date: Wed, 21 May 2014 21:13:00 +0000 Subject: [PATCH] BETA: DP-Part for [L6532] --- L2J_DataPack_BETA/.classpath | 2 +- L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- .../data/scripts/ai/individual/Antharas/Antharas.java | 5 +---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/L2J_DataPack_BETA/.classpath b/L2J_DataPack_BETA/.classpath index 0807a2eeea..101b5a3bd0 100644 --- a/L2J_DataPack_BETA/.classpath +++ b/L2J_DataPack_BETA/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry including="**/*.java" kind="src" path="dist/game/data/scripts" /> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" /> <classpathentry combineaccessrules="false" kind="src" path="/L2J_Server_BETA" /> <classpathentry kind="lib" path="/L2J_Server_BETA/dist/libs/javolution-5.5.1.jar" /> <classpathentry kind="lib" path="/L2J_Server_BETA/dist/libs/mmocore.jar" /> diff --git a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs index cbc4cce3c1..cb3adde926 100644 --- a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs @@ -15,9 +15,10 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -116,7 +117,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 @@ -201,7 +202,6 @@ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true org.eclipse.jdt.core.formatter.indentation.size=4 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas/Antharas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas/Antharas.java index 6dff5585cf..790e565c34 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas/Antharas.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas/Antharas.java @@ -484,10 +484,7 @@ public final class Antharas extends AbstractNpcAI sandStorm = 2; moveChance = 0; npc.disableCoreAI(false); - for (Map.Entry<Integer, Location> entry : INVISIBLE_NPC.entrySet()) - { - addSpawn(entry.getKey(), entry.getValue()); - } + INVISIBLE_NPC.entrySet().forEach(entry -> addSpawn(entry.getKey(), entry.getValue())); } else if (sandStorm == 1) { -- GitLab