aboutsummaryrefslogtreecommitdiff
path: root/src/script/cpp_api/s_env.h
diff options
context:
space:
mode:
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>2020-11-04 16:57:47 +0100
committerGitHub <noreply@github.com>2020-11-04 16:57:47 +0100
commit3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch)
treec070350db219f2c4241d22bc31949685c7b42fe9 /src/script/cpp_api/s_env.h
parent5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff)
parent6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff)
downloaddragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/script/cpp_api/s_env.h')
-rw-r--r--src/script/cpp_api/s_env.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/cpp_api/s_env.h b/src/script/cpp_api/s_env.h
index 1848c7a94..232a08aaf 100644
--- a/src/script/cpp_api/s_env.h
+++ b/src/script/cpp_api/s_env.h
@@ -38,8 +38,8 @@ public:
void player_event(ServerActiveObject *player, const std::string &type);
// Called after emerge of a block queued from core.emerge_area()
- void on_emerge_area_completion(
- v3s16 blockpos, int action, ScriptCallbackState *state);
+ void on_emerge_area_completion(v3s16 blockpos, int action,
+ ScriptCallbackState *state);
void initializeEnvironment(ServerEnvironment *env);
};