Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genie_logiciel_2015
the_dungeon_project
Commits
96920cfc
Commit
96920cfc
authored
Jan 06, 2016
by
Theodore Lopez
Browse files
change name
parent
dedf8dab
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/core/gamestate/GameContent.java
View file @
96920cfc
...
...
@@ -133,7 +133,7 @@ public class GameContent implements Serializable{
sem
.
release
();
}
public
boolean
checkSt
r
airs
(
Map
newMap
,
NetworkConnection
networkConnection
)
throws
InterruptedException
{
public
boolean
checkStairs
(
Map
newMap
,
NetworkConnection
networkConnection
)
throws
InterruptedException
{
for
(
Character
player:
players
){
if
(
player
.
isOnStairs
(
map
)){
recreate
(
map
,
true
);
...
...
src/gameloop/ServerLoop.java
View file @
96920cfc
...
...
@@ -125,7 +125,7 @@ public class ServerLoop extends Thread {
networkConnection
.
sendEvent
(
toBeSentToClientsEvent
);
}
gameContent
.
applyTrigger
(
networkConnection
);
if
(
gameContent
.
checkSt
r
airs
(
nextMap
,
networkConnection
))
if
(
gameContent
.
checkStairs
(
nextMap
,
networkConnection
))
nextMap
=
MapGeneration
.
mapGeneration
(
MapSize
.
SMALL
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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