RepoMirrors
/
basin
mirror of https://github.com/basinserver/basin/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:Protryon/Basin

This commit is contained in:
ecx86 2016-12-30 05:08:35 -05:00
parent 40be494920 c23b8647c9
commit 8083440bf4
8 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basin/Debug/main.cfg
View File

@ -24,5 +24,3 @@ allow-flight = false
difficulty = 1
pvp = true
world = world/
world-nether = world_nether/
world-the-end = world_the_end/

1
basin/src/entity.c
View File

@ -453,6 +453,7 @@ struct entity* newEntity(int32_t id, float x, float y, float z, uint8_t type, fl
e->world = NULL;
e->inWater = 0;
e->inLava = 0;
e->invincibilityTicks = 0;
e->loadingPlayers = new_collection(0, 0);
memset(&e->data, 0, sizeof(union entity_data));
return e;

55
basin/src/game.c
View File

@ -625,7 +625,6 @@ void player_receive_packet(struct player* player, struct packet* inp) {
player->entity->lyaw = player->entity->yaw;
player->entity->lpitch = player->entity->pitch;
if (moveEntity(player->entity, inp->data.play_server.playerposition.x - lx, inp->data.play_server.playerposition.feet_y - ly, inp->data.play_server.playerposition.z - lz)) {
printf("rst1\n");
teleportPlayer(player, lx, ly, lz);
} else {
player->entity->lx = lx;
@ -659,7 +658,6 @@ void player_receive_packet(struct player* player, struct packet* inp) {
BEGIN_BROADCAST(player->entity->loadingPlayers)
sendEntityMove(bc_player, player->entity);
END_BROADCAST
} else if (inp->id == PKT_PLAY_SERVER_PLAYERPOSITIONANDLOOK) {
player->tps++;
double lx = player->entity->x;
@ -668,7 +666,6 @@ void player_receive_packet(struct player* player, struct packet* inp) {
player->entity->lyaw = player->entity->yaw;
player->entity->lpitch = player->entity->pitch;
if (moveEntity(player->entity, inp->data.play_server.playerpositionandlook.x - lx, inp->data.play_server.playerpositionandlook.feet_y - ly, inp->data.play_server.playerpositionandlook.z - lz)) {
printf("rst2\n");
teleportPlayer(player, lx, ly, lz);
} else {
player->entity->lx = lx;
@ -825,13 +822,41 @@ void player_receive_packet(struct player* player, struct packet* inp) {
struct block_info* bi2 = getBlockInfo(b2);
if (b2 == 0 || bi2 == NULL || bi2->material->replacable) {
block tbb = (ci->item << 4) | (ci->damage & 0x0f);
if (getBlockInfo(tbb)->onBlockPlaced != NULL) tbb = (*getBlockInfo(tbb)->onBlockPlaced)(player->world, tbb, x, y, z);
setBlockWorld(player->world, tbb, x, y, z);
if (player->gamemode != 1) {
if (--ci->itemCount <= 0) {
ci = NULL;
struct block_info* tbi = getBlockInfo(tbb);
if (tbi == NULL) goto cont;
struct boundingbox pbb;
int bad = 0;
for (size_t x = 0; x < player->world->entities->size; x++) {
struct entity* ent = player->world->entities->data[x];
if (ent == NULL || entity_distsq_block(ent, x, y, z) > 8. * 8. || !isLiving(ent)) continue;
getEntityCollision(ent, &pbb);
for (size_t i = 0; i < tbi->boundingBox_count; i++) {
struct boundingbox* bb = &tbi->boundingBoxes[i];
if (bb == NULL) continue;
struct boundingbox abb;
abb.minX = bb->minX + x;
abb.maxX = bb->maxX + x;
abb.minY = bb->minY + y;
abb.maxY = bb->maxY + y;
abb.minZ = bb->minZ + z;
abb.maxZ = bb->maxZ + z;
if (boundingbox_intersects(&abb, &pbb)) {
bad = 1;
break;
}
}
setSlot(player, player->inventory, 36 + player->currentItem, ci, 1, 1);
}
if (!bad) {
if (getBlockInfo(tbb)->onBlockPlaced != NULL) tbb = (*getBlockInfo(tbb)->onBlockPlaced)(player->world, tbb, x, y, z);
setBlockWorld(player->world, tbb, x, y, z);
if (player->gamemode != 1) {
if (--ci->itemCount <= 0) {
ci = NULL;
}
setSlot(player, player->inventory, 36 + player->currentItem, ci, 1, 1);
}
} else {
setBlockWorld(player->world, b2, x, y, z);
}
} else {
setBlockWorld(player->world, b2, x, y, z);
@ -1333,10 +1358,12 @@ void tick_player(struct world* world, struct player* player) {
add_queue(player->outgoingPacket, pkt);
flush_outgoing(player);
}
if (player->lastTPSCalculation + 20 <= tick_counter) {
float time = (float) (tick_counter - player->lastTPSCalculation) * 50. / 1000.;
player->lastTPSCalculation = tick_counter;
//printf("%i, %f\n", player->tps, time);
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
double ct = (double) ts.tv_nsec / 1000000. + (double) ts.tv_sec * 1000.;
if (player->lastTPSCalculation + 1000. <= ct) {
float time = (float) (ct - player->lastTPSCalculation) / 1000.;
player->lastTPSCalculation = ct;
if ((float) player->tps / 20. > (time + .25)) {
kickPlayer(player, "Ticks Per Second Too High! (FastHeal, Teleport, or Lag?)");
return;
@ -1664,7 +1691,7 @@ void tick_entity(struct world* world, struct entity* entity) {
entity->fallDistance += dy;
}
} else if (entity->fallDistance > 0.) {
if (entity->fallDistance > 4. && !entity->inWater && !entity->inLava) {
if (entity->fallDistance > 3. && !entity->inWater && !entity->inLava) {
damageEntity(entity, entity->fallDistance - 3., 0);
playSound(entity->world, 312, 8, entity->x, entity->y, entity->z, 1., 1.);
}

1
basin/src/json.c
View File

@ -207,6 +207,7 @@ void freeJSON(struct json_object* root) {
for (size_t i = 0; i < root->child_count; i++) {
if (root->children[i] != NULL) {
freeJSON(root->children[i]);
xfree(root->children[i]);
root->children[i] = NULL;
}
}

24
basin/src/main.c
View File

@ -327,30 +327,16 @@ int main(int argc, char* argv[]) {
close (sfd);
continue;
}
const char* neth = getConfigValue(serv, "world-nether");
if (ovr == NULL) {
if (serv->id != NULL) errlog(delog, "No world-nether defined for server: %s", serv->id);
else errlog(delog, "No world-nether defined for server");
close (sfd);
continue;
}
const char* ed = getConfigValue(serv, "world-the-end");
if (ovr == NULL) {
if (serv->id != NULL) errlog(delog, "No world-the-end defined for server: %s", serv->id);
else errlog(delog, "No world-the-end defined for server");
close (sfd);
continue;
}
overworld = newWorld();
loadWorld(overworld, ovr);
nether = newWorld();
loadWorld(nether, neth);
endworld = newWorld();
loadWorld(endworld, ed);
//loadWorld(nether, neth);
//endworld = newWorld();
//loadWorld(endworld, ed);
worlds = new_collection(0, 1);
add_collection(worlds, overworld);
add_collection(worlds, nether);
add_collection(worlds, endworld);
//add_collection(worlds, nether);
//add_collection(worlds, endworld);
struct accept_param* ap = xmalloc(sizeof(struct accept_param));
ap->port = port;
ap->server_fd = sfd;

4
basin/src/player.c
View File

@ -69,7 +69,9 @@ struct player* newPlayer(struct entity* entity, char* name, struct uuid uuid, st
player->lastSwing = tick_counter;
player->foodTimer = 0;
player->tps = 0;
player->lastTPSCalculation = tick_counter;
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
player->lastTPSCalculation = (double) ts.tv_nsec / 1000000. + (double) ts.tv_sec * 1000.;
player->real_onGround = 1;
player->reachDistance = 6.;
player->flightInfraction = 0;

2
basin/src/player.h
View File

@ -52,7 +52,7 @@ struct player {
struct slot* inHand;
size_t lastSwing;
uint8_t foodTimer;
size_t lastTPSCalculation;
double lastTPSCalculation;
uint32_t tps;
uint8_t real_onGround;
float reachDistance;

7
basin/src/world.c
View File

@ -438,6 +438,7 @@ void freeChunk(struct chunk* chunk) {
if (cs->blocks != NULL) xfree(cs->blocks);
if (cs->palette != NULL) xfree(cs->palette);
if (cs->skyLight != NULL) xfree(cs->skyLight);
xfree(cs);
}
for (size_t i = 0; i < chunk->tileEntities->size; i++) {
if (chunk->tileEntities->data[i] != NULL) {
@ -673,8 +674,10 @@ void despawnPlayer(struct world* world, struct player* player) {
}
for (size_t i = 0; i < player->loadedChunks->size; i++) {
struct chunk* pl = (struct chunk*) player->loadedChunks->data[i];
if (pl == NULL || pl == player->entity) continue;
pl->playersLoaded--;
if (pl == NULL) continue;
if (--pl->playersLoaded == 0) {
unloadChunk(player->world, pl);
}
player->loadedChunks->data[i] = NULL;
player->loadedChunks->count--;
}