diff options
Diffstat (limited to 'Minecraft.Client/MultiPlayerLocalPlayer.h')
| -rw-r--r-- | Minecraft.Client/MultiPlayerLocalPlayer.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.h b/Minecraft.Client/MultiPlayerLocalPlayer.h index 8687b36a..e660a96a 100644 --- a/Minecraft.Client/MultiPlayerLocalPlayer.h +++ b/Minecraft.Client/MultiPlayerLocalPlayer.h @@ -6,6 +6,8 @@ class ClientConnection; class Minecraft; class Level; +//#define STRESS_TEST_MOVE + class MultiplayerLocalPlayer : public LocalPlayer { private: @@ -20,8 +22,8 @@ private: double xLast, yLast1, yLast2, zLast; float yRotLast, xRotLast; public: - virtual bool hurt(DamageSource *source, int dmg); - virtual void heal(int heal); + virtual bool hurt(DamageSource *source, float dmg); + virtual void heal(float heal); virtual void tick(); private: bool lastOnGround; @@ -41,23 +43,30 @@ public: virtual void swing(); virtual void respawn(); protected: - virtual void actuallyHurt(DamageSource *source, int dmg); + virtual void actuallyHurt(DamageSource *source, float dmg); // 4J Added override to capture event for tutorial messages virtual void completeUsingItem(); // 4J Added overrides to capture events for tutorial virtual void onEffectAdded(MobEffectInstance *effect); - virtual void onEffectUpdated(MobEffectInstance *effect); + virtual void onEffectUpdated(MobEffectInstance *effect, bool doRefreshAttributes); virtual void onEffectRemoved(MobEffectInstance *effect); public: virtual void closeContainer(); - virtual void hurtTo(int newHealth, ETelemetryChallenges damageSource); + void clientSideCloseContainer(); + virtual void hurtTo(float newHealth, ETelemetryChallenges damageSource); virtual void awardStat(Stat *stat, byteArray param); void awardStatFromServer(Stat *stat, byteArray param); void onUpdateAbilities(); bool isLocalPlayer(); +protected: + virtual void sendRidingJump(); + +public: + virtual void sendOpenInventory(); + // 4J - send the custom skin texture data if there is one //void CustomSkin(PBYTE pbData, DWORD dwBytes); @@ -70,4 +79,9 @@ public: // 4J Added virtual void setAndBroadcastCustomSkin(DWORD skinId); virtual void setAndBroadcastCustomCape(DWORD capeId); + + // 4J added for testing +#ifdef STRESS_TEST_MOVE + void StressTestMove(double *tempX, double *tempY, double *tempZ); +#endif }; |