Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
autumn_rrs
autumn_agent_2023
Commits
a0a35e7e
Commit
a0a35e7e
authored
1 year ago
by
Joe Fujisawa
Browse files
Options
Download
Email Patches
Plain Diff
clean リファクタ
parent
04acf4c8
auction_ito_2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
+6
-13
...a/autumn_2023/centralized/AuctionCommandExecutorFire.java
with
6 additions
and
13 deletions
+6
-13
src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
+
6
-
13
View file @
a0a35e7e
...
...
@@ -37,7 +37,7 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
}
@Override
public
CommandExecutor
updateInfo
(
MessageManager
messageManager
)
{
public
CommandExecutor
<
CommandFire
>
updateInfo
(
MessageManager
messageManager
)
{
super
.
updateInfo
(
messageManager
);
// FireStationから受信したMessageCivilianを収集
...
...
@@ -69,13 +69,13 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
}
@Override
public
CommandExecutor
setCommand
(
CommandFire
command
)
{
public
CommandExecutor
<
CommandFire
>
setCommand
(
CommandFire
command
)
{
// TODO
return
this
;
}
@Override
public
CommandExecutor
calc
()
{
public
CommandExecutor
<
CommandFire
>
calc
()
{
// TODO
return
this
;
}
...
...
@@ -88,10 +88,9 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
private
boolean
isValidHuman
(
StandardEntity
entity
)
{
if
(
entity
==
null
)
return
false
;
if
(!(
entity
instanceof
Human
))
if
(!(
entity
instanceof
Human
target
))
return
false
;
Human
target
=
(
Human
)
entity
;
if
(!
target
.
isHPDefined
()
||
target
.
getHP
()
==
0
)
return
false
;
if
(!
target
.
isPositionDefined
())
...
...
@@ -106,10 +105,7 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
return
false
;
StandardEntityURN
positionURN
=
position
.
getStandardURN
();
if
(
positionURN
==
REFUGE
||
positionURN
==
AMBULANCE_TEAM
)
return
false
;
return
true
;
return
positionURN
!=
REFUGE
&&
positionURN
!=
AMBULANCE_TEAM
;
}
/**
...
...
@@ -133,9 +129,6 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
return
false
;
final
Human
targetHuman
=
(
Human
)
targetEntity
;
if
(
targetHuman
.
getBuriedness
()
<=
0
)
return
false
;
return
true
;
return
targetHuman
.
getBuriedness
()
>
0
;
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets