#include "server.h"
#include "utility.h"
#include <iostream>
+#include <queue>
#include "clientserver.h"
#include "map.h"
#include "jmutexautolock.h"
#include "constants.h"
#include "voxel.h"
#include "materials.h"
-#include "mineral.h"
#include "config.h"
#include "servercommand.h"
#include "filesys.h"
#include "content_mapnode.h"
-#include "content_craft.h"
#include "content_nodemeta.h"
#include "mapblock.h"
#include "serverobject.h"
+#include "settings.h"
+#include "profiler.h"
+#include "log.h"
+#include "script.h"
+#include "scriptapi.h"
+#include "nodedef.h"
+#include "itemdef.h"
+#include "craftdef.h"
+#include "mapgen.h"
+#include "content_abm.h"
+#include "mods.h"
+#include "sha1.h"
+#include "base64.h"
+
+#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
#define BLOCK_EMERGE_FLAG_FROMDISK (1<<0)
{
ThreadStarted();
+ log_register_thread("ServerThread");
+
DSTACK(__FUNCTION_NAME);
BEGIN_DEBUG_EXCEPTION_HANDLER
m_server->AsyncRunStep();
}
- //dout_server<<"Running m_server->Receive()"<<std::endl;
+ //infostream<<"Running m_server->Receive()"<<std::endl;
m_server->Receive();
}
catch(con::NoIncomingDataException &e)
}
catch(con::PeerNotFoundException &e)
{
- dout_server<<"Server: PeerNotFoundException"<<std::endl;
+ infostream<<"Server: PeerNotFoundException"<<std::endl;
}
}
- END_DEBUG_EXCEPTION_HANDLER
+ END_DEBUG_EXCEPTION_HANDLER(errorstream)
return NULL;
}
{
ThreadStarted();
+ log_register_thread("EmergeThread");
+
DSTACK(__FUNCTION_NAME);
BEGIN_DEBUG_EXCEPTION_HANDLER
- bool enable_mapgen_debug_info = g_settings.getBool("enable_mapgen_debug_info");
+ bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
/*
Get block info from queue, emerge them and send them
/*
Do not generate over-limit
*/
- if(p.X < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.X > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Y < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Y > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Z < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
- || p.Z > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE)
+ if(blockpos_over_limit(p))
continue;
- //derr_server<<"EmergeThread::Thread(): running"<<std::endl;
+ //infostream<<"EmergeThread::Thread(): running"<<std::endl;
//TimeTaker timer("block emerge");
}
if(enable_mapgen_debug_info)
- dstream<<"EmergeThread: p="
+ infostream<<"EmergeThread: p="
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<") "
<<"only_from_disk="<<only_from_disk<<std::endl;
- ServerMap &map = ((ServerMap&)m_server->m_env.getMap());
+ ServerMap &map = ((ServerMap&)m_server->m_env->getMap());
- //core::map<v3s16, MapBlock*> changed_blocks;
- //core::map<v3s16, MapBlock*> lighting_invalidated_blocks;
-
MapBlock *block = NULL;
bool got_block = true;
core::map<v3s16, MapBlock*> modified_blocks;
-
+
/*
- Fetch block from map or generate a single block
+ Try to fetch block from memory or disk.
+ If not found and asked to generate, initialize generator.
*/
+
+ bool started_generate = false;
+ mapgen::BlockMakeData data;
+
{
JMutexAutoLock envlock(m_server->m_env_mutex);
// Load sector if it isn't loaded
if(map.getSectorNoGenerateNoEx(p2d) == NULL)
- //map.loadSectorFull(p2d);
map.loadSectorMeta(p2d);
-
+
+ // Attempt to load block
block = map.getBlockNoCreateNoEx(p);
if(!block || block->isDummy() || !block->isGenerated())
{
if(enable_mapgen_debug_info)
- dstream<<"EmergeThread: not in memory, loading"<<std::endl;
-
- // Get, load or create sector
- /*ServerMapSector *sector =
- (ServerMapSector*)map.createSector(p2d);*/
-
- // Load/generate block
-
- /*block = map.emergeBlock(p, sector, changed_blocks,
- lighting_invalidated_blocks);*/
+ infostream<<"EmergeThread: not in memory, "
+ <<"attempting to load from disk"<<std::endl;
block = map.loadBlock(p);
-
- if(only_from_disk == false)
- {
- if(block == NULL || block->isGenerated() == false)
- {
- if(enable_mapgen_debug_info)
- dstream<<"EmergeThread: generating"<<std::endl;
- block = map.generateBlock(p, modified_blocks);
- }
- }
-
+ }
+
+ // If could not load and allowed to generate, start generation
+ // inside this same envlock
+ if(only_from_disk == false &&
+ (block == NULL || block->isGenerated() == false)){
if(enable_mapgen_debug_info)
- dstream<<"EmergeThread: ended up with: "
- <<analyze_block(block)<<std::endl;
+ infostream<<"EmergeThread: generating"<<std::endl;
+ started_generate = true;
- if(block == NULL)
- {
- got_block = false;
- }
- else
- {
- /*
- Ignore map edit events, they will not need to be
- sent to anybody because the block hasn't been sent
- to anybody
- */
- MapEditEventIgnorer ign(&m_server->m_ignore_map_edit_events);
-
- // Activate objects and stuff
- m_server->m_env.activateBlock(block, 3600);
- }
- }
- else
- {
- /*if(block->getLightingExpired()){
- lighting_invalidated_blocks[block->getPos()] = block;
- }*/
+ map.initBlockMake(&data, p);
}
-
- // TODO: Some additional checking and lighting updating,
- // see emergeBlock
}
- {//envlock
- JMutexAutoLock envlock(m_server->m_env_mutex);
-
- if(got_block)
+ /*
+ If generator was initialized, generate now when envlock is free.
+ */
+ if(started_generate)
{
- /*
- Collect a list of blocks that have been modified in
- addition to the fetched one.
- */
-
-#if 0
- if(lighting_invalidated_blocks.size() > 0)
{
- /*dstream<<"lighting "<<lighting_invalidated_blocks.size()
- <<" blocks"<<std::endl;*/
+ ScopeProfiler sp(g_profiler, "EmergeThread: mapgen::make_block",
+ SPT_AVG);
+ TimeTaker t("mapgen::make_block()");
+
+ mapgen::make_block(&data);
+
+ if(enable_mapgen_debug_info == false)
+ t.stop(true); // Hide output
+ }
- // 50-100ms for single block generation
- //TimeTaker timer("** EmergeThread updateLighting");
+ do{ // enable break
+ // Lock environment again to access the map
+ JMutexAutoLock envlock(m_server->m_env_mutex);
- // Update lighting without locking the environment mutex,
- // add modified blocks to changed blocks
- map.updateLighting(lighting_invalidated_blocks, modified_blocks);
- }
+ ScopeProfiler sp(g_profiler, "EmergeThread: after "
+ "mapgen::make_block (envlock)", SPT_AVG);
+
+ // Blit data back on map, update lighting, add mobs and
+ // whatever this does
+ map.finishBlockMake(&data, modified_blocks);
+
+ // Get central block
+ block = map.getBlockNoCreateNoEx(p);
- // Add all from changed_blocks to modified_blocks
- for(core::map<v3s16, MapBlock*>::Iterator i = changed_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
- modified_blocks.insert(block->getPos(), block);
- }
-#endif
- }
- // If we got no block, there should be no invalidated blocks
- else
- {
- //assert(lighting_invalidated_blocks.size() == 0);
- }
+ // If block doesn't exist, don't try doing anything with it
+ // This happens if the block is not in generation boundaries
+ if(!block)
+ break;
+
+ /*
+ Do some post-generate stuff
+ */
+
+ v3s16 minp = block->getPos()*MAP_BLOCKSIZE;
+ v3s16 maxp = minp + v3s16(1,1,1)*(MAP_BLOCKSIZE-1);
+ scriptapi_environment_on_generated(m_server->m_lua,
+ minp, maxp);
+
+ if(enable_mapgen_debug_info)
+ infostream<<"EmergeThread: ended up with: "
+ <<analyze_block(block)<<std::endl;
- }//envlock
+ /*
+ Ignore map edit events, they will not need to be
+ sent to anybody because the block hasn't been sent
+ to anybody
+ */
+ MapEditEventIgnorer ign(&m_server->m_ignore_map_edit_events);
+
+ // Activate objects and stuff
+ m_server->m_env->activateBlock(block, 0);
+ }while(false);
+ }
+ if(block == NULL)
+ got_block = false;
+
/*
Set sent status of modified blocks on clients
*/
}
- END_DEBUG_EXCEPTION_HANDLER
+ END_DEBUG_EXCEPTION_HANDLER(errorstream)
+
+ log_deregister_thread();
return NULL;
}
// Increment timers
m_nothing_to_send_pause_timer -= dtime;
+ m_nearest_unsent_reset_timer += dtime;
if(m_nothing_to_send_pause_timer >= 0)
{
- // Keep this reset
- m_nearest_unsent_reset_timer = 0;
return;
}
// Won't send anything if already sending
- if(m_blocks_sending.size() >= g_settings.getU16
+ if(m_blocks_sending.size() >= g_settings->getU16
("max_simultaneous_block_sends_per_client"))
{
- //dstream<<"Not sending any blocks, Queue full."<<std::endl;
+ //infostream<<"Not sending any blocks, Queue full."<<std::endl;
return;
}
//TimeTaker timer("RemoteClient::GetNextBlocks");
- Player *player = server->m_env.getPlayer(peer_id);
+ Player *player = server->m_env->getPlayer(peer_id);
assert(player != NULL);
v3s16 center = getNodeBlockPos(center_nodepos);
// Camera position and direction
- v3f camera_pos =
- playerpos + v3f(0, BS+BS/2, 0);
+ v3f camera_pos = player->getEyePosition();
v3f camera_dir = v3f(0,0,1);
camera_dir.rotateYZBy(player->getPitch());
camera_dir.rotateXZBy(player->getYaw());
- /*dstream<<"camera_dir=("<<camera_dir.X<<","<<camera_dir.Y<<","
+ /*infostream<<"camera_dir=("<<camera_dir.X<<","<<camera_dir.Y<<","
<<camera_dir.Z<<")"<<std::endl;*/
/*
m_last_center = center;
}
- /*dstream<<"m_nearest_unsent_reset_timer="
+ /*infostream<<"m_nearest_unsent_reset_timer="
<<m_nearest_unsent_reset_timer<<std::endl;*/
- // This has to be incremented only when the nothing to send pause
- // is not active
- m_nearest_unsent_reset_timer += dtime;
-
- // Reset periodically to avoid possible bugs or other mishaps
- if(m_nearest_unsent_reset_timer > 10.0)
+ // Reset periodically to workaround for some bugs or stuff
+ if(m_nearest_unsent_reset_timer > 20.0)
{
m_nearest_unsent_reset_timer = 0;
m_nearest_unsent_d = 0;
- /*dstream<<"Resetting m_nearest_unsent_d for "
- <<server->getPlayerName(peer_id)<<std::endl;*/
+ //infostream<<"Resetting m_nearest_unsent_d for "
+ // <<server->getPlayerName(peer_id)<<std::endl;
}
//s16 last_nearest_unsent_d = m_nearest_unsent_d;
s16 d_start = m_nearest_unsent_d;
- //dstream<<"d_start="<<d_start<<std::endl;
+ //infostream<<"d_start="<<d_start<<std::endl;
- u16 max_simul_sends_setting = g_settings.getU16
+ u16 max_simul_sends_setting = g_settings->getU16
("max_simultaneous_block_sends_per_client");
u16 max_simul_sends_usually = max_simul_sends_setting;
Decrease send rate if player is building stuff.
*/
m_time_from_building += dtime;
- if(m_time_from_building < g_settings.getFloat(
+ if(m_time_from_building < g_settings->getFloat(
"full_block_send_enable_min_time_from_building"))
{
max_simul_sends_usually
*/
s32 new_nearest_unsent_d = -1;
- s16 d_max = g_settings.getS16("max_block_send_distance");
- s16 d_max_gen = g_settings.getS16("max_block_generate_distance");
+ s16 d_max = g_settings->getS16("max_block_send_distance");
+ s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
// Don't loop very much at a time
- if(d_max > d_start+1)
- d_max = d_start+1;
+ s16 max_d_increment_at_time = 2;
+ if(d_max > d_start + max_d_increment_at_time)
+ d_max = d_start + max_d_increment_at_time;
/*if(d_max_gen > d_start+2)
d_max_gen = d_start+2;*/
- //dstream<<"Starting from "<<d_start<<std::endl;
-
- bool sending_something = false;
-
- bool no_blocks_found_for_sending = true;
+ //infostream<<"Starting from "<<d_start<<std::endl;
+ s32 nearest_emerged_d = -1;
+ s32 nearest_emergefull_d = -1;
+ s32 nearest_sent_d = -1;
bool queue_is_full = false;
s16 d;
for(d = d_start; d <= d_max; d++)
{
- //dstream<<"RemoteClient::SendBlocks(): d="<<d<<std::endl;
+ /*errorstream<<"checking d="<<d<<" for "
+ <<server->getPlayerName(peer_id)<<std::endl;*/
+ //infostream<<"RemoteClient::SendBlocks(): d="<<d<<std::endl;
/*
If m_nearest_unsent_d was changed by the EmergeThread
if(abs(p.Y - center.Y) > d_max_gen - d_max_gen / 3)
generate = false;*/
- // Limit the send area vertically to 2/3
- if(abs(p.Y - center.Y) > d_max_gen - d_max_gen / 3)
+ // Limit the send area vertically to 1/2
+ if(abs(p.Y - center.Y) > d_max / 2)
continue;
}
-#if 1
+#if 0
/*
If block is far away, don't generate it unless it is
near ground level.
MAP_BLOCKSIZE*p.Z);
// Get ground height in nodes
- s16 gh = server->m_env.getServerMap().findGroundLevel(
+ s16 gh = server->m_env->getServerMap().findGroundLevel(
p2d_nodes_center);
// If differs a lot, don't generate
}
#endif
- //dstream<<"d="<<d<<std::endl;
-
+ //infostream<<"d="<<d<<std::endl;
+#if 1
/*
Don't generate or send if not in sight
+ FIXME This only works if the client uses a small enough
+ FOV setting. The default of 72 degrees is fine.
*/
- if(isBlockInSight(p, camera_pos, camera_dir, 10000*BS) == false)
+ float camera_fov = (72.0*PI/180) * 4./3.;
+ if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, 10000*BS) == false)
{
continue;
}
-
+#endif
/*
Don't send already sent blocks
*/
/*
Check if map has this block
*/
- MapBlock *block = server->m_env.getMap().getBlockNoCreateNoEx(p);
+ MapBlock *block = server->m_env->getMap().getBlockNoCreateNoEx(p);
bool surely_not_found_on_disk = false;
bool block_is_invalid = false;
#if 0
v2s16 p2d(p.X, p.Z);
- ServerMap *map = (ServerMap*)(&server->m_env.getMap());
+ ServerMap *map = (ServerMap*)(&server->m_env->getMap());
v2s16 chunkpos = map->sector_to_chunk(p2d);
if(map->chunkNonVolatile(chunkpos) == false)
block_is_invalid = true;
Block is near ground level if night-time mesh
differs from day-time mesh.
*/
- if(d > 3)
+ if(d >= 4)
{
if(block->dayNightDiffed() == false)
continue;
continue;
}
- /*
- Record the lowest d from which a block has been
- found being not sent and possibly to exist
- */
- if(no_blocks_found_for_sending)
- {
- if(generate == true)
- new_nearest_unsent_d = d;
- }
-
- no_blocks_found_for_sending = false;
-
/*
Add inexistent block to emerge queue.
*/
// Allow only one block in emerge queue
//if(server->m_emerge_queue.peerItemCount(peer_id) < 1)
// Allow two blocks in queue per client
- if(server->m_emerge_queue.peerItemCount(peer_id) < 2)
+ //if(server->m_emerge_queue.peerItemCount(peer_id) < 2)
+ u32 max_emerge = 25;
+ // Make it more responsive when needing to generate stuff
+ if(surely_not_found_on_disk)
+ max_emerge = 5;
+ if(server->m_emerge_queue.peerItemCount(peer_id) < max_emerge)
{
- //dstream<<"Adding block to emerge queue"<<std::endl;
+ //infostream<<"Adding block to emerge queue"<<std::endl;
// Add it to the emerge queue and trigger the thread
server->m_emerge_queue.addBlock(peer_id, p, flags);
server->m_emergethread.trigger();
+
+ if(nearest_emerged_d == -1)
+ nearest_emerged_d = d;
+ } else {
+ if(nearest_emergefull_d == -1)
+ nearest_emergefull_d = d;
}
// get next one.
continue;
}
+ if(nearest_sent_d == -1)
+ nearest_sent_d = d;
+
/*
Add block to send queue
*/
+ /*errorstream<<"sending from d="<<d<<" to "
+ <<server->getPlayerName(peer_id)<<std::endl;*/
+
PrioritySortedBlockTransfer q((float)d, p, peer_id);
dest.push_back(q);
num_blocks_selected += 1;
- sending_something = true;
}
}
queue_full_break:
- //dstream<<"Stopped at "<<d<<std::endl;
+ //infostream<<"Stopped at "<<d<<std::endl;
- if(no_blocks_found_for_sending)
- {
- if(queue_is_full == false)
- new_nearest_unsent_d = d;
+ // If nothing was found for sending and nothing was queued for
+ // emerging, continue next time browsing from here
+ if(nearest_emerged_d != -1){
+ new_nearest_unsent_d = nearest_emerged_d;
+ } else if(nearest_emergefull_d != -1){
+ new_nearest_unsent_d = nearest_emergefull_d;
+ } else {
+ if(d > g_settings->getS16("max_block_send_distance")){
+ new_nearest_unsent_d = 0;
+ m_nothing_to_send_pause_timer = 2.0;
+ /*infostream<<"GetNextBlocks(): d wrapped around for "
+ <<server->getPlayerName(peer_id)
+ <<"; setting to 0 and pausing"<<std::endl;*/
+ } else {
+ if(nearest_sent_d != -1)
+ new_nearest_unsent_d = nearest_sent_d;
+ else
+ new_nearest_unsent_d = d;
+ }
}
if(new_nearest_unsent_d != -1)
m_nearest_unsent_d = new_nearest_unsent_d;
- if(sending_something == false)
- {
- m_nothing_to_send_counter++;
- if((s16)m_nothing_to_send_counter >=
- g_settings.getS16("max_block_send_distance"))
- {
- // Pause time in seconds
- m_nothing_to_send_pause_timer = 1.0;
- /*dstream<<"nothing to send to "
- <<server->getPlayerName(peer_id)
- <<" (d="<<d<<")"<<std::endl;*/
- }
- }
- else
- {
- m_nothing_to_send_counter = 0;
- }
-
/*timer_result = timer.stop(true);
if(timer_result != 0)
- dstream<<"GetNextBlocks duration: "<<timer_result<<" (!=0)"<<std::endl;*/
-}
-
-void RemoteClient::SendObjectData(
- Server *server,
- float dtime,
- core::map<v3s16, bool> &stepped_blocks
- )
-{
- DSTACK(__FUNCTION_NAME);
-
- // Can't send anything without knowing version
- if(serialization_version == SER_FMT_VER_INVALID)
- {
- dstream<<"RemoteClient::SendObjectData(): Not sending, no version."
- <<std::endl;
- return;
- }
-
- /*
- Send a TOCLIENT_OBJECTDATA packet.
- Sent as unreliable.
-
- u16 command
- u16 number of player positions
- for each player:
- v3s32 position*100
- v3s32 speed*100
- s32 pitch*100
- s32 yaw*100
- u16 count of blocks
- for each block:
- block objects
- */
-
- std::ostringstream os(std::ios_base::binary);
- u8 buf[12];
-
- // Write command
- writeU16(buf, TOCLIENT_OBJECTDATA);
- os.write((char*)buf, 2);
-
- /*
- Get and write player data
- */
-
- // Get connected players
- core::list<Player*> players = server->m_env.getPlayers(true);
-
- // Write player count
- u16 playercount = players.size();
- writeU16(buf, playercount);
- os.write((char*)buf, 2);
-
- core::list<Player*>::Iterator i;
- for(i = players.begin();
- i != players.end(); i++)
- {
- Player *player = *i;
-
- v3f pf = player->getPosition();
- v3f sf = player->getSpeed();
-
- v3s32 position_i(pf.X*100, pf.Y*100, pf.Z*100);
- v3s32 speed_i (sf.X*100, sf.Y*100, sf.Z*100);
- s32 pitch_i (player->getPitch() * 100);
- s32 yaw_i (player->getYaw() * 100);
-
- writeU16(buf, player->peer_id);
- os.write((char*)buf, 2);
- writeV3S32(buf, position_i);
- os.write((char*)buf, 12);
- writeV3S32(buf, speed_i);
- os.write((char*)buf, 12);
- writeS32(buf, pitch_i);
- os.write((char*)buf, 4);
- writeS32(buf, yaw_i);
- os.write((char*)buf, 4);
- }
-
- /*
- Get and write object data
- */
-
- /*
- Get nearby blocks.
-
- For making players to be able to build to their nearby
- environment (building is not possible on blocks that are not
- in memory):
- - Set blocks changed
- - Add blocks to emerge queue if they are not found
-
- SUGGESTION: These could be ignored from the backside of the player
- */
-
- Player *player = server->m_env.getPlayer(peer_id);
-
- assert(player);
-
- v3f playerpos = player->getPosition();
- v3f playerspeed = player->getSpeed();
-
- v3s16 center_nodepos = floatToInt(playerpos, BS);
- v3s16 center = getNodeBlockPos(center_nodepos);
-
- s16 d_max = g_settings.getS16("active_object_range");
-
- // Number of blocks whose objects were written to bos
- u16 blockcount = 0;
-
- std::ostringstream bos(std::ios_base::binary);
-
- for(s16 d = 0; d <= d_max; d++)
- {
- core::list<v3s16> list;
- getFacePositions(list, d);
-
- core::list<v3s16>::Iterator li;
- for(li=list.begin(); li!=list.end(); li++)
- {
- v3s16 p = *li + center;
-
- /*
- Ignore blocks that haven't been sent to the client
- */
- {
- if(m_blocks_sent.find(p) == NULL)
- continue;
- }
-
- // Try stepping block and add it to a send queue
- try
- {
-
- // Get block
- MapBlock *block = server->m_env.getMap().getBlockNoCreate(p);
-
- /*
- Step block if not in stepped_blocks and add to stepped_blocks.
- */
- if(stepped_blocks.find(p) == NULL)
- {
- block->stepObjects(dtime, true, server->m_env.getDayNightRatio());
- stepped_blocks.insert(p, true);
- block->setChangedFlag();
- }
-
- // Skip block if there are no objects
- if(block->getObjectCount() == 0)
- continue;
-
- /*
- Write objects
- */
-
- // Write blockpos
- writeV3S16(buf, p);
- bos.write((char*)buf, 6);
-
- // Write objects
- //block->serializeObjects(bos, serialization_version); // DEPRECATED
- // count=0
- writeU16(bos, 0);
-
- blockcount++;
-
- /*
- Stop collecting objects if data is already too big
- */
- // Sum of player and object data sizes
- s32 sum = (s32)os.tellp() + 2 + (s32)bos.tellp();
- // break out if data too big
- if(sum > MAX_OBJECTDATA_SIZE)
- {
- goto skip_subsequent;
- }
-
- } //try
- catch(InvalidPositionException &e)
- {
- // Not in memory
- // Add it to the emerge queue and trigger the thread.
- // Fetch the block only if it is on disk.
-
- // Grab and increment counter
- /*SharedPtr<JMutexAutoLock> lock
- (m_num_blocks_in_emerge_queue.getLock());
- m_num_blocks_in_emerge_queue.m_value++;*/
-
- // Add to queue as an anonymous fetch from disk
- u8 flags = BLOCK_EMERGE_FLAG_FROMDISK;
- server->m_emerge_queue.addBlock(0, p, flags);
- server->m_emergethread.trigger();
- }
- }
- }
-
-skip_subsequent:
-
- // Write block count
- writeU16(buf, blockcount);
- os.write((char*)buf, 2);
-
- // Write block objects
- os<<bos.str();
-
- /*
- Send data
- */
-
- //dstream<<"Server: Sending object data to "<<peer_id<<std::endl;
-
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as unreliable
- server->m_con.Send(peer_id, 0, data, false);
+ infostream<<"GetNextBlocks duration: "<<timer_result<<" (!=0)"<<std::endl;*/
}
void RemoteClient::GotBlock(v3s16 p)
m_blocks_sending.remove(p);
else
{
- /*dstream<<"RemoteClient::GotBlock(): Didn't find in"
+ /*infostream<<"RemoteClient::GotBlock(): Didn't find in"
" m_blocks_sending"<<std::endl;*/
m_excess_gotblocks++;
}
if(m_blocks_sending.find(p) == NULL)
m_blocks_sending.insert(p, 0.0);
else
- dstream<<"RemoteClient::SentBlock(): Sent block"
+ infostream<<"RemoteClient::SentBlock(): Sent block"
" already in m_blocks_sending"<<std::endl;
}
std::string mapsavedir,
std::string configpath
):
- m_env(new ServerMap(mapsavedir), this),
+ m_env(NULL),
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this),
- m_authmanager(mapsavedir+"/auth.txt"),
+ m_authmanager(mapsavedir+DIR_DELIM+"auth.txt"),
+ m_banmanager(mapsavedir+DIR_DELIM+"ipban.txt"),
+ m_lua(NULL),
+ m_itemdef(createItemDefManager()),
+ m_nodedef(createNodeDefManager()),
+ m_craftdef(createCraftDefManager()),
m_thread(this),
m_emergethread(this),
m_time_counter(0),
m_con_mutex.Init();
m_step_dtime_mutex.Init();
m_step_dtime = 0.0;
+
+ JMutexAutoLock envlock(m_env_mutex);
+ JMutexAutoLock conlock(m_con_mutex);
+
+ // Path to builtin.lua
+ std::string builtinpath = porting::path_data + DIR_DELIM + "builtin.lua";
+
+ // Add default global mod search path
+ m_modspaths.push_front(porting::path_data + DIR_DELIM + "mods");
+ // Add world mod search path
+ m_modspaths.push_front(mapsavedir + DIR_DELIM + "worldmods");
+ // Add user mod search path
+ m_modspaths.push_front(porting::path_userdata + DIR_DELIM + "usermods");
+
+ // Print out mod search paths
+ infostream<<"Mod search paths:"<<std::endl;
+ for(core::list<std::string>::Iterator i = m_modspaths.begin();
+ i != m_modspaths.end(); i++){
+ std::string modspath = *i;
+ infostream<<" "<<modspath<<std::endl;
+ }
+
+ // Initialize scripting
+
+ infostream<<"Server: Initializing scripting"<<std::endl;
+ m_lua = script_init();
+ assert(m_lua);
+ // Export API
+ scriptapi_export(m_lua, this);
+ // Load and run builtin.lua
+ infostream<<"Server: Loading builtin Lua stuff from \""<<builtinpath
+ <<"\""<<std::endl;
+ bool success = scriptapi_loadmod(m_lua, builtinpath, "__builtin");
+ if(!success){
+ errorstream<<"Server: Failed to load and run "
+ <<builtinpath<<std::endl;
+ throw ModError("Failed to load and run "+builtinpath);
+ }
+ // Load and run "mod" scripts
+ m_mods = getMods(m_modspaths);
+ for(core::list<ModSpec>::Iterator i = m_mods.begin();
+ i != m_mods.end(); i++){
+ const ModSpec &mod = *i;
+ infostream<<"Server: Loading mod \""<<mod.name<<"\""<<std::endl;
+ std::string scriptpath = mod.path + DIR_DELIM + "init.lua";
+ bool success = scriptapi_loadmod(m_lua, scriptpath, mod.name);
+ if(!success){
+ errorstream<<"Server: Failed to load and run "
+ <<scriptpath<<std::endl;
+ throw ModError("Failed to load and run "+scriptpath);
+ }
+ }
+
+ // Read Textures and calculate sha1 sums
+ PrepareTextures();
+
+ // Apply item aliases in the node definition manager
+ m_nodedef->updateAliases(m_itemdef);
+
+ // Initialize Environment
+
+ m_env = new ServerEnvironment(new ServerMap(mapsavedir, this), m_lua,
+ this, this);
+
+ // Give environment reference to scripting api
+ scriptapi_add_environment(m_lua, m_env);
// Register us to receive map edit events
- m_env.getMap().addEventReceiver(this);
+ m_env->getMap().addEventReceiver(this);
// If file exists, load environment metadata
- if(fs::PathExists(m_mapsavedir+"/env_meta.txt"))
+ if(fs::PathExists(m_mapsavedir+DIR_DELIM+"env_meta.txt"))
{
- dstream<<"Server: Loading environment metadata"<<std::endl;
- m_env.loadMeta(m_mapsavedir);
+ infostream<<"Server: Loading environment metadata"<<std::endl;
+ m_env->loadMeta(m_mapsavedir);
}
// Load players
- dstream<<"Server: Loading players"<<std::endl;
- m_env.deSerializePlayers(m_mapsavedir);
+ infostream<<"Server: Loading players"<<std::endl;
+ m_env->deSerializePlayers(m_mapsavedir);
+
+ /*
+ Add some test ActiveBlockModifiers to environment
+ */
+ add_legacy_abms(m_env, m_nodedef);
}
Server::~Server()
{
- dstream<<"Server::~Server()"<<std::endl;
+ infostream<<"Server::~Server()"<<std::endl;
/*
Send shutdown message
{}
}
}
+
+ {
+ JMutexAutoLock envlock(m_env_mutex);
- /*
- Save players
- */
- dstream<<"Server: Saving players"<<std::endl;
- m_env.serializePlayers(m_mapsavedir);
+ /*
+ Save players
+ */
+ infostream<<"Server: Saving players"<<std::endl;
+ m_env->serializePlayers(m_mapsavedir);
- /*
- Save environment metadata
- */
- dstream<<"Server: Saving environment metadata"<<std::endl;
- m_env.saveMeta(m_mapsavedir);
-
+ /*
+ Save environment metadata
+ */
+ infostream<<"Server: Saving environment metadata"<<std::endl;
+ m_env->saveMeta(m_mapsavedir);
+ }
+
/*
Stop threads
*/
{
u16 peer_id = i.getNode()->getKey();
JMutexAutoLock envlock(m_env_mutex);
- m_env.removePlayer(peer_id);
+ m_env->removePlayer(peer_id);
}*/
// Delete client
delete i.getNode()->getValue();
}
}
+
+ // Delete Environment
+ delete m_env;
+
+ delete m_itemdef;
+ delete m_nodedef;
+ delete m_craftdef;
+
+ // Deinitialize scripting
+ infostream<<"Server: Deinitializing scripting"<<std::endl;
+ script_deinit(m_lua);
}
void Server::start(unsigned short port)
m_thread.stop();
// Initialize connection
- m_con.setTimeoutMs(30);
+ m_con.SetTimeoutMs(30);
m_con.Serve(port);
// Start thread
m_thread.setRun(true);
m_thread.Start();
-
dout_server<<"Server: Started on port "<<port<<std::endl;
+
infostream<<"Server: Started on port "<<port<<std::endl;
}
void Server::stop()
{
DSTACK(__FUNCTION_NAME);
+
+ infostream<<"Server: Stopping and waiting threads"<<std::endl;
// Stop threads (set run=false first so both start stopping)
m_thread.setRun(false);
m_thread.stop();
m_emergethread.stop();
- dout_server<<"Server: Threads stopped"<<std::endl;
+ infostream<<"Server: Threads stopped"<<std::endl;
}
void Server::step(float dtime)
{
DSTACK(__FUNCTION_NAME);
+ g_profiler->add("Server::AsyncRunStep (num)", 1);
+
float dtime;
{
JMutexAutoLock lock1(m_step_dtime_mutex);
}
{
- ScopeProfiler sp(&g_profiler, "Server: selecting and sending "
- "blocks to clients");
// Send blocks to clients
SendBlocks(dtime);
}
if(dtime < 0.001)
return;
+
+ g_profiler->add("Server::AsyncRunStep with dtime (num)", 1);
- //dstream<<"Server steps "<<dtime<<std::endl;
- //dstream<<"Server::AsyncRunStep(): dtime="<<dtime<<std::endl;
+ //infostream<<"Server steps "<<dtime<<std::endl;
+ //infostream<<"Server::AsyncRunStep(): dtime="<<dtime<<std::endl;
{
JMutexAutoLock lock1(m_step_dtime_mutex);
m_uptime.set(m_uptime.get() + dtime);
}
- /*
- Update m_time_of_day and overall game time
+ {
+ // Process connection's timeouts
+ JMutexAutoLock lock2(m_con_mutex);
+ ScopeProfiler sp(g_profiler, "Server: connection timeout processing");
+ m_con.RunTimeouts(dtime);
+ }
+
+ {
+ // This has to be called so that the client list gets synced
+ // with the peer list of the connection
+ handlePeerChanges();
+ }
+
+ /*
+ Update m_time_of_day and overall game time
*/
{
JMutexAutoLock envlock(m_env_mutex);
m_time_counter += dtime;
- f32 speed = g_settings.getFloat("time_speed") * 24000./(24.*3600);
+ f32 speed = g_settings->getFloat("time_speed") * 24000./(24.*3600);
u32 units = (u32)(m_time_counter*speed);
m_time_counter -= (f32)units / speed;
- m_env.setTimeOfDay((m_env.getTimeOfDay() + units) % 24000);
+ m_env->setTimeOfDay((m_env->getTimeOfDay() + units) % 24000);
- //dstream<<"Server: m_time_of_day = "<<m_time_of_day.get()<<std::endl;
+ //infostream<<"Server: m_time_of_day = "<<m_time_of_day.get()<<std::endl;
/*
Send to clients at constant intervals
m_time_of_day_send_timer -= dtime;
if(m_time_of_day_send_timer < 0.0)
{
- m_time_of_day_send_timer = g_settings.getFloat("time_send_interval");
+ m_time_of_day_send_timer = g_settings->getFloat("time_send_interval");
//JMutexAutoLock envlock(m_env_mutex);
JMutexAutoLock conlock(m_con_mutex);
i.atEnd() == false; i++)
{
RemoteClient *client = i.getNode()->getValue();
- //Player *player = m_env.getPlayer(client->peer_id);
+ //Player *player = m_env->getPlayer(client->peer_id);
SharedBuffer<u8> data = makePacket_TOCLIENT_TIME_OF_DAY(
- m_env.getTimeOfDay());
+ m_env->getTimeOfDay());
// Send as reliable
m_con.Send(client->peer_id, 0, data, true);
}
}
}
- {
- // Process connection's timeouts
- JMutexAutoLock lock2(m_con_mutex);
- ScopeProfiler sp(&g_profiler, "Server: connection timeout processing");
- m_con.RunTimeouts(dtime);
- }
-
- {
- // This has to be called so that the client list gets synced
- // with the peer list of the connection
- ScopeProfiler sp(&g_profiler, "Server: peer change handling");
- handlePeerChanges();
- }
-
{
JMutexAutoLock lock(m_env_mutex);
// Step environment
- ScopeProfiler sp(&g_profiler, "Server: environment step");
- m_env.step(dtime);
+ ScopeProfiler sp(g_profiler, "SEnv step");
+ ScopeProfiler sp2(g_profiler, "SEnv step avg", SPT_AVG);
+ m_env->step(dtime);
}
- const float map_timer_and_unload_dtime = 5.15;
+ const float map_timer_and_unload_dtime = 2.92;
if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime))
{
JMutexAutoLock lock(m_env_mutex);
// Run Map's timers and unload unused data
- ScopeProfiler sp(&g_profiler, "Server: map timer and unload");
- m_env.getMap().timerUpdate(map_timer_and_unload_dtime,
- g_settings.getFloat("server_unload_unused_data_timeout"));
+ ScopeProfiler sp(g_profiler, "Server: map timer and unload");
+ m_env->getMap().timerUpdate(map_timer_and_unload_dtime,
+ g_settings->getFloat("server_unload_unused_data_timeout"));
}
/*
Do background stuff
*/
-
+
/*
- Transform liquids
+ Handle players
*/
+ {
+ JMutexAutoLock lock(m_env_mutex);
+ JMutexAutoLock lock2(m_con_mutex);
+
+ ScopeProfiler sp(g_profiler, "Server: handle players");
+
+ //float player_max_speed = BS * 4.0; // Normal speed
+ float player_max_speed = BS * 20; // Fast speed
+ float player_max_speed_up = BS * 20;
+
+ player_max_speed *= 2.5; // Tolerance
+ player_max_speed_up *= 2.5;
+
+ for(core::map<u16, RemoteClient*>::Iterator
+ i = m_clients.getIterator();
+ i.atEnd() == false; i++)
+ {
+ RemoteClient *client = i.getNode()->getValue();
+ ServerRemotePlayer *player =
+ static_cast<ServerRemotePlayer*>
+ (m_env->getPlayer(client->peer_id));
+ if(player==NULL)
+ continue;
+
+ /*
+ Check player movements
+
+ NOTE: Actually the server should handle player physics like the
+ client does and compare player's position to what is calculated
+ on our side. This is required when eg. players fly due to an
+ explosion.
+ */
+ player->m_last_good_position_age += dtime;
+ if(player->m_last_good_position_age >= 2.0){
+ float age = player->m_last_good_position_age;
+ v3f diff = (player->getPosition() - player->m_last_good_position);
+ float d_vert = diff.Y;
+ diff.Y = 0;
+ float d_horiz = diff.getLength();
+ /*infostream<<player->getName()<<"'s horizontal speed is "
+ <<(d_horiz/age)<<std::endl;*/
+ if(d_horiz <= age * player_max_speed &&
+ (d_vert < 0 || d_vert < age * player_max_speed_up)){
+ player->m_last_good_position = player->getPosition();
+ } else {
+ actionstream<<"Player "<<player->getName()
+ <<" moved too fast; resetting position"
+ <<std::endl;
+ player->setPosition(player->m_last_good_position);
+ SendMovePlayer(player);
+ }
+ player->m_last_good_position_age = 0;
+ }
+
+ /*
+ Handle player HPs (die if hp=0)
+ */
+ if(player->hp == 0 && player->m_hp_not_sent)
+ DiePlayer(player);
+
+ /*
+ Send player inventories and HPs if necessary
+ */
+ if(player->m_inventory_not_sent){
+ UpdateCrafting(player->peer_id);
+ SendInventory(player->peer_id);
+ }
+ if(player->m_hp_not_sent){
+ SendPlayerHP(player);
+ }
+
+ /*
+ Add to environment
+ */
+ if(!player->m_is_in_environment){
+ player->m_removed = false;
+ player->setId(0);
+ m_env->addActiveObject(player);
+ }
+ }
+ }
+
+ /* Transform liquids */
m_liquid_transform_timer += dtime;
if(m_liquid_transform_timer >= 1.00)
{
JMutexAutoLock lock(m_env_mutex);
- ScopeProfiler sp(&g_profiler, "Server: liquid transform");
+ ScopeProfiler sp(g_profiler, "Server: liquid transform");
core::map<v3s16, MapBlock*> modified_blocks;
- m_env.getMap().transformLiquids(modified_blocks);
+ m_env->getMap().transformLiquids(modified_blocks);
#if 0
/*
Update lighting
*/
core::map<v3s16, MapBlock*> lighting_modified_blocks;
- ServerMap &map = ((ServerMap&)m_env.getMap());
+ ServerMap &map = ((ServerMap&)m_env->getMap());
map.updateLighting(modified_blocks, lighting_modified_blocks);
// Add blocks modified by lighting to modified_blocks
counter = 0.0;
JMutexAutoLock lock2(m_con_mutex);
-
+
+ if(m_clients.size() != 0)
+ infostream<<"Players:"<<std::endl;
for(core::map<u16, RemoteClient*>::Iterator
i = m_clients.getIterator();
i.atEnd() == false; i++)
{
//u16 peer_id = i.getNode()->getKey();
RemoteClient *client = i.getNode()->getValue();
- Player *player = m_env.getPlayer(client->peer_id);
+ Player *player = m_env->getPlayer(client->peer_id);
if(player==NULL)
continue;
-
std::cout<<player->getName()<<"\t";
- client->PrintInfo(std::cout);
+
infostream<<"* "<<player->getName()<<"\t";
+ client->PrintInfo(infostream);
}
}
}
- //if(g_settings.getBool("enable_experimental"))
+ //if(g_settings->getBool("enable_experimental"))
{
/*
Check added and deleted active objects
*/
{
- //dstream<<"Server: Checking added and deleted active objects"<<std::endl;
+ //infostream<<"Server: Checking added and deleted active objects"<<std::endl;
JMutexAutoLock envlock(m_env_mutex);
JMutexAutoLock conlock(m_con_mutex);
- ScopeProfiler sp(&g_profiler, "Server: checking added and deleted objects");
+ ScopeProfiler sp(g_profiler, "Server: checking added and deleted objs");
// Radius inside which objects are active
- s16 radius = 32;
+ s16 radius = g_settings->getS16("active_object_send_range_blocks");
+ radius *= MAP_BLOCKSIZE;
for(core::map<u16, RemoteClient*>::Iterator
i = m_clients.getIterator();
i.atEnd() == false; i++)
{
RemoteClient *client = i.getNode()->getValue();
- Player *player = m_env.getPlayer(client->peer_id);
+
+ // If definitions and textures have not been sent, don't
+ // send objects either
+ if(!client->definitions_sent)
+ continue;
+
+ Player *player = m_env->getPlayer(client->peer_id);
if(player==NULL)
{
// This can happen if the client timeouts somehow
- /*dstream<<"WARNING: "<<__FUNCTION_NAME<<": Client "
+ /*infostream<<"WARNING: "<<__FUNCTION_NAME<<": Client "
<<client->peer_id
<<" has no associated player"<<std::endl;*/
continue;
core::map<u16, bool> removed_objects;
core::map<u16, bool> added_objects;
- m_env.getRemovedActiveObjects(pos, radius,
+ m_env->getRemovedActiveObjects(pos, radius,
client->m_known_objects, removed_objects);
- m_env.getAddedActiveObjects(pos, radius,
+ m_env->getAddedActiveObjects(pos, radius,
client->m_known_objects, added_objects);
// Ignore if nothing happened
if(removed_objects.size() == 0 && added_objects.size() == 0)
{
- //dstream<<"INFO: active objects: none changed"<<std::endl;
+ //infostream<<"active objects: none changed"<<std::endl;
continue;
}
{
// Get object
u16 id = i.getNode()->getKey();
- ServerActiveObject* obj = m_env.getActiveObject(id);
+ ServerActiveObject* obj = m_env->getActiveObject(id);
// Add to data buffer for sending
writeU16((u8*)buf, i.getNode()->getKey());
{
// Get object
u16 id = i.getNode()->getKey();
- ServerActiveObject* obj = m_env.getActiveObject(id);
+ ServerActiveObject* obj = m_env->getActiveObject(id);
// Get object type
u8 type = ACTIVEOBJECT_TYPE_INVALID;
if(obj == NULL)
- dstream<<"WARNING: "<<__FUNCTION_NAME
+ infostream<<"WARNING: "<<__FUNCTION_NAME
<<": NULL object"<<std::endl;
else
type = obj->getType();
// Send as reliable
m_con.Send(client->peer_id, 0, reply, true);
- dstream<<"INFO: Server: Sent object remove/add: "
+ infostream<<"Server: Sent object remove/add: "
<<removed_objects.size()<<" removed, "
<<added_objects.size()<<" added, "
<<"packet size is "<<reply.getSize()<<std::endl;
}
}
- m_env.setKnownActiveObjects(whatever);
+ m_env->setKnownActiveObjects(whatever);
#endif
}
JMutexAutoLock envlock(m_env_mutex);
JMutexAutoLock conlock(m_con_mutex);
- ScopeProfiler sp(&g_profiler, "Server: sending object messages");
+ ScopeProfiler sp(g_profiler, "Server: sending object messages");
// Key = object id
// Value = data sent by object
// Get active object messages from environment
for(;;)
{
- ActiveObjectMessage aom = m_env.getActiveObjectMessage();
+ ActiveObjectMessage aom = m_env->getActiveObjectMessage();
if(aom.id == 0)
break;
/*if(reliable_data.size() > 0 || unreliable_data.size() > 0)
{
- dstream<<"INFO: Server: Size of object message data: "
+ infostream<<"Server: Size of object message data: "
<<"reliable: "<<reliable_data.size()
<<", unreliable: "<<unreliable_data.size()
<<std::endl;
if(event->type == MEET_ADDNODE)
{
- //dstream<<"Server: MEET_ADDNODE"<<std::endl;
+ //infostream<<"Server: MEET_ADDNODE"<<std::endl;
prof.add("MEET_ADDNODE", 1);
if(disable_single_change_sending)
sendAddNode(event->p, event->n, event->already_known_by_peer,
}
else if(event->type == MEET_REMOVENODE)
{
- //dstream<<"Server: MEET_REMOVENODE"<<std::endl;
+ //infostream<<"Server: MEET_REMOVENODE"<<std::endl;
prof.add("MEET_REMOVENODE", 1);
if(disable_single_change_sending)
sendRemoveNode(event->p, event->already_known_by_peer,
}
else if(event->type == MEET_BLOCK_NODE_METADATA_CHANGED)
{
- dstream<<"Server: MEET_BLOCK_NODE_METADATA_CHANGED"<<std::endl;
+ infostream<<"Server: MEET_BLOCK_NODE_METADATA_CHANGED"<<std::endl;
prof.add("MEET_BLOCK_NODE_METADATA_CHANGED", 1);
setBlockNotSent(event->p);
}
else if(event->type == MEET_OTHER)
{
+ infostream<<"Server: MEET_OTHER"<<std::endl;
prof.add("MEET_OTHER", 1);
- dstream<<"WARNING: Server: MEET_OTHER not implemented"
- <<std::endl;
+ for(core::map<v3s16, bool>::Iterator
+ i = event->modified_blocks.getIterator();
+ i.atEnd()==false; i++)
+ {
+ v3s16 p = i.getNode()->getKey();
+ setBlockNotSent(p);
+ }
}
else
{
prof.add("unknown", 1);
- dstream<<"WARNING: Server: Unknown MapEditEvent "
+ infostream<<"WARNING: Server: Unknown MapEditEvent "
<<((u32)event->type)<<std::endl;
}
{
v3s16 p = i.getNode()->getKey();
modified_blocks2.insert(p,
- m_env.getMap().getBlockNoCreateNoEx(p));
+ m_env->getMap().getBlockNoCreateNoEx(p));
}
// Set blocks not sent
for(core::list<u16>::Iterator
if(got_any_events)
{
- dstream<<"Server: MapEditEvents:"<<std::endl;
- prof.print(dstream);
+ infostream<<"Server: MapEditEvents:"<<std::endl;
+ prof.print(infostream);
}
}
- /*
- Send object positions
- TODO: Get rid of MapBlockObjects
- */
- {
- float &counter = m_objectdata_timer;
- counter += dtime;
- if(counter >= g_settings.getFloat("objectdata_interval"))
- {
- JMutexAutoLock lock1(m_env_mutex);
- JMutexAutoLock lock2(m_con_mutex);
-
- ScopeProfiler sp(&g_profiler, "Server: sending mbo positions");
-
- SendObjectData(counter);
-
- counter = 0.0;
- }
- }
-
/*
Trigger emergethread (it somehow gets to a non-triggered but
bysy state sometimes)
{
float &counter = m_savemap_timer;
counter += dtime;
- if(counter >= g_settings.getFloat("server_map_save_interval"))
+ if(counter >= g_settings->getFloat("server_map_save_interval"))
{
counter = 0.0;
+ JMutexAutoLock lock(m_env_mutex);
- ScopeProfiler sp(&g_profiler, "Server: saving stuff");
+ ScopeProfiler sp(g_profiler, "Server: saving stuff");
// Auth stuff
if(m_authmanager.isModified())
m_authmanager.save();
-
- // Map
- JMutexAutoLock lock(m_env_mutex);
-
- /*// Unload unused data (delete from memory)
- m_env.getMap().unloadUnusedData(
- g_settings.getFloat("server_unload_unused_sectors_timeout"));
- */
- /*u32 deleted_count = m_env.getMap().unloadUnusedData(
- g_settings.getFloat("server_unload_unused_sectors_timeout"));
- */
- // Save only changed parts
- m_env.getMap().save(true);
-
- /*if(deleted_count > 0)
- {
- dout_server<<"Server: Unloaded "<<deleted_count
- <<" blocks from memory"<<std::endl;
- }*/
+ //Ban stuff
+ if(m_banmanager.isModified())
+ m_banmanager.save();
+
+ // Save changed parts of map
+ m_env->getMap().save(MOD_STATE_WRITE_NEEDED);
// Save players
- m_env.serializePlayers(m_mapsavedir);
+ m_env->serializePlayers(m_mapsavedir);
// Save environment metadata
- m_env.saveMeta(m_mapsavedir);
+ m_env->saveMeta(m_mapsavedir);
}
}
}
void Server::Receive()
{
DSTACK(__FUNCTION_NAME);
- u32 data_maxsize = 10000;
- Buffer<u8> data(data_maxsize);
+ SharedBuffer<u8> data;
u16 peer_id;
u32 datasize;
try{
{
JMutexAutoLock conlock(m_con_mutex);
- datasize = m_con.Receive(peer_id, *data, data_maxsize);
+ datasize = m_con.Receive(peer_id, data);
}
// This has to be called so that the client list gets synced
}
catch(con::InvalidIncomingDataException &e)
{
- derr_server<<"Server::Receive(): "
+ infostream<<"Server::Receive(): "
"InvalidIncomingDataException: what()="
<<e.what()<<std::endl;
}
/*JMutexAutoLock envlock(m_env_mutex);
-
dout_server<<"ServerThread: peer_id="<<peer_id
+
infostream<<"ServerThread: peer_id="<<peer_id
<<" has apparently closed connection. "
<<"Removing player."<<std::endl;
- m_env.removePlayer(peer_id);*/
+ m_env->removePlayer(peer_id);*/
}
}
JMutexAutoLock envlock(m_env_mutex);
JMutexAutoLock conlock(m_con_mutex);
- con::Peer *peer;
+ ScopeProfiler sp(g_profiler, "Server::ProcessData");
+
try{
- peer = m_con.GetPeer(peer_id);
+ Address address = m_con.GetPeerAddress(peer_id);
+
+ // drop player if is ip is banned
+ if(m_banmanager.isIpBanned(address.serializeString())){
+ SendAccessDenied(m_con, peer_id,
+ L"Your ip is banned. Banned name was "
+ +narrow_to_wide(m_banmanager.getBanName(
+ address.serializeString())));
+ m_con.DeletePeer(peer_id);
+ return;
+ }
}
catch(con::PeerNotFoundException &e)
{
- derr_server<<DTIME<<"Server::ProcessData(): Cancelling: peer "
+ infostream<<"Server::ProcessData(): Cancelling: peer "
<<peer_id<<" not found"<<std::endl;
return;
}
-
- u8 peer_ser_ver = getClient(peer->id)->serialization_version;
+
+ u8 peer_ser_ver = getClient(peer_id)->serialization_version;
try
{
if(datasize < 2+1+PLAYERNAME_SIZE)
return;
- derr_server<<DTIME<<"Server: Got TOSERVER_INIT from "
- <<peer->id<<std::endl;
+ infostream<<"Server: Got TOSERVER_INIT from "
+ <<peer_id<<std::endl;
// First byte after command is maximum supported
// serialization version
deployed = SER_FMT_VER_INVALID;
//peer->serialization_version = deployed;
- getClient(peer->id)->pending_serialization_version = deployed;
-
+ getClient(peer_id)->pending_serialization_version = deployed;
+
if(deployed == SER_FMT_VER_INVALID)
{
- derr_server<<DTIME<<"Server: Cannot negotiate "
+ infostream<<"Server: Cannot negotiate "
"serialization version with peer "
<<peer_id<<std::endl;
+ SendAccessDenied(m_con, peer_id, std::wstring(
+ L"Your client's version is not supported.\n"
+ L"Server version is ")
+ + narrow_to_wide(VERSION_STRING) + L"."
+ );
+ return;
+ }
+
+ /*
+ Read and check network protocol version
+ */
+
+ u16 net_proto_version = 0;
+ if(datasize >= 2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2)
+ {
+ net_proto_version = readU16(&data[2+1+PLAYERNAME_SIZE+PASSWORD_SIZE]);
+ }
+
+ getClient(peer_id)->net_proto_version = net_proto_version;
+
+ if(net_proto_version == 0)
+ {
+ SendAccessDenied(m_con, peer_id, std::wstring(
+ L"Your client's version is not supported.\n"
+ L"Server version is ")
+ + narrow_to_wide(VERSION_STRING) + L"."
+ );
return;
}
+
+ if(g_settings->getBool("strict_protocol_version_checking"))
+ {
+ if(net_proto_version != PROTOCOL_VERSION)
+ {
+ SendAccessDenied(m_con, peer_id, std::wstring(
+ L"Your client's version is not supported.\n"
+ L"Server version is ")
+ + narrow_to_wide(VERSION_STRING) + L",\n"
+ + L"server's PROTOCOL_VERSION is "
+ + narrow_to_wide(itos(PROTOCOL_VERSION))
+ + L", client's PROTOCOL_VERSION is "
+ + narrow_to_wide(itos(net_proto_version))
+ );
+ return;
+ }
+ }
/*
Set up player
if(playername[0]=='\0')
{
- derr_server<<DTIME<<"Server: Player has empty name"<<std::endl;
+ infostream<<"Server: Player has empty name"<<std::endl;
SendAccessDenied(m_con, peer_id,
L"Empty name");
return;
if(string_allowed(playername, PLAYERNAME_ALLOWED_CHARS)==false)
{
- derr_server<<DTIME<<"Server: Player has invalid name"<<std::endl;
+ infostream<<"Server: Player has invalid name"<<std::endl;
SendAccessDenied(m_con, peer_id,
L"Name contains unallowed characters");
return;
// Get password
char password[PASSWORD_SIZE];
- if(datasize == 2+1+PLAYERNAME_SIZE)
+ if(datasize < 2+1+PLAYERNAME_SIZE+PASSWORD_SIZE)
{
// old version - assume blank password
password[0] = 0;
password[PASSWORD_SIZE-1] = 0;
}
- std::string checkpwd;
- if(m_authmanager.exists(playername))
- {
- checkpwd = m_authmanager.getPassword(playername);
- }
- else
+ // Add player to auth manager
+ if(m_authmanager.exists(playername) == false)
{
- checkpwd = g_settings.get("default_password");
+ std::wstring default_password =
+ narrow_to_wide(g_settings->get("default_password"));
+ std::string translated_default_password =
+ translatePassword(playername, default_password);
+
+ // If default_password is empty, allow any initial password
+ if (default_password.length() == 0)
+ translated_default_password = password;
+
+ infostream<<"Server: adding player "<<playername
+ <<" to auth manager"<<std::endl;
+ m_authmanager.add(playername);
+ m_authmanager.setPassword(playername, translated_default_password);
+ m_authmanager.setPrivs(playername,
+ stringToPrivs(g_settings->get("default_privs")));
+ m_authmanager.save();
}
-
- if(password != checkpwd && checkpwd != "")
+
+ std::string checkpwd = m_authmanager.getPassword(playername);
+
+ /*infostream<<"Server: Client gave password '"<<password
+ <<"', the correct one is '"<<checkpwd<<"'"<<std::endl;*/
+
+ if(password != checkpwd)
{
-
derr_server<<DTIME<<"Server: peer_id="<<peer_id
+
infostream<<"Server: peer_id="<<peer_id
<<": supplied invalid password for "
<<playername<<std::endl;
SendAccessDenied(m_con, peer_id, L"Invalid password");
return;
}
- // Add player to auth manager
- if(m_authmanager.exists(playername) == false)
+ // Enforce user limit.
+ // Don't enforce for users that have some admin right
+ if(m_clients.size() >= g_settings->getU16("max_users") &&
+ (m_authmanager.getPrivs(playername)
+ & (PRIV_SERVER|PRIV_BAN|PRIV_PRIVS|PRIV_PASSWORD)) == 0 &&
+ playername != g_settings->get("name"))
{
- derr_server<<DTIME<<"Server: adding player "<<playername
- <<" to auth manager"<<std::endl;
- m_authmanager.add(playername);
- m_authmanager.setPassword(playername, checkpwd);
- m_authmanager.setPrivs(playername,
- stringToPrivs(g_settings.get("default_privs")));
- m_authmanager.save();
+ SendAccessDenied(m_con, peer_id, L"Too many users.");
+ return;
}
// Get player
- Player *player = emergePlayer(playername, password, peer_id);
-
-
- /*{
- // DEBUG: Test serialization
- std::ostringstream test_os;
- player->serialize(test_os);
- dstream<<"Player serialization test: \""<<test_os.str()
- <<"\""<<std::endl;
- std::istringstream test_is(test_os.str());
- player->deSerialize(test_is);
- }*/
+ ServerRemotePlayer *player = emergePlayer(playername, peer_id);
// If failed, cancel
if(player == NULL)
{
-
derr_server<<DTIME<<"Server: peer_id="<<peer_id
+
infostream<<"Server: peer_id="<<peer_id
<<": failed to emerge player"<<std::endl;
return;
}
- /*
- // If a client is already connected to the player, cancel
- if(player->peer_id != 0)
- {
- derr_server<<DTIME<<"Server: peer_id="<<peer_id
- <<" tried to connect to "
- "an already connected player (peer_id="
- <<player->peer_id<<")"<<std::endl;
- return;
- }
- // Set client of player
- player->peer_id = peer_id;
- */
-
- // Check if player doesn't exist
- if(player == NULL)
- throw con::InvalidIncomingDataException
- ("Server::ProcessData(): INIT: Player doesn't exist");
-
- /*// update name if it was supplied
- if(datasize >= 20+3)
- {
- data[20+3-1] = 0;
- player->updateName((const char*)&data[3]);
- }*/
-
/*
Answer with a TOCLIENT_INIT
*/
writeU16(&reply[0], TOCLIENT_INIT);
writeU8(&reply[2], deployed);
writeV3S16(&reply[2+1], floatToInt(player->getPosition()+v3f(0,BS/2,0), BS));
- writeU64(&reply[2+1+6], m_env.getServerMap().getSeed());
+ writeU64(&reply[2+1+6], m_env->getServerMap().getSeed());
// Send as reliable
m_con.Send(peer_id, 0, reply, true);
if(command == TOSERVER_INIT2)
{
- derr_server<<DTIME<<"Server: Got TOSERVER_INIT2 from "
- <<peer->id<<std::endl;
+ infostream<<"Server: Got TOSERVER_INIT2 from "
+ <<peer_id<<std::endl;
- getClient(peer->id)->serialization_version
- = getClient(peer->id)->pending_serialization_version;
+ getClient(peer_id)->serialization_version
+ = getClient(peer_id)->pending_serialization_version;
/*
Send some initialization data
*/
+
+ // Send item definitions
+ SendItemDef(m_con, peer_id, m_itemdef);
+
+ // Send node definitions
+ SendNodeDef(m_con, peer_id, m_nodedef);
+
+ // Send texture announcement
+ SendTextureAnnouncement(peer_id);
// Send player info to all players
- SendPlayerInfos();
+ //SendPlayerInfos();
// Send inventory to player
- UpdateCrafting(peer->id);
- SendInventory(peer->id);
+ UpdateCrafting(peer_id);
+ SendInventory(peer_id);
+
+ // Send player items to all players
+ SendPlayerItems();
+
+ Player *player = m_env->getPlayer(peer_id);
// Send HP
- {
- Player *player = m_env.getPlayer(peer_id);
- SendPlayerHP(player);
- }
+ SendPlayerHP(player);
+ // Show death screen if necessary
+ if(player->hp == 0)
+ SendDeathscreen(m_con, player->peer_id, false, v3f(0,0,0));
+
// Send time of day
{
SharedBuffer<u8> data = makePacket_TOCLIENT_TIME_OF_DAY(
- m_env.getTimeOfDay());
- m_con.Send(peer->id, 0, data, true);
+ m_env->getTimeOfDay());
+ m_con.Send(peer_id, 0, data, true);
}
// Send information about server to player in chat
// Send information about joining in chat
{
std::wstring name = L"unknown";
- Player *player = m_env.getPlayer(peer_id);
+ Player *player = m_env->getPlayer(peer_id);
if(player != NULL)
name = narrow_to_wide(player->getName());
message += L" joined game";
BroadcastChatMessage(message);
}
+
+ // Warnings about protocol version can be issued here
+ if(getClient(peer_id)->net_proto_version < PROTOCOL_VERSION)
+ {
+ SendChatMessage(peer_id, L"# Server: WARNING: YOUR CLIENT IS OLD AND MAY WORK PROPERLY WITH THIS SERVER");
+ }
+
+ /*
+ Print out action
+ */
+ {
+ std::ostringstream os(std::ios_base::binary);
+ for(core::map<u16, RemoteClient*>::Iterator
+ i = m_clients.getIterator();
+ i.atEnd() == false; i++)
+ {
+ RemoteClient *client = i.getNode()->getValue();
+ assert(client->peer_id == i.getNode()->getKey());
+ if(client->serialization_version == SER_FMT_VER_INVALID)
+ continue;
+ // Get player
+ Player *player = m_env->getPlayer(client->peer_id);
+ if(!player)
+ continue;
+ // Get name of player
+ os<<player->getName()<<" ";
+ }
+
+ actionstream<<player->getName()<<" joins game. List of players: "
+ <<os.str()<<std::endl;
+ }
return;
}
if(peer_ser_ver == SER_FMT_VER_INVALID)
{
- derr_server<<DTIME<<"Server::ProcessData(): Cancelling: Peer"
+ infostream<<"Server::ProcessData(): Cancelling: Peer"
" serialization format invalid or not initialized."
" Skipping incoming command="<<command<<std::endl;
return;
}
- Player *player = m_env.getPlayer(peer_id);
+ Player *player = m_env->getPlayer(peer_id);
+ ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(player);
if(player == NULL){
- derr_server<<"Server::ProcessData(): Cancelling: "
+ infostream<<"Server::ProcessData(): Cancelling: "
"No player for peer_id="<<peer_id
<<std::endl;
return;
v3f speed((f32)ss.X/100., (f32)ss.Y/100., (f32)ss.Z/100.);
pitch = wrapDegrees(pitch);
yaw = wrapDegrees(yaw);
+
player->setPosition(position);
player->setSpeed(speed);
player->setPitch(pitch);
player->setYaw(yaw);
- /*
dout_server<<"Server::ProcessData(): Moved player "<<peer_id<<" to "
+ /*
infostream<<"Server::ProcessData(): Moved player "<<peer_id<<" to "
<<"("<<position.X<<","<<position.Y<<","<<position.Z<<")"
<<" pitch="<<pitch<<" yaw="<<yaw<<std::endl;*/
}
throw con::InvalidIncomingDataException
("GOTBLOCKS length is too short");
v3s16 p = readV3S16(&data[2+1+i*6]);
- /*dstream<<"Server: GOTBLOCKS ("
+ /*infostream<<"Server: GOTBLOCKS ("
<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
RemoteClient *client = getClient(peer_id);
client->GotBlock(p);
throw con::InvalidIncomingDataException
("DELETEDBLOCKS length is too short");
v3s16 p = readV3S16(&data[2+1+i*6]);
- /*dstream<<"Server: DELETEDBLOCKS ("
+ /*infostream<<"Server: DELETEDBLOCKS ("
<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
RemoteClient *client = getClient(peer_id);
client->SetBlockNotSent(p);
}
else if(command == TOSERVER_CLICK_OBJECT)
{
- if(datasize < 13)
- return;
+ infostream<<"Server: CLICK_OBJECT not supported anymore"<<std::endl;
+ return;
+ }
+ else if(command == TOSERVER_CLICK_ACTIVEOBJECT)
+ {
+ infostream<<"Server: CLICK_ACTIVEOBJECT not supported anymore"<<std::endl;
+ return;
+ }
+ else if(command == TOSERVER_GROUND_ACTION)
+ {
+ infostream<<"Server: GROUND_ACTION not supported anymore"<<std::endl;
+ return;
- if((getPlayerPrivs(player) & PRIV_BUILD) == 0)
+ }
+ else if(command == TOSERVER_RELEASE)
+ {
+ infostream<<"Server: RELEASE not supported anymore"<<std::endl;
+ return;
+ }
+ else if(command == TOSERVER_SIGNTEXT)
+ {
+ infostream<<"Server: SIGNTEXT not supported anymore"
+ <<std::endl;
+ return;
+ }
+ else if(command == TOSERVER_SIGNNODETEXT)
+ {
+ if((getPlayerPrivs(player) & PRIV_INTERACT) == 0)
return;
-
/*
- [0] u16 command
- [2] u8 button (0=left, 1=right)
- [3] v3s16 block
- [9] s16 id
- [11] u16 item
+ u16 command
+ v3s16 p
+ u16 textlen
+ textdata
*/
- u8 button = readU8(&data[2]);
- v3s16 p;
- p.X = readS16(&data[3]);
- p.Y = readS16(&data[5]);
- p.Z = readS16(&data[7]);
- s16 id = readS16(&data[9]);
- //u16 item_i = readU16(&data[11]);
-
- MapBlock *block = NULL;
- try
- {
- block = m_env.getMap().getBlockNoCreate(p);
- }
- catch(InvalidPositionException &e)
+ std::string datastring((char*)&data[2], datasize-2);
+ std::istringstream is(datastring, std::ios_base::binary);
+ u8 buf[6];
+ // Read stuff
+ is.read((char*)buf, 6);
+ v3s16 p = readV3S16(buf);
+ is.read((char*)buf, 2);
+ u16 textlen = readU16(buf);
+ std::string text;
+ for(u16 i=0; i<textlen; i++)
{
- derr_server<<"CLICK_OBJECT block not found"<<std::endl;
- return;
+ is.read((char*)buf, 1);
+ text += (char)buf[0];
}
- MapBlockObject *obj = block->getObject(id);
-
- if(obj == NULL)
- {
- derr_server<<"CLICK_OBJECT object not found"<<std::endl;
+ NodeMetadata *meta = m_env->getMap().getNodeMetadata(p);
+ if(!meta)
return;
- }
- //TODO: Check that object is reasonably close
+ meta->setText(text);
- // Left click
- if(button == 0)
- {
- InventoryList *ilist = player->inventory.getList("main");
- if(g_settings.getBool("creative_mode") == false && ilist != NULL)
- {
-
- // Skip if inventory has no free space
- if(ilist->getUsedSlots() == ilist->getSize())
- {
- dout_server<<"Player inventory has no free space"<<std::endl;
- return;
- }
+ actionstream<<player->getName()<<" writes \""<<text<<"\" to sign"
+ <<" at "<<PP(p)<<std::endl;
- /*
- Create the inventory item
- */
- InventoryItem *item = NULL;
- // If it is an item-object, take the item from it
- if(obj->getTypeId() == MAPBLOCKOBJECT_TYPE_ITEM)
- {
- item = ((ItemObject*)obj)->createInventoryItem();
- }
- // Else create an item of the object
- else
- {
- item = new MapBlockObjectItem
- (obj->getInventoryString());
- }
-
- // Add to inventory and send inventory
- ilist->addItem(item);
- UpdateCrafting(player->peer_id);
- SendInventory(player->peer_id);
- }
-
- // Remove from block
- block->removeObject(id);
+ v3s16 blockpos = getNodeBlockPos(p);
+ MapBlock *block = m_env->getMap().getBlockNoCreateNoEx(blockpos);
+ if(block)
+ {
+ block->raiseModified(MOD_STATE_WRITE_NEEDED,
+ "sign node text");
}
+
+ setBlockNotSent(blockpos);
}
- else if(command == TOSERVER_CLICK_ACTIVEOBJECT)
+ else if(command == TOSERVER_INVENTORY_ACTION)
{
- if(datasize < 7)
- return;
-
- if((getPlayerPrivs(player) & PRIV_BUILD) == 0)
- return;
-
- /*
- length: 7
- [0] u16 command
- [2] u8 button (0=left, 1=right)
- [3] u16 id
- [5] u16 item
- */
- u8 button = readU8(&data[2]);
- u16 id = readS16(&data[3]);
- u16 item_i = readU16(&data[11]);
-
- ServerActiveObject *obj = m_env.getActiveObject(id);
-
- if(obj == NULL)
+ // Strip command and create a stream
+ std::string datastring((char*)&data[2], datasize-2);
+ infostream<<"TOSERVER_INVENTORY_ACTION: data="<<datastring<<std::endl;
+ std::istringstream is(datastring, std::ios_base::binary);
+ // Create an action
+ InventoryAction *a = InventoryAction::deSerialize(is);
+ if(a == NULL)
{
- derr_server<<"Server: CLICK_ACTIVEOBJECT: object not found"
+ infostream<<"TOSERVER_INVENTORY_ACTION: "
+ <<"InventoryAction::deSerialize() returned NULL"
<<std::endl;
return;
}
- // Skip if object has been removed
- if(obj->m_removed)
- return;
-
- //TODO: Check that object is reasonably close
-
- // Left click, pick object up (usually)
- if(button == 0)
- {
- /*
- Try creating inventory item
- */
- InventoryItem *item = obj->createPickedUpItem();
-
- if(item)
- {
- InventoryList *ilist = player->inventory.getList("main");
- if(ilist != NULL)
- {
- if(g_settings.getBool("creative_mode") == false)
- {
- // Skip if inventory has no free space
- if(ilist->getUsedSlots() == ilist->getSize())
- {
- dout_server<<"Player inventory has no free space"<<std::endl;
- return;
- }
-
- // Add to inventory and send inventory
- ilist->addItem(item);
- UpdateCrafting(player->peer_id);
- SendInventory(player->peer_id);
- }
-
- // Remove object from environment
- obj->m_removed = true;
- }
- }
- else
- {
- /*
- Item cannot be picked up. Punch it instead.
- */
-
- ToolItem *titem = NULL;
- std::string toolname = "";
-
- InventoryList *mlist = player->inventory.getList("main");
- if(mlist != NULL)
- {
- InventoryItem *item = mlist->getItem(item_i);
- if(item && (std::string)item->getName() == "ToolItem")
- {
- titem = (ToolItem*)item;
- toolname = titem->getToolName();
- }
- }
-
- v3f playerpos = player->getPosition();
- v3f objpos = obj->getBasePosition();
- v3f dir = (objpos - playerpos).normalize();
-
- u16 wear = obj->punch(toolname, dir);
-
- if(titem)
- {
- bool weared_out = titem->addWear(wear);
- if(weared_out)
- mlist->deleteItem(item_i);
- SendInventory(player->peer_id);
- }
- }
- }
- // Right click, do something with object
- if(button == 1)
- {
- // Track hp changes super-crappily
- u16 oldhp = player->hp;
-
- // Do stuff
- obj->rightClick(player);
-
- // Send back stuff
- if(player->hp != oldhp)
- {
- SendPlayerHP(player);
- }
- }
- }
- else if(command == TOSERVER_GROUND_ACTION)
- {
- if(datasize < 17)
- return;
/*
- length: 17
- [0] u16 command
- [2] u8 action
- [3] v3s16 nodepos_undersurface
- [9] v3s16 nodepos_abovesurface
- [15] u16 item
- actions:
- 0: start digging
- 1: place block
- 2: stop digging (all parameters ignored)
- 3: digging completed
- */
- u8 action = readU8(&data[2]);
- v3s16 p_under;
- p_under.X = readS16(&data[3]);
- p_under.Y = readS16(&data[5]);
- p_under.Z = readS16(&data[7]);
- v3s16 p_over;
- p_over.X = readS16(&data[9]);
- p_over.Y = readS16(&data[11]);
- p_over.Z = readS16(&data[13]);
- u16 item_i = readU16(&data[15]);
-
- //TODO: Check that target is reasonably close
-
- /*
- 0: start digging
+ Note: Always set inventory not sent, to repair cases
+ where the client made a bad prediction.
*/
- if(action == 0)
- {
- /*
- NOTE: This can be used in the future to check if
- somebody is cheating, by checking the timing.
- */
- } // action == 0
/*
- 2: stop digging
+ Handle restrictions and special cases of the move action
*/
- else if(action == 2)
+ if(a->getType() == IACTION_MOVE)
{
-#if 0
- RemoteClient *client = getClient(peer->id);
- JMutexAutoLock digmutex(client->m_dig_mutex);
- client->m_dig_tool_item = -1;
-#endif
- }
+ IMoveAction *ma = (IMoveAction*)a;
- /*
- 3: Digging completed
- */
- else if(action == 3)
- {
- // Mandatory parameter; actually used for nothing
- core::map<v3s16, MapBlock*> modified_blocks;
+ ma->from_inv.applyCurrentPlayer(player->getName());
+ ma->to_inv.applyCurrentPlayer(player->getName());
- content_t material = CONTENT_IGNORE;
- u8 mineral = MINERAL_NONE;
+ setInventoryModified(ma->from_inv);
+ setInventoryModified(ma->to_inv);
- bool cannot_remove_node = false;
+ bool from_inv_is_current_player =
+ (ma->from_inv.type == InventoryLocation::PLAYER) &&
+ (ma->from_inv.name == player->getName());
- try
- {
- MapNode n = m_env.getMap().getNode(p_under);
- // Get mineral
- mineral = n.getMineral();
- // Get material at position
- material = n.getContent();
- // If not yet cancelled
- if(cannot_remove_node == false)
- {
- // If it's not diggable, do nothing
- if(content_diggable(material) == false)
- {
- derr_server<<"Server: Not finishing digging: "
- <<"Node not diggable"
- <<std::endl;
- cannot_remove_node = true;
- }
- }
- // If not yet cancelled
- if(cannot_remove_node == false)
- {
- // Get node metadata
- NodeMetadata *meta = m_env.getMap().getNodeMetadata(p_under);
- if(meta && meta->nodeRemovalDisabled() == true)
- {
- derr_server<<"Server: Not finishing digging: "
- <<"Node metadata disables removal"
- <<std::endl;
- cannot_remove_node = true;
- }
- }
- }
- catch(InvalidPositionException &e)
- {
- derr_server<<"Server: Not finishing digging: Node not found."
- <<" Adding block to emerge queue."
- <<std::endl;
- m_emerge_queue.addBlock(peer_id,
- getNodeBlockPos(p_over), BLOCK_EMERGE_FLAG_FROMDISK);
- cannot_remove_node = true;
- }
-
- // Make sure the player is allowed to do it
- if((getPlayerPrivs(player) & PRIV_BUILD) == 0)
- {
- dstream<<"Player "<<player->getName()<<" cannot remove node"
- <<" because privileges are "<<getPlayerPrivs(player)
- <<std::endl;
- cannot_remove_node = true;
- }
+ bool to_inv_is_current_player =
+ (ma->to_inv.type == InventoryLocation::PLAYER) &&
+ (ma->to_inv.name == player->getName());
/*
- If node can't be removed, set block to be re-sent to
- client and quit.
+ Disable moving items out of craftpreview
*/
- if(cannot_remove_node)
+ if(ma->from_list == "craftpreview")
{
- derr_server<<"Server: Not finishing digging."<<std::endl;
-
- // Client probably has wrong data.
- // Set block not sent, so that client will get
- // a valid one.
- dstream<<"Client "<<peer_id<<" tried to dig "
- <<"node; but node cannot be removed."
- <<" setting MapBlock not sent."<<std::endl;
- RemoteClient *client = getClient(peer_id);
- v3s16 blockpos = getNodeBlockPos(p_under);
- client->SetBlockNotSent(blockpos);
-
+ infostream<<"Ignoring IMoveAction from "
+ <<(ma->from_inv.dump())<<":"<<ma->from_list
+ <<" to "<<(ma->to_inv.dump())<<":"<<ma->to_list
+ <<" because src is "<<ma->from_list<<std::endl;
+ delete a;
return;
}
-
- /*
- Send the removal to all close-by players.
- - If other player is close, send REMOVENODE
- - Otherwise set blocks not sent
- */
- core::list<u16> far_players;
- sendRemoveNode(p_under, peer_id, &far_players, 30);
-
- /*
- Update and send inventory
- */
-
- if(g_settings.getBool("creative_mode") == false)
- {
- /*
- Wear out tool
- */
- InventoryList *mlist = player->inventory.getList("main");
- if(mlist != NULL)
- {
- InventoryItem *item = mlist->getItem(item_i);
- if(item && (std::string)item->getName() == "ToolItem")
- {
- ToolItem *titem = (ToolItem*)item;
- std::string toolname = titem->getToolName();
-
- // Get digging properties for material and tool
- DiggingProperties prop =
- getDiggingProperties(material, toolname);
-
- if(prop.diggable == false)
- {
- derr_server<<"Server: WARNING: Player digged"
- <<" with impossible material + tool"
- <<" combination"<<std::endl;
- }
-
- bool weared_out = titem->addWear(prop.wear);
-
- if(weared_out)
- {
- mlist->deleteItem(item_i);
- }
- }
- }
-
- /*
- Add dug item to inventory
- */
-
- InventoryItem *item = NULL;
-
- if(mineral != MINERAL_NONE)
- item = getDiggedMineralItem(mineral);
-
- // If not mineral
- if(item == NULL)
- {
- std::string &dug_s = content_features(material).dug_item;
- if(dug_s != "")
- {
- std::istringstream is(dug_s, std::ios::binary);
- item = InventoryItem::deSerialize(is);
- }
- }
-
- if(item != NULL)
- {
- // Add a item to inventory
- player->inventory.addItem("main", item);
-
- // Send inventory
- UpdateCrafting(player->peer_id);
- SendInventory(player->peer_id);
- }
- }
/*
- Remove the node
- (this takes some time so it is done after the quick stuff)
- */
- {
- MapEditEventIgnorer ign(&m_ignore_map_edit_events);
-
- m_env.getMap().removeNodeAndUpdate(p_under, modified_blocks);
- }
- /*
- Set blocks not sent to far players
+ Disable moving items into craftresult and craftpreview
*/
- for(core::list<u16>::Iterator
- i = far_players.begin();
- i != far_players.end(); i++)
+ if(ma->to_list == "craftpreview" || ma->to_list == "craftresult")
{
- u16 peer_id = *i;
- RemoteClient *client = getClient(peer_id);
- if(client==NULL)
- continue;
- client->SetBlocksNotSent(modified_blocks);
+ infostream<<"Ignoring IMoveAction from "
+ <<(ma->from_inv.dump())<<":"<<ma->from_list
+ <<" to "<<(ma->to_inv.dump())<<":"<<ma->to_list
+ <<" because dst is "<<ma->to_list<<std::endl;
+ delete a;
+ return;
}
- }
-
- /*
- 1: place block
- */
- else if(action == 1)
- {
- InventoryList *ilist = player->inventory.getList("main");
- if(ilist == NULL)
+ // Disallow moving items in elsewhere than player's inventory
+ // if not allowed to interact
+ if((getPlayerPrivs(player) & PRIV_INTERACT) == 0
+ && (!from_inv_is_current_player
+ || !to_inv_is_current_player))
+ {
+ infostream<<"Cannot move outside of player's inventory: "
+ <<"No interact privilege"<<std::endl;
+ delete a;
return;
+ }
- // Get item
- InventoryItem *item = ilist->getItem(item_i);
-
- // If there is no item, it is not possible to add it anywhere
- if(item == NULL)
- return;
-
- /*
- Handle material items
- */
- if(std::string("MaterialItem") == item->getName())
+ // If player is not an admin, check for ownership of src and dst
+ if((getPlayerPrivs(player) & PRIV_SERVER) == 0)
{
- try{
- // Don't add a node if this is not a free space
- MapNode n2 = m_env.getMap().getNode(p_over);
- bool no_enough_privs =
- ((getPlayerPrivs(player) & PRIV_BUILD)==0);
- if(no_enough_privs)
- dstream<<"Player "<<player->getName()<<" cannot add node"
- <<" because privileges are "<<getPlayerPrivs(player)
- <<std::endl;
-
- if(content_features(n2).buildable_to == false
- || no_enough_privs)
- {
- // Client probably has wrong data.
- // Set block not sent, so that client will get
- // a valid one.
- dstream<<"Client "<<peer_id<<" tried to place"
- <<" node in invalid position; setting"
- <<" MapBlock not sent."<<std::endl;
- RemoteClient *client = getClient(peer_id);
- v3s16 blockpos = getNodeBlockPos(p_over);
- client->SetBlockNotSent(blockpos);
- return;
- }
- }
- catch(InvalidPositionException &e)
+ std::string owner_from = getInventoryOwner(ma->from_inv);
+ if(owner_from != "" && owner_from != player->getName())
{
- derr_server<<"Server: Ignoring ADDNODE: Node not found"
- <<" Adding block to emerge queue."
- <<std::endl;
- m_emerge_queue.addBlock(peer_id,
- getNodeBlockPos(p_over), BLOCK_EMERGE_FLAG_FROMDISK);
+ infostream<<"WARNING: "<<player->getName()
+ <<" tried to access an inventory that"
+ <<" belongs to "<<owner_from<<std::endl;
+ delete a;
return;
}
- // Reset build time counter
- getClient(peer->id)->m_time_from_building = 0.0;
-
- // Create node data
- MaterialItem *mitem = (MaterialItem*)item;
- MapNode n;
- n.setContent(mitem->getMaterial());
-
- // Calculate direction for wall mounted stuff
- if(content_features(n).wall_mounted)
- n.param2 = packDir(p_under - p_over);
-
- // Calculate the direction for furnaces and chests and stuff
- if(content_features(n).param_type == CPT_FACEDIR_SIMPLE)
+ std::string owner_to = getInventoryOwner(ma->to_inv);
+ if(owner_to != "" && owner_to != player->getName())
{
- v3f playerpos = player->getPosition();
- v3f blockpos = intToFloat(p_over, BS) - playerpos;
- blockpos = blockpos.normalize();
- n.param1 = 0;
- if (fabs(blockpos.X) > fabs(blockpos.Z)) {
- if (blockpos.X < 0)
- n.param1 = 3;
- else
- n.param1 = 1;
- } else {
- if (blockpos.Z < 0)
- n.param1 = 2;
- else
- n.param1 = 0;
- }
- }
-
- /*
- Send to all close-by players
- */
- core::list<u16> far_players;
- sendAddNode(p_over, n, 0, &far_players, 30);
-
- /*
- Handle inventory
- */
- InventoryList *ilist = player->inventory.getList("main");
- if(g_settings.getBool("creative_mode") == false && ilist)
- {
- // Remove from inventory and send inventory
- if(mitem->getCount() == 1)
- ilist->deleteItem(item_i);
- else
- mitem->remove(1);
- // Send inventory
- UpdateCrafting(peer_id);
- SendInventory(peer_id);
+ infostream<<"WARNING: "<<player->getName()
+ <<" tried to access an inventory that"
+ <<" belongs to "<<owner_to<<std::endl;
+ delete a;
+ return;
}
-
- /*
- Add node.
+ }
+ }
+ /*
+ Handle restrictions and special cases of the drop action
+ */
+ else if(a->getType() == IACTION_DROP)
+ {
+ IDropAction *da = (IDropAction*)a;
- This takes some time so it is done after the quick stuff
- */
- core::map<v3s16, MapBlock*> modified_blocks;
- {
- MapEditEventIgnorer ign(&m_ignore_map_edit_events);
+ da->from_inv.applyCurrentPlayer(player->getName());
- m_env.getMap().addNodeAndUpdate(p_over, n, modified_blocks);
- }
- /*
- Set blocks not sent to far players
- */
- for(core::list<u16>::Iterator
- i = far_players.begin();
- i != far_players.end(); i++)
- {
- u16 peer_id = *i;
- RemoteClient *client = getClient(peer_id);
- if(client==NULL)
- continue;
- client->SetBlocksNotSent(modified_blocks);
- }
+ setInventoryModified(da->from_inv);
- /*
- Calculate special events
- */
-
- /*if(n.d == CONTENT_MESE)
- {
- u32 count = 0;
- for(s16 z=-1; z<=1; z++)
- for(s16 y=-1; y<=1; y++)
- for(s16 x=-1; x<=1; x++)
- {
-
- }
- }*/
+ // Disallow dropping items if not allowed to interact
+ if((getPlayerPrivs(player) & PRIV_INTERACT) == 0)
+ {
+ delete a;
+ return;
}
- /*
- Place other item (not a block)
- */
- else
+ // If player is not an admin, check for ownership
+ else if((getPlayerPrivs(player) & PRIV_SERVER) == 0)
{
- v3s16 blockpos = getNodeBlockPos(p_over);
-
- /*
- Check that the block is loaded so that the item
- can properly be added to the static list too
- */
- MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(blockpos);
- if(block==NULL)
+ std::string owner_from = getInventoryOwner(da->from_inv);
+ if(owner_from != "" && owner_from != player->getName())
{
- derr_server<<"Error while placing object: "
- "block not found"<<std::endl;
+ infostream<<"WARNING: "<<player->getName()
+ <<" tried to access an inventory that"
+ <<" belongs to "<<owner_from<<std::endl;
+ delete a;
return;
}
-
- dout_server<<"Placing a miscellaneous item on map"
- <<std::endl;
-
- // Calculate a position for it
- v3f pos = intToFloat(p_over, BS);
- //pos.Y -= BS*0.45;
- pos.Y -= BS*0.25; // let it drop a bit
- // Randomize a bit
- pos.X += BS*0.2*(float)myrand_range(-1000,1000)/1000.0;
- pos.Z += BS*0.2*(float)myrand_range(-1000,1000)/1000.0;
-
- /*
- Create the object
- */
- ServerActiveObject *obj = item->createSAO(&m_env, 0, pos);
-
- if(obj == NULL)
- {
- derr_server<<"WARNING: item resulted in NULL object, "
- <<"not placing onto map"
- <<std::endl;
- }
- else
- {
- // Add the object to the environment
- m_env.addActiveObject(obj);
-
- dout_server<<"Placed object"<<std::endl;
-
- if(g_settings.getBool("creative_mode") == false)
- {
- // Delete the right amount of items from the slot
- u16 dropcount = item->getDropCount();
-
- // Delete item if all gone
- if(item->getCount() <= dropcount)
- {
- if(item->getCount() < dropcount)
- dstream<<"WARNING: Server: dropped more items"
- <<" than the slot contains"<<std::endl;
-
- InventoryList *ilist = player->inventory.getList("main");
- if(ilist)
- // Remove from inventory and send inventory
- ilist->deleteItem(item_i);
- }
- // Else decrement it
- else
- item->remove(dropcount);
-
- // Send inventory
- UpdateCrafting(peer_id);
- SendInventory(peer_id);
- }
- }
}
-
- } // action == 1
-
- /*
- Catch invalid actions
- */
- else
- {
- derr_server<<"WARNING: Server: Invalid action "
- <<action<<std::endl;
}
- }
-#if 0
- else if(command == TOSERVER_RELEASE)
- {
- if(datasize < 3)
- return;
/*
- length: 3
- [0] u16 command
- [2] u8 button
- */
- dstream<<"TOSERVER_RELEASE ignored"<<std::endl;
- }
-#endif
- else if(command == TOSERVER_SIGNTEXT)
- {
- if((getPlayerPrivs(player) & PRIV_BUILD) == 0)
- return;
- /*
- u16 command
- v3s16 blockpos
- s16 id
- u16 textlen
- textdata
+ Handle restrictions and special cases of the craft action
*/
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- u8 buf[6];
- // Read stuff
- is.read((char*)buf, 6);
- v3s16 blockpos = readV3S16(buf);
- is.read((char*)buf, 2);
- s16 id = readS16(buf);
- is.read((char*)buf, 2);
- u16 textlen = readU16(buf);
- std::string text;
- for(u16 i=0; i<textlen; i++)
- {
- is.read((char*)buf, 1);
- text += (char)buf[0];
- }
-
- MapBlock *block = NULL;
- try
- {
- block = m_env.getMap().getBlockNoCreate(blockpos);
- }
- catch(InvalidPositionException &e)
- {
- derr_server<<"Error while setting sign text: "
- "block not found"<<std::endl;
- return;
- }
-
- MapBlockObject *obj = block->getObject(id);
- if(obj == NULL)
- {
- derr_server<<"Error while setting sign text: "
- "object not found"<<std::endl;
- return;
- }
-
- if(obj->getTypeId() != MAPBLOCKOBJECT_TYPE_SIGN)
+ else if(a->getType() == IACTION_CRAFT)
{
- derr_server<<"Error while setting sign text: "
- "object is not a sign"<<std::endl;
- return;
- }
+ ICraftAction *ca = (ICraftAction*)a;
- ((SignObject*)obj)->setText(text);
+ ca->craft_inv.applyCurrentPlayer(player->getName());
- obj->getBlock()->setChangedFlag();
- }
- else if(command == TOSERVER_SIGNNODETEXT)
- {
- if((getPlayerPrivs(player) & PRIV_BUILD) == 0)
- return;
- /*
- u16 command
- v3s16 p
- u16 textlen
- textdata
- */
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- u8 buf[6];
- // Read stuff
- is.read((char*)buf, 6);
- v3s16 p = readV3S16(buf);
- is.read((char*)buf, 2);
- u16 textlen = readU16(buf);
- std::string text;
- for(u16 i=0; i<textlen; i++)
- {
- is.read((char*)buf, 1);
- text += (char)buf[0];
- }
+ setInventoryModified(ca->craft_inv);
- NodeMetadata *meta = m_env.getMap().getNodeMetadata(p);
- if(!meta)
- return;
- if(meta->typeId() != CONTENT_SIGN_WALL)
- return;
- SignNodeMetadata *signmeta = (SignNodeMetadata*)meta;
- signmeta->setText(text);
-
- v3s16 blockpos = getNodeBlockPos(p);
- MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(blockpos);
- if(block)
- {
- block->setChangedFlag();
- }
+ //bool craft_inv_is_current_player =
+ // (ca->craft_inv.type == InventoryLocation::PLAYER) &&
+ // (ca->craft_inv.name == player->getName());
- for(core::map<u16, RemoteClient*>::Iterator
- i = m_clients.getIterator();
- i.atEnd()==false; i++)
- {
- RemoteClient *client = i.getNode()->getValue();
- client->SetBlockNotSent(blockpos);
- }
- }
- else if(command == TOSERVER_INVENTORY_ACTION)
- {
- /*// Ignore inventory changes if in creative mode
- if(g_settings.getBool("creative_mode") == true)
- {
- dstream<<"TOSERVER_INVENTORY_ACTION: ignoring in creative mode"
- <<std::endl;
- return;
- }*/
- // Strip command and create a stream
- std::string datastring((char*)&data[2], datasize-2);
- dstream<<"TOSERVER_INVENTORY_ACTION: data="<<datastring<<std::endl;
- std::istringstream is(datastring, std::ios_base::binary);
- // Create an action
- InventoryAction *a = InventoryAction::deSerialize(is);
- if(a != NULL)
- {
- // Create context
- InventoryContext c;
- c.current_player = player;
-
- /*
- Handle craftresult specially if not in creative mode
- */
- bool disable_action = false;
- if(a->getType() == IACTION_MOVE
- && g_settings.getBool("creative_mode") == false)
- {
- IMoveAction *ma = (IMoveAction*)a;
- if(ma->to_inv == "current_player" &&
- ma->from_inv == "current_player")
- {
- InventoryList *rlist = player->inventory.getList("craftresult");
- assert(rlist);
- InventoryList *clist = player->inventory.getList("craft");
- assert(clist);
- InventoryList *mlist = player->inventory.getList("main");
- assert(mlist);
- /*
- Craftresult is no longer preview if something
- is moved into it
- */
- if(ma->to_list == "craftresult"
- && ma->from_list != "craftresult")
- {
- // If it currently is a preview, remove
- // its contents
- if(player->craftresult_is_preview)
- {
- rlist->deleteItem(0);
- }
- player->craftresult_is_preview = false;
- }
- /*
- Crafting takes place if this condition is true.
- */
- if(player->craftresult_is_preview &&
- ma->from_list == "craftresult")
- {
- player->craftresult_is_preview = false;
- clist->decrementMaterials(1);
- }
- /*
- If the craftresult is placed on itself, move it to
- main inventory instead of doing the action
- */
- if(ma->to_list == "craftresult"
- && ma->from_list == "craftresult")
- {
- disable_action = true;
-
- InventoryItem *item1 = rlist->changeItem(0, NULL);
- mlist->addItem(item1);
- }
- }
- }
-
- if(disable_action == false)
+ // Disallow crafting if not allowed to interact
+ if((getPlayerPrivs(player) & PRIV_INTERACT) == 0)
{
- // Feed action to player inventory
- a->apply(&c, this);
- // Eat the action
+ infostream<<"Cannot craft: "
+ <<"No interact privilege"<<std::endl;
delete a;
+ return;
}
- else
+
+ // If player is not an admin, check for ownership of inventory
+ if((getPlayerPrivs(player) & PRIV_SERVER) == 0)
{
- // Send inventory
- UpdateCrafting(player->peer_id);
- SendInventory(player->peer_id);
+ std::string owner_craft = getInventoryOwner(ca->craft_inv);
+ if(owner_craft != "" && owner_craft != player->getName())
+ {
+ infostream<<"WARNING: "<<player->getName()
+ <<" tried to access an inventory that"
+ <<" belongs to "<<owner_craft<<std::endl;
+ delete a;
+ return;
+ }
}
}
- else
- {
- dstream<<"TOSERVER_INVENTORY_ACTION: "
- <<"InventoryAction::deSerialize() returned NULL"
- <<std::endl;
- }
+
+ // Do the action
+ a->apply(this, srp, this);
+ // Eat the action
+ delete a;
}
else if(command == TOSERVER_CHAT_MESSAGE)
{
// Get player name of this client
std::wstring name = narrow_to_wide(player->getName());
+ // Run script hook
+ bool ate = scriptapi_on_chat_message(m_lua, player->getName(),
+ wide_to_narrow(message));
+ // If script ate the message, don't proceed
+ if(ate)
+ return;
+
// Line to send to players
std::wstring line;
// Whether to send to the player that sent the line
u64 privs = getPlayerPrivs(player);
// Parse commands
- std::wstring commandprefix = L"/#";
- if(message.substr(0, commandprefix.size()) == commandprefix)
+ if(message[0] == L'/')
{
- line += L"Server: ";
+ size_t strip_size = 1;
+ if (message[1] == L'#') // support old-style commans
+ ++strip_size;
+ message = message.substr(strip_size);
- message = message.substr(commandprefix.size());
-
WStrfnd f1(message);
f1.next(L" "); // Skip over /#whatever
std::wstring paramstring = f1.next(L"");
str_split(message, L' '),
paramstring,
this,
- &m_env,
+ m_env,
player,
privs);
- line += processServerCommand(ctx);
- send_to_sender = ctx->flags & 1;
- send_to_others = ctx->flags & 2;
+ std::wstring reply(processServerCommand(ctx));
+ send_to_sender = ctx->flags & SEND_TO_SENDER;
+ send_to_others = ctx->flags & SEND_TO_OTHERS;
+
+ if (ctx->flags & SEND_NO_PREFIX)
+ line += reply;
+ else
+ line += L"Server: " + reply;
+
delete ctx;
}
if(line != L"")
{
- dstream<<"CHAT: "<<wide_to_narrow(line)<<std::endl;
+ if(send_to_others)
+ actionstream<<"CHAT: "<<wide_to_narrow(line)<<std::endl;
/*
Send the message to clients
}
else if(command == TOSERVER_DAMAGE)
{
- if(g_settings.getBool("enable_damage"))
+ std::string datastring((char*)&data[2], datasize-2);
+ std::istringstream is(datastring, std::ios_base::binary);
+ u8 damage = readU8(is);
+
+ ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(player);
+
+ if(g_settings->getBool("enable_damage"))
{
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- u8 damage = readU8(is);
- if(player->hp > damage)
- {
- player->hp -= damage;
- }
- else
- {
- player->hp = 0;
+ actionstream<<player->getName()<<" damaged by "
+ <<(int)damage<<" hp at "<<PP(player->getPosition()/BS)
+ <<std::endl;
- dstream<<"TODO: Server: TOSERVER_HP_DECREMENT: Player dies"
- <<std::endl;
-
- v3f pos = findSpawnPos(m_env.getServerMap());
- player->setPosition(pos);
- player->hp = 20;
- SendMovePlayer(player);
+ srp->setHP(srp->getHP() - damage);
+
+ if(srp->getHP() == 0 && srp->m_hp_not_sent)
+ DiePlayer(srp);
+
+ if(srp->m_hp_not_sent)
SendPlayerHP(player);
-
- //TODO: Throw items around
- }
}
-
- SendPlayerHP(player);
+ else
+ {
+ // Force send (to correct the client's predicted HP)
+ SendPlayerHP(player);
+ }
}
else if(command == TOSERVER_PASSWORD)
{
newpwd += c;
}
+ infostream<<"Server: Client requests a password change from "
+ <<"'"<<oldpwd<<"' to '"<<newpwd<<"'"<<std::endl;
+
std::string playername = player->getName();
if(m_authmanager.exists(playername) == false)
{
- dstream<<"Server: playername not found in authmanager"<<std::endl;
+ infostream<<"Server: playername not found in authmanager"<<std::endl;
// Wrong old password supplied!!
SendChatMessage(peer_id, L"playername not found in authmanager");
return;
}
std::string checkpwd = m_authmanager.getPassword(playername);
-
+
if(oldpwd != checkpwd)
{
- dstream<<"Server: invalid old password"<<std::endl;
+ infostream<<"Server: invalid old password"<<std::endl;
// Wrong old password supplied!!
SendChatMessage(peer_id, L"Invalid old password supplied. Password NOT changed.");
return;
}
+ actionstream<<player->getName()<<" changes password"<<std::endl;
+
m_authmanager.setPassword(playername, newpwd);
-
dstream<<"Server: password change successful for "<<playername
+
infostream<<"Server: password change successful for "<<playername
<<std::endl;
SendChatMessage(peer_id, L"Password change successful");
}
+ else if(command == TOSERVER_PLAYERITEM)
+ {
+ if (datasize < 2+2)
+ return;
+
+ u16 item = readU16(&data[2]);
+ srp->setWieldIndex(item);
+ SendWieldedItem(srp);
+ }
+ else if(command == TOSERVER_RESPAWN)
+ {
+ if(player->hp != 0)
+ return;
+
+ RespawnPlayer(player);
+
+ actionstream<<player->getName()<<" respawns at "
+ <<PP(player->getPosition()/BS)<<std::endl;
+
+ // ActiveObject is added to environment in AsyncRunStep after
+ // the previous addition has been succesfully removed
+ }
+ else if(command == TOSERVER_REQUEST_TEXTURES) {
+ std::string datastring((char*)&data[2], datasize-2);
+ std::istringstream is(datastring, std::ios_base::binary);
+
+ infostream<<"TOSERVER_REQUEST_TEXTURES: "<<std::endl;
+
+ core::list<TextureRequest> tosend;
+
+ u16 numtextures = readU16(is);
+
+ for(int i = 0; i < numtextures; i++) {
+
+ std::string name = deSerializeString(is);
+
+ tosend.push_back(TextureRequest(name));
+ infostream<<"TOSERVER_REQUEST_TEXTURES: requested texture " << name <<std::endl;
+ }
+
+ SendTexturesRequested(peer_id, tosend);
+
+ // Now the client should know about everything
+ // (definitions and textures)
+ getClient(peer_id)->definitions_sent = true;
+ }
+ else if(command == TOSERVER_INTERACT)
+ {
+ std::string datastring((char*)&data[2], datasize-2);
+ std::istringstream is(datastring, std::ios_base::binary);
+
+ /*
+ [0] u16 command
+ [2] u8 action
+ [3] u16 item
+ [5] u32 length of the next item
+ [9] serialized PointedThing
+ actions:
+ 0: start digging (from undersurface) or use
+ 1: stop digging (all parameters ignored)
+ 2: digging completed
+ 3: place block or item (to abovesurface)
+ 4: use item
+ */
+ u8 action = readU8(is);
+ u16 item_i = readU16(is);
+ std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+ PointedThing pointed;
+ pointed.deSerialize(tmp_is);
+
+ infostream<<"TOSERVER_INTERACT: action="<<(int)action<<", item="<<item_i<<", pointed="<<pointed.dump()<<std::endl;
+
+ if(player->hp == 0)
+ {
+ infostream<<"TOSERVER_INTERACT: "<<srp->getName()
+ <<" tried to interact, but is dead!"<<std::endl;
+ return;
+ }
+
+ v3f player_pos = srp->m_last_good_position;
+
+ // Update wielded item
+ if(srp->getWieldIndex() != item_i)
+ {
+ srp->setWieldIndex(item_i);
+ SendWieldedItem(srp);
+ }
+
+ // Get pointed to node (undefined if not POINTEDTYPE_NODE)
+ v3s16 p_under = pointed.node_undersurface;
+ v3s16 p_above = pointed.node_abovesurface;
+
+ // Get pointed to object (NULL if not POINTEDTYPE_OBJECT)
+ ServerActiveObject *pointed_object = NULL;
+ if(pointed.type == POINTEDTHING_OBJECT)
+ {
+ pointed_object = m_env->getActiveObject(pointed.object_id);
+ if(pointed_object == NULL)
+ {
+ infostream<<"TOSERVER_INTERACT: "
+ "pointed object is NULL"<<std::endl;
+ return;
+ }
+
+ }
+
+ v3f pointed_pos_under = player_pos;
+ v3f pointed_pos_above = player_pos;
+ if(pointed.type == POINTEDTHING_NODE)
+ {
+ pointed_pos_under = intToFloat(p_under, BS);
+ pointed_pos_above = intToFloat(p_above, BS);
+ }
+ else if(pointed.type == POINTEDTHING_OBJECT)
+ {
+ pointed_pos_under = pointed_object->getBasePosition();
+ pointed_pos_above = pointed_pos_under;
+ }
+
+ /*
+ Check that target is reasonably close
+ (only when digging or placing things)
+ */
+ if(action == 0 || action == 2 || action == 3)
+ {
+ float d = player_pos.getDistanceFrom(pointed_pos_under);
+ float max_d = BS * 10; // Just some large enough value
+ if(d > max_d){
+ actionstream<<"Player "<<player->getName()
+ <<" tried to access "<<pointed.dump()
+ <<" from too far: "
+ <<"d="<<d<<", max_d="<<max_d
+ <<". ignoring."<<std::endl;
+ // Re-send block to revert change on client-side
+ RemoteClient *client = getClient(peer_id);
+ v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
+ client->SetBlockNotSent(blockpos);
+ // Do nothing else
+ return;
+ }
+ }
+
+ /*
+ Make sure the player is allowed to do it
+ */
+ if((getPlayerPrivs(player) & PRIV_INTERACT) == 0)
+ {
+ infostream<<"Ignoring interaction from player "<<player->getName()
+ <<" because privileges are "<<getPlayerPrivs(player)
+ <<std::endl;
+ return;
+ }
+
+ /*
+ 0: start digging or punch object
+ */
+ if(action == 0)
+ {
+ if(pointed.type == POINTEDTHING_NODE)
+ {
+ /*
+ NOTE: This can be used in the future to check if
+ somebody is cheating, by checking the timing.
+ */
+ MapNode n(CONTENT_IGNORE);
+ try
+ {
+ n = m_env->getMap().getNode(p_under);
+ }
+ catch(InvalidPositionException &e)
+ {
+ infostream<<"Server: Not punching: Node not found."
+ <<" Adding block to emerge queue."
+ <<std::endl;
+ m_emerge_queue.addBlock(peer_id,
+ getNodeBlockPos(p_above), BLOCK_EMERGE_FLAG_FROMDISK);
+ }
+ if(n.getContent() != CONTENT_IGNORE)
+ scriptapi_node_on_punch(m_lua, p_under, n, srp);
+ }
+ else if(pointed.type == POINTEDTHING_OBJECT)
+ {
+ // Skip if object has been removed
+ if(pointed_object->m_removed)
+ return;
+
+ actionstream<<player->getName()<<" punches object "
+ <<pointed.object_id<<std::endl;
+
+ // Do stuff
+ pointed_object->punch(srp, srp->m_time_from_last_punch);
+ srp->m_time_from_last_punch = 0;
+ }
+
+ } // action == 0
+
+ /*
+ 1: stop digging
+ */
+ else if(action == 1)
+ {
+ } // action == 1
+
+ /*
+ 2: Digging completed
+ */
+ else if(action == 2)
+ {
+ // Only complete digging of nodes
+ if(pointed.type == POINTEDTHING_NODE)
+ {
+ MapNode n(CONTENT_IGNORE);
+ try
+ {
+ n = m_env->getMap().getNode(p_under);
+ }
+ catch(InvalidPositionException &e)
+ {
+ infostream<<"Server: Not finishing digging: Node not found."
+ <<" Adding block to emerge queue."
+ <<std::endl;
+ m_emerge_queue.addBlock(peer_id,
+ getNodeBlockPos(p_above), BLOCK_EMERGE_FLAG_FROMDISK);
+ }
+ if(n.getContent() != CONTENT_IGNORE)
+ scriptapi_node_on_dig(m_lua, p_under, n, srp);
+ }
+ } // action == 2
+
+ /*
+ 3: place block or right-click object
+ */
+ else if(action == 3)
+ {
+ ItemStack item = srp->getWieldedItem();
+
+ // Reset build time counter
+ if(pointed.type == POINTEDTHING_NODE &&
+ item.getDefinition(m_itemdef).type == ITEM_NODE)
+ getClient(peer_id)->m_time_from_building = 0.0;
+
+ if(pointed.type == POINTEDTHING_OBJECT)
+ {
+ // Right click object
+
+ // Skip if object has been removed
+ if(pointed_object->m_removed)
+ return;
+
+ actionstream<<player->getName()<<" right-clicks object "
+ <<pointed.object_id<<std::endl;
+
+ // Do stuff
+ pointed_object->rightClick(srp);
+ }
+ else if(scriptapi_item_on_place(m_lua,
+ item, srp, pointed))
+ {
+ // Placement was handled in lua
+
+ // Apply returned ItemStack
+ if(g_settings->getBool("creative_mode") == false)
+ srp->setWieldedItem(item);
+ }
+
+ } // action == 3
+
+ /*
+ 4: use
+ */
+ else if(action == 4)
+ {
+ ItemStack item = srp->getWieldedItem();
+
+ actionstream<<player->getName()<<" uses "<<item.name
+ <<", pointing at "<<pointed.dump()<<std::endl;
+
+ if(scriptapi_item_on_use(m_lua,
+ item, srp, pointed))
+ {
+ // Apply returned ItemStack
+ if(g_settings->getBool("creative_mode") == false)
+ srp->setWieldedItem(item);
+ }
+
+ } // action == 4
+
+ /*
+ Catch invalid actions
+ */
+ else
+ {
+ infostream<<"WARNING: Server: Invalid action "
+ <<action<<std::endl;
+ }
+ }
else
{
- derr_server<<"WARNING: Server::ProcessData(): Ignoring "
+ infostream<<"Server::ProcessData(): Ignoring "
"unknown command "<<command<<std::endl;
}
} //try
catch(SendFailedException &e)
{
- derr_server<<"Server::ProcessData(): SendFailedException: "
+ errorstream<<"Server::ProcessData(): SendFailedException: "
<<"what="<<e.what()
<<std::endl;
}
void Server::onMapEditEvent(MapEditEvent *event)
{
- //dstream<<"Server::onMapEditEvent()"<<std::endl;
+ //infostream<<"Server::onMapEditEvent()"<<std::endl;
if(m_ignore_map_edit_events)
return;
MapEditEvent *e = event->clone();
m_unsent_map_edit_queue.push_back(e);
}
-Inventory* Server::getInventory(InventoryContext *c, std::string id)
+Inventory* Server::getInventory(const InventoryLocation &loc)
{
- if(id == "current_player")
+ switch(loc.type){
+ case InventoryLocation::UNDEFINED:
+ {}
+ break;
+ case InventoryLocation::CURRENT_PLAYER:
+ {}
+ break;
+ case InventoryLocation::PLAYER:
{
- assert(c->current_player);
- return &(c->current_player->inventory);
+ Player *player = m_env->getPlayer(loc.name.c_str());
+ if(!player)
+ return NULL;
+ return &player->inventory;
}
-
- Strfnd fn(id);
- std::string id0 = fn.next(":");
-
- if(id0 == "nodemeta")
+ break;
+ case InventoryLocation::NODEMETA:
{
- v3s16 p;
- p.X = stoi(fn.next(","));
- p.Y = stoi(fn.next(","));
- p.Z = stoi(fn.next(","));
- NodeMetadata *meta = m_env.getMap().getNodeMetadata(p);
- if(meta)
- return meta->getInventory();
- dstream<<"nodemeta at ("<<p.X<<","<<p.Y<<","<<p.Z<<"): "
- <<"no metadata found"<<std::endl;
- return NULL;
+ NodeMetadata *meta = m_env->getMap().getNodeMetadata(loc.p);
+ if(!meta)
+ return NULL;
+ return meta->getInventory();
+ }
+ break;
+ default:
+ assert(0);
}
-
- dstream<<__FUNCTION_NAME<<": unknown id "<<id<<std::endl;
return NULL;
}
-void Server::inventoryModified(InventoryContext *c, std::string id)
+std::string Server::getInventoryOwner(const InventoryLocation &loc)
{
- if(id == "current_player")
+ switch(loc.type){
+ case InventoryLocation::UNDEFINED:
+ {}
+ break;
+ case InventoryLocation::CURRENT_PLAYER:
+ {}
+ break;
+ case InventoryLocation::PLAYER:
{
- assert(c->current_player);
- // Send inventory
- UpdateCrafting(c->current_player->peer_id);
- SendInventory(c->current_player->peer_id);
- return;
+ return loc.name;
}
-
- Strfnd fn(id);
- std::string id0 = fn.next(":");
-
- if(id0 == "nodemeta")
+ break;
+ case InventoryLocation::NODEMETA:
{
- v3s16 p;
- p.X = stoi(fn.next(","));
- p.Y = stoi(fn.next(","));
- p.Z = stoi(fn.next(","));
- v3s16 blockpos = getNodeBlockPos(p);
+ NodeMetadata *meta = m_env->getMap().getNodeMetadata(loc.p);
+ if(!meta)
+ return "";
+ return meta->getOwner();
+ }
+ break;
+ default:
+ assert(0);
+ }
+ return "";
+}
+void Server::setInventoryModified(const InventoryLocation &loc)
+{
+ switch(loc.type){
+ case InventoryLocation::UNDEFINED:
+ {}
+ break;
+ case InventoryLocation::PLAYER:
+ {
+ ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>
+ (m_env->getPlayer(loc.name.c_str()));
+ if(!srp)
+ return;
+ srp->m_inventory_not_sent = true;
+ }
+ break;
+ case InventoryLocation::NODEMETA:
+ {
+ v3s16 blockpos = getNodeBlockPos(loc.p);
- NodeMetadata *meta = m_env.getMap().getNodeMetadata(p);
+ NodeMetadata *meta = m_env->getMap().getNodeMetadata(loc.p);
if(meta)
meta->inventoryModified();
-
- for(core::map<u16, RemoteClient*>::Iterator
- i = m_clients.getIterator();
- i.atEnd()==false; i++)
- {
- RemoteClient *client = i.getNode()->getValue();
- client->SetBlockNotSent(blockpos);
- }
-
- return;
+
+ MapBlock *block = m_env->getMap().getBlockNoCreateNoEx(blockpos);
+ if(block)
+ block->raiseModified(MOD_STATE_WRITE_NEEDED);
+
+ setBlockNotSent(blockpos);
+ }
+ break;
+ default:
+ assert(0);
}
-
- dstream<<__FUNCTION_NAME<<": unknown id "<<id<<std::endl;
}
core::list<PlayerInfo> Server::getPlayerInfo()
core::list<PlayerInfo> list;
- core::list<Player*> players = m_env.getPlayers();
+ core::list<Player*> players = m_env->getPlayers();
core::list<Player*>::Iterator i;
for(i = players.begin();
Player *player = *i;
try{
- con::Peer *peer = m_con.GetPeer(player->peer_id);
- // Copy info from peer to info struct
- info.id = peer->id;
- info.address = peer->address;
- info.avg_rtt = peer->avg_rtt;
+ // Copy info from connection to info struct
+ info.id = player->peer_id;
+ info.address = m_con.GetPeerAddress(player->peer_id);
+ info.avg_rtt = m_con.GetPeerAvgRTT(player->peer_id);
}
catch(con::PeerNotFoundException &e)
{
void Server::peerAdded(con::Peer *peer)
{
DSTACK(__FUNCTION_NAME);
- dout_server<<"Server::peerAdded(): peer->id="
+ infostream<<"Server::peerAdded(): peer->id="
<<peer->id<<std::endl;
PeerChange c;
void Server::deletingPeer(con::Peer *peer, bool timeout)
{
DSTACK(__FUNCTION_NAME);
- dout_server<<"Server::deletingPeer(): peer->id="
+ infostream<<"Server::deletingPeer(): peer->id="
<<peer->id<<", timeout="<<timeout<<std::endl;
PeerChange c;
con.Send(peer_id, 0, data, true);
}
-/*
- Non-static send methods
-*/
-
-void Server::SendObjectData(float dtime)
+void Server::SendDeathscreen(con::Connection &con, u16 peer_id,
+ bool set_camera_point_target, v3f camera_point_target)
{
DSTACK(__FUNCTION_NAME);
+ std::ostringstream os(std::ios_base::binary);
- core::map<v3s16, bool> stepped_blocks;
-
- for(core::map<u16, RemoteClient*>::Iterator
- i = m_clients.getIterator();
- i.atEnd() == false; i++)
- {
- u16 peer_id = i.getNode()->getKey();
- RemoteClient *client = i.getNode()->getValue();
- assert(client->peer_id == peer_id);
-
- if(client->serialization_version == SER_FMT_VER_INVALID)
- continue;
-
- client->SendObjectData(this, dtime, stepped_blocks);
- }
+ writeU16(os, TOCLIENT_DEATHSCREEN);
+ writeU8(os, set_camera_point_target);
+ writeV3F1000(os, camera_point_target);
+
+ // Make data buffer
+ std::string s = os.str();
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+ // Send as reliable
+ con.Send(peer_id, 0, data, true);
}
-void Server::SendPlayerInfos()
+void Server::SendItemDef(con::Connection &con, u16 peer_id,
+ IItemDefManager *itemdef)
{
DSTACK(__FUNCTION_NAME);
+ std::ostringstream os(std::ios_base::binary);
- //JMutexAutoLock envlock(m_env_mutex);
-
- // Get connected players
- core::list<Player*> players = m_env.getPlayers(true);
-
- u32 player_count = players.getSize();
- u32 datasize = 2+(2+PLAYERNAME_SIZE)*player_count;
+ /*
+ u16 command
+ u32 length of the next item
+ zlib-compressed serialized ItemDefManager
+ */
+ writeU16(os, TOCLIENT_ITEMDEF);
+ std::ostringstream tmp_os(std::ios::binary);
+ itemdef->serialize(tmp_os);
+ std::ostringstream tmp_os2(std::ios::binary);
+ compressZlib(tmp_os.str(), tmp_os2);
+ os<<serializeLongString(tmp_os2.str());
- SharedBuffer<u8> data(datasize);
- writeU16(&data[0], TOCLIENT_PLAYERINFO);
-
- u32 start = 2;
- core::list<Player*>::Iterator i;
- for(i = players.begin();
- i != players.end(); i++)
- {
- Player *player = *i;
+ // Make data buffer
+ std::string s = os.str();
+ infostream<<"Server::SendItemDef(): Sending item definitions: size="
+ <<s.size()<<std::endl;
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+ // Send as reliable
+ con.Send(peer_id, 0, data, true);
+}
- /*dstream<<"Server sending player info for player with "
- "peer_id="<<player->peer_id<<std::endl;*/
-
- writeU16(&data[start], player->peer_id);
- memset((char*)&data[start+2], 0, PLAYERNAME_SIZE);
- snprintf((char*)&data[start+2], PLAYERNAME_SIZE, "%s", player->getName());
- start += 2+PLAYERNAME_SIZE;
- }
+void Server::SendNodeDef(con::Connection &con, u16 peer_id,
+ INodeDefManager *nodedef)
+{
+ DSTACK(__FUNCTION_NAME);
+ std::ostringstream os(std::ios_base::binary);
- //JMutexAutoLock conlock(m_con_mutex);
+ /*
+ u16 command
+ u32 length of the next item
+ zlib-compressed serialized NodeDefManager
+ */
+ writeU16(os, TOCLIENT_NODEDEF);
+ std::ostringstream tmp_os(std::ios::binary);
+ nodedef->serialize(tmp_os);
+ std::ostringstream tmp_os2(std::ios::binary);
+ compressZlib(tmp_os.str(), tmp_os2);
+ os<<serializeLongString(tmp_os2.str());
+ // Make data buffer
+ std::string s = os.str();
+ infostream<<"Server::SendNodeDef(): Sending node definitions: size="
+ <<s.size()<<std::endl;
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
// Send as reliable
- m_con.SendToAll(0, data, true);
+ con.Send(peer_id, 0, data, true);
}
+/*
+ Non-static send methods
+*/
+
void Server::SendInventory(u16 peer_id)
{
DSTACK(__FUNCTION_NAME);
- Player* player = m_env.getPlayer(peer_id);
+ ServerRemotePlayer* player =
+ static_cast<ServerRemotePlayer*>(m_env->getPlayer(peer_id));
assert(player);
+ player->m_inventory_not_sent = false;
+
/*
Serialize it
*/
m_con.Send(peer_id, 0, data, true);
}
+void Server::SendWieldedItem(const ServerRemotePlayer* srp)
+{
+ DSTACK(__FUNCTION_NAME);
+
+ assert(srp);
+
+ std::ostringstream os(std::ios_base::binary);
+
+ writeU16(os, TOCLIENT_PLAYERITEM);
+ writeU16(os, 1);
+ writeU16(os, srp->peer_id);
+ os<<serializeString(srp->getWieldedItem().getItemString());
+
+ // Make data buffer
+ std::string s = os.str();
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+
+ m_con.SendToAll(0, data, true);
+}
+
+void Server::SendPlayerItems()
+{
+ DSTACK(__FUNCTION_NAME);
+
+ std::ostringstream os(std::ios_base::binary);
+ core::list<Player *> players = m_env->getPlayers(true);
+
+ writeU16(os, TOCLIENT_PLAYERITEM);
+ writeU16(os, players.size());
+ core::list<Player *>::Iterator i;
+ for(i = players.begin(); i != players.end(); ++i)
+ {
+ Player *p = *i;
+ ServerRemotePlayer *srp =
+ static_cast<ServerRemotePlayer*>(p);
+ writeU16(os, p->peer_id);
+ os<<serializeString(srp->getWieldedItem().getItemString());
+ }
+
+ // Make data buffer
+ std::string s = os.str();
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+
+ m_con.SendToAll(0, data, true);
+}
+
void Server::SendChatMessage(u16 peer_id, const std::wstring &message)
{
DSTACK(__FUNCTION_NAME);
void Server::SendPlayerHP(Player *player)
{
SendHP(m_con, player->peer_id, player->hp);
+ static_cast<ServerRemotePlayer*>(player)->m_hp_not_sent = false;
}
void Server::SendMovePlayer(Player *player)
v3f pos = player->getPosition();
f32 pitch = player->getPitch();
f32 yaw = player->getYaw();
- dstream<<"Server sending TOCLIENT_MOVE_PLAYER"
+ infostream<<"Server sending TOCLIENT_MOVE_PLAYER"
<<" pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"
<<" pitch="<<pitch
<<" yaw="<<yaw
if(far_players)
{
// Get player
- Player *player = m_env.getPlayer(client->peer_id);
+ Player *player = m_env->getPlayer(client->peer_id);
if(player)
{
// If player is far away, only set modified blocks not sent
if(far_players)
{
// Get player
- Player *player = m_env.getPlayer(client->peer_id);
+ Player *player = m_env->getPlayer(client->peer_id);
if(player)
{
// If player is far away, only set modified blocks not sent
}
// Print result
-
dstream<<"Server: Sending block ("<<p.X<<","<<p.Y<<","<<p.Z<<"): ";
+
infostream<<"Server: Sending block ("<<p.X<<","<<p.Y<<","<<p.Z<<"): ";
if(completely_air)
- dstream<<"[completely air] ";
- dstream<<std::endl;
+ infostream<<"[completely air] ";
+ infostream<<std::endl;
#endif
/*
*/
std::ostringstream os(std::ios_base::binary);
- block->serialize(os, ver);
+ block->serialize(os, ver, false);
std::string s = os.str();
SharedBuffer<u8> blockdata((u8*)s.c_str(), s.size());
writeS16(&reply[6], p.Z);
memcpy(&reply[8], *blockdata, blockdata.getSize());
- /*
dstream<<"Server: Sending block ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+ /*
infostream<<"Server: Sending block ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
<<": \tpacket size: "<<replysize<<std::endl;*/
/*
JMutexAutoLock envlock(m_env_mutex);
JMutexAutoLock conlock(m_con_mutex);
- //TimeTaker timer("Server::SendBlocks");
+ ScopeProfiler sp(g_profiler, "Server: sel and send blocks to clients");
core::array<PrioritySortedBlockTransfer> queue;
s32 total_sending = 0;
{
- ScopeProfiler sp(&g_profiler, "Server: selecting blocks for sending");
+ ScopeProfiler sp(g_profiler, "Server: selecting blocks for sending");
for(core::map<u16, RemoteClient*>::Iterator
i = m_clients.getIterator();
RemoteClient *client = i.getNode()->getValue();
assert(client->peer_id == i.getNode()->getKey());
+ // If definitions and textures have not been sent, don't
+ // send MapBlocks either
+ if(!client->definitions_sent)
+ continue;
+
total_sending += client->SendingCount();
if(client->serialization_version == SER_FMT_VER_INVALID)
for(u32 i=0; i<queue.size(); i++)
{
//TODO: Calculate limit dynamically
- if(total_sending >= g_settings.getS32
+ if(total_sending >= g_settings->getS32
("max_simultaneous_block_sends_server_total"))
break;
MapBlock *block = NULL;
try
{
- block = m_env.getMap().getBlockNoCreate(q.pos);
+ block = m_env->getMap().getBlockNoCreate(q.pos);
}
catch(InvalidPositionException &e)
{
}
}
-/*
- Something random
-*/
+void Server::PrepareTextures() {
+ DSTACK(__FUNCTION_NAME);
-void Server::UpdateCrafting(u16 peer_id)
-{
+ infostream<<"Server::PrepareTextures(): Calculate sha1 sums of textures"<<std::endl;
+
+ for(core::list<ModSpec>::Iterator i = m_mods.begin();
+ i != m_mods.end(); i++){
+ const ModSpec &mod = *i;
+ std::string texturepath = mod.path + DIR_DELIM + "textures";
+ std::vector<fs::DirListNode> dirlist = fs::GetDirListing(texturepath);
+ for(u32 j=0; j<dirlist.size(); j++){
+ if(dirlist[j].dir) // Ignode dirs
+ continue;
+ std::string tname = dirlist[j].name;
+ // if name contains illegal characters, ignore the texture
+ if(!string_allowed(tname, TEXTURENAME_ALLOWED_CHARS)){
+ errorstream<<"Server: ignoring illegal texture name: \""
+ <<tname<<"\""<<std::endl;
+ continue;
+ }
+ std::string tpath = texturepath + DIR_DELIM + tname;
+ // Read data
+ std::ifstream fis(tpath.c_str(), std::ios_base::binary);
+ if(fis.good() == false){
+ errorstream<<"Server::PrepareTextures(): Could not open \""
+ <<tname<<"\" for reading"<<std::endl;
+ continue;
+ }
+ std::ostringstream tmp_os(std::ios_base::binary);
+ bool bad = false;
+ for(;;){
+ char buf[1024];
+ fis.read(buf, 1024);
+ std::streamsize len = fis.gcount();
+ tmp_os.write(buf, len);
+ if(fis.eof())
+ break;
+ if(!fis.good()){
+ bad = true;
+ break;
+ }
+ }
+ if(bad){
+ errorstream<<"Server::PrepareTextures(): Failed to read \""
+ <<tname<<"\""<<std::endl;
+ continue;
+ }
+ if(tmp_os.str().length() == 0){
+ errorstream<<"Server::PrepareTextures(): Empty file \""
+ <<tpath<<"\""<<std::endl;
+ continue;
+ }
+
+ SHA1 sha1;
+ sha1.addBytes(tmp_os.str().c_str(), tmp_os.str().length());
+
+ unsigned char *digest = sha1.getDigest();
+ std::string digest_string = base64_encode(digest, 20);
+
+ free(digest);
+
+ // Put in list
+ this->m_Textures[tname] = TextureInformation(tpath,digest_string);
+ infostream<<"Server::PrepareTextures(): added sha1 for "<< tname <<std::endl;
+ }
+ }
+}
+
+struct SendableTextureAnnouncement
+ {
+ std::string name;
+ std::string sha1_digest;
+
+ SendableTextureAnnouncement(const std::string name_="",
+ const std::string sha1_digest_=""):
+ name(name_),
+ sha1_digest(sha1_digest_)
+ {
+ }
+ };
+
+void Server::SendTextureAnnouncement(u16 peer_id){
DSTACK(__FUNCTION_NAME);
-
- Player* player = m_env.getPlayer(peer_id);
- assert(player);
+
+ infostream<<"Server::SendTextureAnnouncement()"<<std::endl;
+
+ core::list<SendableTextureAnnouncement> texture_announcements;
+
+ for (std::map<std::string,TextureInformation>::iterator i = m_Textures.begin();i != m_Textures.end(); i++ ) {
+
+ // Put in list
+ texture_announcements.push_back(
+ SendableTextureAnnouncement(i->first, i->second.sha1_digest));
+ }
+
+ //send announcements
/*
- Calculate crafting stuff
+ u16 command
+ u32 number of textures
+ for each texture {
+ u16 length of name
+ string name
+ u16 length of digest string
+ string sha1_digest
+ }
*/
- if(g_settings.getBool("creative_mode") == false)
- {
- InventoryList *clist = player->inventory.getList("craft");
- InventoryList *rlist = player->inventory.getList("craftresult");
+ std::ostringstream os(std::ios_base::binary);
- if(rlist->getUsedSlots() == 0)
- player->craftresult_is_preview = true;
+ writeU16(os, TOCLIENT_ANNOUNCE_TEXTURES);
+ writeU16(os, texture_announcements.size());
- if(rlist && player->craftresult_is_preview)
- {
- rlist->clearItems();
+ for(core::list<SendableTextureAnnouncement>::Iterator
+ j = texture_announcements.begin();
+ j != texture_announcements.end(); j++){
+ os<<serializeString(j->name);
+ os<<serializeString(j->sha1_digest);
+ }
+
+ // Make data buffer
+ std::string s = os.str();
+ infostream<<"Server::SendTextureAnnouncement(): Send to client"<<std::endl;
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+
+ // Send as reliable
+ m_con.Send(peer_id, 0, data, true);
+
+}
+
+struct SendableTexture
+{
+ std::string name;
+ std::string path;
+ std::string data;
+
+ SendableTexture(const std::string &name_="", const std::string path_="",
+ const std::string &data_=""):
+ name(name_),
+ path(path_),
+ data(data_)
+ {}
+};
+
+void Server::SendTexturesRequested(u16 peer_id,core::list<TextureRequest> tosend) {
+ DSTACK(__FUNCTION_NAME);
+
+ infostream<<"Server::SendTexturesRequested(): Sending textures to client"<<std::endl;
+
+ /* Read textures */
+
+ // Put 5kB in one bunch (this is not accurate)
+ u32 bytes_per_bunch = 5000;
+
+ core::array< core::list<SendableTexture> > texture_bunches;
+ texture_bunches.push_back(core::list<SendableTexture>());
+
+ u32 texture_size_bunch_total = 0;
+
+ for(core::list<TextureRequest>::Iterator i = tosend.begin(); i != tosend.end(); i++) {
+ if(m_Textures.find(i->name) == m_Textures.end()){
+ errorstream<<"Server::SendTexturesRequested(): Client asked for "
+ <<"unknown texture \""<<(i->name)<<"\""<<std::endl;
+ continue;
+ }
+
+ //TODO get path + name
+ std::string tpath = m_Textures[(*i).name].path;
+
+ // Read data
+ std::ifstream fis(tpath.c_str(), std::ios_base::binary);
+ if(fis.good() == false){
+ errorstream<<"Server::SendTexturesRequested(): Could not open \""
+ <<tpath<<"\" for reading"<<std::endl;
+ continue;
+ }
+ std::ostringstream tmp_os(std::ios_base::binary);
+ bool bad = false;
+ for(;;){
+ char buf[1024];
+ fis.read(buf, 1024);
+ std::streamsize len = fis.gcount();
+ tmp_os.write(buf, len);
+ texture_size_bunch_total += len;
+ if(fis.eof())
+ break;
+ if(!fis.good()){
+ bad = true;
+ break;
+ }
+ }
+ if(bad){
+ errorstream<<"Server::SendTexturesRequested(): Failed to read \""
+ <<(*i).name<<"\""<<std::endl;
+ continue;
}
- if(clist && rlist && player->craftresult_is_preview)
+ /*infostream<<"Server::SendTexturesRequested(): Loaded \""
+ <<tname<<"\""<<std::endl;*/
+ // Put in list
+ texture_bunches[texture_bunches.size()-1].push_back(
+ SendableTexture((*i).name, tpath, tmp_os.str()));
+
+ // Start next bunch if got enough data
+ if(texture_size_bunch_total >= bytes_per_bunch){
+ texture_bunches.push_back(core::list<SendableTexture>());
+ texture_size_bunch_total = 0;
+ }
+
+ }
+
+ /* Create and send packets */
+
+ u32 num_bunches = texture_bunches.size();
+ for(u32 i=0; i<num_bunches; i++)
{
- InventoryItem *items[9];
- for(u16 i=0; i<9; i++)
- {
- items[i] = clist->getItem(i);
+ /*
+ u16 command
+ u16 total number of texture bunches
+ u16 index of this bunch
+ u32 number of textures in this bunch
+ for each texture {
+ u16 length of name
+ string name
+ u32 length of data
+ data
+ }
+ */
+ std::ostringstream os(std::ios_base::binary);
+
+ writeU16(os, TOCLIENT_TEXTURES);
+ writeU16(os, num_bunches);
+ writeU16(os, i);
+ writeU32(os, texture_bunches[i].size());
+
+ for(core::list<SendableTexture>::Iterator
+ j = texture_bunches[i].begin();
+ j != texture_bunches[i].end(); j++){
+ os<<serializeString(j->name);
+ os<<serializeLongString(j->data);
}
-
- // Get result of crafting grid
- InventoryItem *result = craft_get_result(items);
- if(result)
- rlist->addItem(result);
+
+ // Make data buffer
+ std::string s = os.str();
+ infostream<<"Server::SendTexturesRequested(): bunch "<<i<<"/"<<num_bunches
+ <<" textures="<<texture_bunches[i].size()
+ <<" size=" <<s.size()<<std::endl;
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+ // Send as reliable
+ m_con.Send(peer_id, 0, data, true);
}
+
+
+}
+
+/*
+ Something random
+*/
+
+void Server::DiePlayer(Player *player)
+{
+ ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(player);
+
+ infostream<<"Server::DiePlayer(): Player "
+ <<player->getName()<<" dies"<<std::endl;
+
+ srp->setHP(0);
+
+ // Trigger scripted stuff
+ scriptapi_on_dieplayer(m_lua, srp);
- } // if creative_mode == false
+ // Handle players that are not connected
+ if(player->peer_id == PEER_ID_INEXISTENT){
+ RespawnPlayer(player);
+ return;
+ }
+
+ SendPlayerHP(player);
+ SendDeathscreen(m_con, player->peer_id, false, v3f(0,0,0));
+}
+
+void Server::RespawnPlayer(Player *player)
+{
+ ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(player);
+ srp->setHP(20);
+ bool repositioned = scriptapi_on_respawnplayer(m_lua, srp);
+ if(!repositioned){
+ v3f pos = findSpawnPos(m_env->getServerMap());
+ player->setPosition(pos);
+ srp->m_last_good_position = pos;
+ srp->m_last_good_position_age = 0;
+ }
+ SendMovePlayer(player);
+ SendPlayerHP(player);
+}
+
+void Server::UpdateCrafting(u16 peer_id)
+{
+ DSTACK(__FUNCTION_NAME);
+
+ Player* player = m_env->getPlayer(peer_id);
+ assert(player);
+
+ // Get a preview for crafting
+ ItemStack preview;
+ // No crafting in creative mode
+ if(g_settings->getBool("creative_mode") == false)
+ getCraftingResult(&player->inventory, preview, false, this);
+
+ // Put the new preview in
+ InventoryList *plist = player->inventory.getList("craftpreview");
+ assert(plist);
+ assert(plist->getSize() >= 1);
+ plist->changeItem(0, preview);
}
RemoteClient* Server::getClient(u16 peer_id)
if(client->serialization_version == SER_FMT_VER_INVALID)
continue;
// Get player
- Player *player = m_env.getPlayer(client->peer_id);
+ Player *player = m_env->getPlayer(client->peer_id);
// Get name of player
std::wstring name = L"unknown";
if(player != NULL)
os<<name<<L",";
}
os<<L"}";
- if(((ServerMap*)(&m_env.getMap()))->isSavingEnabled() == false)
+ if(((ServerMap*)(&m_env->getMap()))->isSavingEnabled() == false)
os<<std::endl<<L"# Server: "<<" WARNING: Map saving is disabled.";
- if(g_settings.get("motd") != "")
- os<<std::endl<<L"# Server: "<<narrow_to_wide(g_settings.get("motd"));
+ if(g_settings->get("motd") != "")
+ os<<std::endl<<L"# Server: "<<narrow_to_wide(g_settings->get("motd"));
return os.str();
}
+void Server::setPlayerPassword(const std::string &name, const std::wstring &password)
+{
+ // Add player to auth manager
+ if(m_authmanager.exists(name) == false)
+ {
+ infostream<<"Server: adding player "<<name
+ <<" to auth manager"<<std::endl;
+ m_authmanager.add(name);
+ m_authmanager.setPrivs(name,
+ stringToPrivs(g_settings->get("default_privs")));
+ }
+ // Change password and save
+ m_authmanager.setPassword(name, translatePassword(name, password));
+ m_authmanager.save();
+}
+
+// Saves g_settings to configpath given at initialization
+void Server::saveConfig()
+{
+ if(m_configpath != "")
+ g_settings->updateConfigFile(m_configpath.c_str());
+}
+
+void Server::notifyPlayer(const char *name, const std::wstring msg)
+{
+ Player *player = m_env->getPlayer(name);
+ if(!player)
+ return;
+ SendChatMessage(player->peer_id, std::wstring(L"Server: -!- ")+msg);
+}
+
+void Server::notifyPlayers(const std::wstring msg)
+{
+ BroadcastChatMessage(msg);
+}
+
+void Server::queueBlockEmerge(v3s16 blockpos, bool allow_generate)
+{
+ u8 flags = 0;
+ if(!allow_generate)
+ flags |= BLOCK_EMERGE_FLAG_FROMDISK;
+ m_emerge_queue.addBlock(PEER_ID_INEXISTENT, blockpos, flags);
+}
+
+// IGameDef interface
+// Under envlock
+IItemDefManager* Server::getItemDefManager()
+{
+ return m_itemdef;
+}
+INodeDefManager* Server::getNodeDefManager()
+{
+ return m_nodedef;
+}
+ICraftDefManager* Server::getCraftDefManager()
+{
+ return m_craftdef;
+}
+ITextureSource* Server::getTextureSource()
+{
+ return NULL;
+}
+u16 Server::allocateUnknownNodeId(const std::string &name)
+{
+ return m_nodedef->allocateDummy(name);
+}
+
+IWritableItemDefManager* Server::getWritableItemDefManager()
+{
+ return m_itemdef;
+}
+IWritableNodeDefManager* Server::getWritableNodeDefManager()
+{
+ return m_nodedef;
+}
+IWritableCraftDefManager* Server::getWritableCraftDefManager()
+{
+ return m_craftdef;
+}
+
+const ModSpec* Server::getModSpec(const std::string &modname)
+{
+ for(core::list<ModSpec>::Iterator i = m_mods.begin();
+ i != m_mods.end(); i++){
+ const ModSpec &mod = *i;
+ if(mod.name == modname)
+ return &mod;
+ }
+ return NULL;
+}
+
v3f findSpawnPos(ServerMap &map)
{
//return v3f(50,50,50)*BS;
- v2s16 nodepos;
- s16 groundheight = 0;
+ v3s16 nodepos;
#if 0
nodepos = v2s16(0,0);
{
s32 range = 1 + i;
// We're going to try to throw the player to this position
- nodepos = v2s16(-range + (myrand()%(range*2)),
+ v2s16 nodepos2d = v2s16(-range + (myrand()%(range*2)),
-range + (myrand()%(range*2)));
- v2s16 sectorpos = getNodeSectorPos(nodepos);
- // Get sector (NOTE: Don't get because it's slow)
- //m_env.getMap().emergeSector(sectorpos);
+ //v2s16 sectorpos = getNodeSectorPos(nodepos2d);
// Get ground height at point (fallbacks to heightmap function)
- groundheight = map.findGroundLevel(nodepos);
+ s16 groundheight = map.findGroundLevel(nodepos2d);
// Don't go underwater
if(groundheight < WATER_LEVEL)
{
- //dstream<<"-> Underwater"<<std::endl;
+ //infostream<<"-> Underwater"<<std::endl;
continue;
}
// Don't go to high places
if(groundheight > WATER_LEVEL + 4)
{
- //dstream<<"-> Underwater"<<std::endl;
+ //infostream<<"-> Underwater"<<std::endl;
continue;
}
-
- // Found a good place
- //dstream<<"Searched through "<<i<<" places."<<std::endl;
- break;
+
+ nodepos = v3s16(nodepos2d.X, groundheight-2, nodepos2d.Y);
+ bool is_good = false;
+ s32 air_count = 0;
+ for(s32 i=0; i<10; i++){
+ v3s16 blockpos = getNodeBlockPos(nodepos);
+ map.emergeBlock(blockpos, true);
+ MapNode n = map.getNodeNoEx(nodepos);
+ if(n.getContent() == CONTENT_AIR){
+ air_count++;
+ if(air_count >= 2){
+ is_good = true;
+ nodepos.Y -= 1;
+ break;
+ }
+ }
+ nodepos.Y++;
+ }
+ if(is_good){
+ // Found a good place
+ //infostream<<"Searched through "<<i<<" places."<<std::endl;
+ break;
+ }
}
#endif
- // If no suitable place was not found, go above water at least.
- if(groundheight < WATER_LEVEL)
- groundheight = WATER_LEVEL;
-
- return intToFloat(v3s16(
- nodepos.X,
- groundheight + 3,
- nodepos.Y
- ), BS);
+ return intToFloat(nodepos, BS);
}
-Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id)
+ServerRemotePlayer *Server::emergePlayer(const char *name, u16 peer_id)
{
/*
Try to get an existing player
*/
- Player *player = m_env.getPlayer(name);
+ ServerRemotePlayer *player =
+ static_cast<ServerRemotePlayer*>(m_env->getPlayer(name));
if(player != NULL)
{
// If player is already connected, cancel
if(player->peer_id != 0)
{
- dstream<<"emergePlayer(): Player already connected"<<std::endl;
+ infostream<<"emergePlayer(): Player already connected"<<std::endl;
return NULL;
}
// Got one.
player->peer_id = peer_id;
+ // Re-add player to environment
+ if(player->m_removed)
+ {
+ player->m_removed = false;
+ player->setId(0);
+ m_env->addActiveObject(player);
+ }
+
// Reset inventory to creative if in creative mode
- if(g_settings.getBool("creative_mode"))
+ if(g_settings->getBool("creative_mode"))
{
- craft_set_creative_inventory(player);
+ // Warning: double code below
+ // Backup actual inventory
+ player->inventory_backup = new Inventory(m_itemdef);
+ *(player->inventory_backup) = player->inventory;
+ // Set creative inventory
+ player->resetInventory();
+ scriptapi_get_creative_inventory(m_lua, player);
}
return player;
/*
If player with the wanted peer_id already exists, cancel.
*/
- if(m_env.getPlayer(peer_id) != NULL)
+ if(m_env->getPlayer(peer_id) != NULL)
{
- dstream<<"emergePlayer(): Player with wrong name but same"
+ infostream<<"emergePlayer(): Player with wrong name but same"
" peer_id already exists"<<std::endl;
return NULL;
}
Create a new player
*/
{
- player = new ServerRemotePlayer();
- //player->peer_id = c.peer_id;
- //player->peer_id = PEER_ID_INEXISTENT;
- player->peer_id = peer_id;
- player->updateName(name);
- m_authmanager.add(name);
- m_authmanager.setPassword(name, password);
- m_authmanager.setPrivs(name,
- stringToPrivs(g_settings.get("default_privs")));
-
- /*
- Set player position
- */
+ /* Set player position */
- dstream<<"Server: Finding spawn place for player \""
- <<player->getName()<<"\""<<std::endl;
+ infostream<<"Server: Finding spawn place for player \""
+ <<name<<"\""<<std::endl;
- v3f pos = findSpawnPos(m_env.getServerMap());
+ v3f pos = findSpawnPos(m_env->getServerMap());
- player->setPosition(pos);
+ player = new ServerRemotePlayer(m_env, pos, peer_id, name);
+ ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(player);
- /*
- Add player to environment
- */
+ /* Add player to environment */
+ m_env->addPlayer(player);
+ m_env->addActiveObject(srp);
- m_env.addPlayer(player);
+ /* Run scripts */
+ scriptapi_on_newplayer(m_lua, srp);
- /*
- Add stuff to inventory
- */
-
- if(g_settings.getBool("creative_mode"))
- {
- craft_set_creative_inventory(player);
- }
- else if(g_settings.getBool("give_initial_stuff"))
+ /* Add stuff to inventory */
+ if(g_settings->getBool("creative_mode"))
{
- craft_give_initial_stuff(player);
+ // Warning: double code above
+ // Backup actual inventory
+ player->inventory_backup = new Inventory(m_itemdef);
+ *(player->inventory_backup) = player->inventory;
+ // Set creative inventory
+ player->resetInventory();
+ scriptapi_get_creative_inventory(m_lua, player);
}
return player;
{
// Get object
u16 id = i.getNode()->getKey();
- ServerActiveObject* obj = m_env.getActiveObject(id);
+ ServerActiveObject* obj = m_env->getActiveObject(id);
if(obj && obj->m_known_by_count > 0)
obj->m_known_by_count--;
}
+ ServerRemotePlayer* player =
+ static_cast<ServerRemotePlayer*>(m_env->getPlayer(c.peer_id));
+
// Collect information about leaving in chat
std::wstring message;
{
- std::wstring name = L"unknown";
- Player *player = m_env.getPlayer(c.peer_id);
if(player != NULL)
- name = narrow_to_wide(player->getName());
-
- message += L"*** ";
- message += name;
- message += L" left game";
- if(c.timeout)
- message += L" (timed out)";
+ {
+ std::wstring name = narrow_to_wide(player->getName());
+ message += L"*** ";
+ message += name;
+ message += L" left game";
+ if(c.timeout)
+ message += L" (timed out)";
+ }
}
-
- /*// Delete player
- {
- m_env.removePlayer(c.peer_id);
- }*/
-
+
+ // Remove from environment
+ if(player != NULL)
+ player->m_removed = true;
+
// Set player client disconnected
+ if(player != NULL)
+ player->peer_id = 0;
+
+ /*
+ Print out action
+ */
{
- Player *player = m_env.getPlayer(c.peer_id);
if(player != NULL)
- player->peer_id = 0;
+ {
+ std::ostringstream os(std::ios_base::binary);
+ for(core::map<u16, RemoteClient*>::Iterator
+ i = m_clients.getIterator();
+ i.atEnd() == false; i++)
+ {
+ RemoteClient *client = i.getNode()->getValue();
+ assert(client->peer_id == i.getNode()->getKey());
+ if(client->serialization_version == SER_FMT_VER_INVALID)
+ continue;
+ // Get player
+ Player *player = m_env->getPlayer(client->peer_id);
+ if(!player)
+ continue;
+ // Get name of player
+ os<<player->getName()<<" ";
+ }
+
+ actionstream<<player->getName()<<" "
+ <<(c.timeout?"times out.":"leaves game.")
+ <<" List of players: "
+ <<os.str()<<std::endl;
+ }
}
// Delete client
m_clients.remove(c.peer_id);
// Send player info to all remaining clients
- SendPlayerInfos();
+ //SendPlayerInfos();
// Send leave chat message to all remaining clients
- BroadcastChatMessage(message);
+ if(message.length() != 0)
+ BroadcastChatMessage(message);
} // PEER_REMOVED
else
{
PeerChange c = m_peer_change_queue.pop_front();
- dout_server<<"Server: Handling peer change: "
+ infostream<<"Server: Handling peer change: "
<<"id="<<c.peer_id<<", timeout="<<c.timeout
<<std::endl;
std::string playername = player->getName();
// Local player gets all privileges regardless of
// what's set on their account.
- if(g_settings.get("name") == playername)
+ if(g_settings->get("name") == playername)
{
return PRIV_ALL;
}
{
DSTACK(__FUNCTION_NAME);
- dstream<<DTIME<<std::endl;
- dstream<<"========================"<<std::endl;
- dstream<<"Running dedicated server"<<std::endl;
- dstream<<"========================"<<std::endl;
- dstream<<std::endl;
+ infostream<<DTIME<<std::endl;
+ infostream<<"========================"<<std::endl;
+ infostream<<"Running dedicated server"<<std::endl;
+ infostream<<"========================"<<std::endl;
+ infostream<<std::endl;
IntervalLimiter m_profiler_interval;
for(;;)
{
+ float steplen = g_settings->getFloat("dedicated_server_step");
// This is kind of a hack but can be done like this
// because server.step() is very light
{
- ScopeProfiler sp(&g_profiler, "dedicated server sleep");
- sleep_ms(30);
+ ScopeProfiler sp(g_profiler, "dedicated server sleep");
+ sleep_ms((int)(steplen*1000.0));
}
- server.step(0.030);
+ server.step(steplen);
if(server.getShutdownRequested() || kill)
{
- dstream<<DTIME<<" dedicated_server_loop(): Quitting."<<std::endl;
+ infostream<<DTIME<<" dedicated_server_loop(): Quitting."<<std::endl;
break;
}
Profiler
*/
float profiler_print_interval =
- g_settings.getFloat("profiler_print_interval");
+ g_settings->getFloat("profiler_print_interval");
if(profiler_print_interval != 0)
{
- if(m_profiler_interval.step(0.030, profiler_print_interval))
+ if(m_profiler_interval.step(steplen, profiler_print_interval))
{
- dstream<<"Profiler:"<<std::endl;
- g_profiler.print(dstream);
- g_profiler.clear();
+ infostream<<"Profiler:"<<std::endl;
+ g_profiler->print(infostream);
+ g_profiler->clear();
}
}
u32 sum = PIChecksum(list);
if(sum != sum_old)
{
- dstream<<DTIME<<"Player info:"<<std::endl;
+ infostream<<DTIME<<"Player info:"<<std::endl;
for(i=list.begin(); i!=list.end(); i++)
{
- i->PrintLine(&dstream);
+ i->PrintLine(&infostream);
}
}
sum_old = sum;
projects / dragonfireclient.git / blobdiff