Merge branch 'Custom-Horion' of https://github.com/N0tExisting/Horion …

…into Custom-Horion
N0tExisting · Dec 17, 2020 · cfcbfa1 · cfcbfa1
2 parents a092b9e + b691eb8
commit cfcbfa1
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/Horion/Module/Modules/Jesus.cpp b/Horion/Module/Modules/Jesus.cpp
@@ -17,16 +17,32 @@ void Jesus::onTick(C_GameMode* gm) {
 	if (gm->player->isSneaking())
 		return;
 	if (Solid) {
-		if (gm->player->isOnFire())
-			gm->player->setOnFire(-1);
-		if (gm->player->isOnFire()) return;
+		if (gm->player->isOnFire()) {
+			gm->player->setOnFire(0);
+			g_Data.getLocalPlayer()->setOnFire(0);
+		}
+		if (gm->player->isOnFire() && (gm->player->gamemode == 0 || gm->player->gamemode == 2) && !gm->player->isFireImmune())
+			return;
 		vec3_t pos = *gm->player->getPos();
+		vec3_ti _pos1 = {(int)pos.x, (int)pos.y - 1, (int)pos.z};
+		C_Block* block = g_Data.getLocalPlayer()->region->getBlock(_pos1);
+		if (gm->player->isInLava())
+			add2 = 0.62f;
+		else if ((*block->blockLegacy)->blockId == 10)
+			add2 = 0.62f;
+		else if ((*block->blockLegacy)->blockId == 11)
+			add2 = 0.62f;
+		AABB ColShape;
+		(*block->blockLegacy)->getCollisionShape(&ColShape, block, g_Data.getLocalPlayer()->region, &_pos1, gm->player);
+		if (gm->player->aabb.intersects(ColShape))  // inside of Block
+			gm->player->setPos({pos.x, pos.y + .5f, pos.z});
+		//clientMessageF("%s", (float)((1.0 / 8.0) * ((double)(*block->blockLegacy)->liquidGetDepth(gm->player->region, &_pos1))));
 		pos.y -= 1.62f;
 
 		pos.z = gm->player->aabb.upper.z;
 		pos.x = gm->player->aabb.upper.x;  // upper upper
-
-		C_Block* block = g_Data.getLocalPlayer()->region->getBlock(vec3_ti(pos));
+		
+		block = g_Data.getLocalPlayer()->region->getBlock(vec3_ti(pos));
 		C_BlockLegacy* blockLegacy = *(block->blockLegacy);
 
 		if (blockLegacy->material->isLiquid && gm->player->velocity.y <= 0) {