From 66b2ce541250de22270a27b4bf85a316f1afd443 Mon Sep 17 00:00:00 2001 From: xdoxx123 Date: Sun, 15 Mar 2026 14:19:48 +0100 Subject: [PATCH] fucking around --- .clang | 7 +++++++ Minecraft.World/Monster.cpp | 1 + Minecraft.World/Player.cpp | 2 +- Minecraft.World/Player.h | 2 +- Minecraft.World/TheEndDimension.cpp | 2 +- Minecraft.World/Zombie.cpp | 2 +- compile_flags.txt | 18 ++++++++++++++++++ 7 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 .clang create mode 100644 compile_flags.txt diff --git a/.clang b/.clang new file mode 100644 index 000000000..3d0127df8 --- /dev/null +++ b/.clang @@ -0,0 +1,7 @@ +CompileFlags: + Add: [-IMinecraft.World] + + + +Diagnostics: + UnusedIncludes: None \ No newline at end of file diff --git a/Minecraft.World/Monster.cpp b/Minecraft.World/Monster.cpp index ad19a36d4..9ad3c7b74 100644 --- a/Minecraft.World/Monster.cpp +++ b/Minecraft.World/Monster.cpp @@ -99,6 +99,7 @@ bool Monster::doHurtTarget(shared_ptr target) { if (knockback > 0) { + target->push(-Mth::sin(yRot * PI / 180) * knockback * .5f, 0.1, Mth::cos(yRot * PI / 180) * knockback * .5f); xd *= 0.6; zd *= 0.6; diff --git a/Minecraft.World/Player.cpp b/Minecraft.World/Player.cpp index 00c7148e4..102b59311 100644 --- a/Minecraft.World/Player.cpp +++ b/Minecraft.World/Player.cpp @@ -168,7 +168,7 @@ void Player::registerAttributes() { LivingEntity::registerAttributes(); - getAttributes()->registerAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->setBaseValue(1); + getAttributes()->registerAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->setBaseValue(1-); } void Player::defineSynchedData() diff --git a/Minecraft.World/Player.h b/Minecraft.World/Player.h index 2e223a1e5..f06246acf 100644 --- a/Minecraft.World/Player.h +++ b/Minecraft.World/Player.h @@ -37,7 +37,7 @@ class Player : public LivingEntity, public CommandSender, public ScoreHolder { public: static const int MAX_NAME_LENGTH = 16 + 4; - static const int MAX_HEALTH = 20; + static const int MAX_HEALTH = 200; static const int SLEEP_DURATION = 100; static const int WAKE_UP_DURATION = 10; diff --git a/Minecraft.World/TheEndDimension.cpp b/Minecraft.World/TheEndDimension.cpp index 7f26d0e89..83017cf57 100644 --- a/Minecraft.World/TheEndDimension.cpp +++ b/Minecraft.World/TheEndDimension.cpp @@ -82,7 +82,7 @@ Pos *TheEndDimension::getSpawnPos() bool TheEndDimension::isFoggyAt(int x, int z) { - return true; + return false; } int TheEndDimension::getSpawnYPosition() diff --git a/Minecraft.World/Zombie.cpp b/Minecraft.World/Zombie.cpp index f982d8475..5e9de75b7 100644 --- a/Minecraft.World/Zombie.cpp +++ b/Minecraft.World/Zombie.cpp @@ -58,7 +58,7 @@ void Zombie::registerAttributes() // 4J Stu - Don't make it so far! getAttribute(SharedMonsterAttributes::FOLLOW_RANGE)->setBaseValue(40); - getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED)->setBaseValue(0.23f); + getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED)->setBaseValue(10.f); getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->setBaseValue(3); getAttributes()->registerAttribute(SPAWN_REINFORCEMENTS_CHANCE)->setBaseValue(random->nextDouble() * 0.10f); diff --git a/compile_flags.txt b/compile_flags.txt new file mode 100644 index 000000000..57863c770 --- /dev/null +++ b/compile_flags.txt @@ -0,0 +1,18 @@ +-xc++ +-m64 +-std=c++14 +-Wno-unused-includes +-Wno-unsafe-buffer-usage-in-libc-call +-Wno-unsafe-buffer-usage +-Wno-unused-macros +-Wno-c++98-compat +-Wno-c++98-compat-pedantic +-Wno-pre-c++14-compat +-D_LARGE_WORLDS +-D_DEBUG_MENUS_ENABLED +-D_LIB +-D_CRT_NON_CONFORMING_SWPRINTFS +-D_CRT_SECURE_NO_WARNINGS +-D_WINDOWS64 +-I +./x64headers \ No newline at end of file