Merge branch 'master' into pr/3676

OpenKore · Dec 28, 2024 · 09a853f · 09a853f
2 parents 528767f + 97f1657
commit 09a853f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/AI/CoreLogic.pm b/src/AI/CoreLogic.pm
@@ -2931,7 +2931,7 @@ sub processPartySkillUse {
 				my $distance = blockDistance($realMyPos, $realActorPos);
 				next unless ($party_skill{owner}{ID} eq $player->{ID} || inRange($distance, $party_skill_dist));
 				next unless (checkPlayerCondition("partySkill_$i"."_target", $ID));
-				
+
 				$party_skill{ID} = $party_skill{skillObject}->getHandle;
 				$party_skill{lvl} = $config{"partySkill_$i"."_lvl"} || $char->getSkillLevel($party_skill{skillObject});
 				$party_skill{target} = $player->{name};
@@ -2958,11 +2958,11 @@ sub processPartySkillUse {
 
 			if ($char->{party}{joined} && $char->{party}{users}{$party_skill{targetID}} && $char->{party}{users}{$party_skill{targetID}}{hp}) {
 				$hp_diff = $char->{party}{users}{$party_skill{targetID}}{hp_max} - $char->{party}{users}{$party_skill{targetID}}{hp};
-				
+
 			} elsif ($char->has_mercenary && $party_skill{targetID} eq $char->{mercenary}{ID} && $char->{mercenary}{hp} && $char->{mercenary}{hp_max}) {
 				$hp_diff = $char->{mercenary}{hp_max} - $char->{mercenary}{hp};
 				$modifier /= 2;
-				
+
 			} else {
 				if ($players{$party_skill{targetID}}) {
 					$hp_diff = -$players{$party_skill{targetID}}{deltaHp};

diff --git a/src/Network/XKore2.pm b/src/Network/XKore2.pm
@@ -19,7 +19,6 @@ package Network::XKore2;
 
 use strict;
 use Globals qw(%config %rpackets $masterServer $char);
-use Utils qw(makeCoordsDir makeCoordsXY makeCoordsFromTo calcPosition);
 use Utils::Exceptions;
 use Plugins;
 use Base::Ragnarok::SessionStore;
@@ -101,35 +100,35 @@ sub sync_request_ex {
 
 sub map_loaded {
 	my (undef, $args) = @_;
-	
+
 	$args->{mangle} = 2;
 }
 
 sub map_changed {
 	my (undef, $args) = @_;
-	
+
 	$mapServerChange = Storable::dclone($args);
-	
+
 	$args->{mangle} = 2;
 }
 
 sub initialize_message_id_encryption {
 	my (undef, $args) = @_;
-	
+
 	$args->{mangle} = 2;
 }
 
 sub stateChanged {
 	$accountServer->setServerType($masterServer->{serverType});
 	$charServer->setServerType($masterServer->{serverType});
 	$mapServer->setServerType($masterServer->{serverType});
-	
+
 	if ($Globals::net->getState() == Network::IN_GAME && $mapServerChange ne '') {
 		$Globals::net->clientSend($mapServer->{recvPacketParser}->reconstruct({
 			%$mapServerChange,
 			switch => 'map_change',
 		}));
-		
+
 		$mapServerChange = undef;
 	}
 }