| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
| |
* Don't send entity velocity for boats
|
| |
|
|
|
|
| |
* Attached entities can't enter portals
* Whitespace fixes
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Stabilise MoveToWorld
* Fix comments and deprecate ScheduleMoveToWorld
* Enhanced thread safety for m_WorldChangeInfo
* Return unique_ptr from cAtomicUniquePtr::exchange
* cWorld now calls entity cEntity::OnAddToWorld and cEntity::OnRemoveFromWorld.
Allows broadcasting entities added to the world from the world's tick thread.
This also factors out some common code from cEntity::DoMoveToWorld and cEntity::Initialize.
As a consequence, cEntity::Destroy(false) (i.e. Destroying the entity without broadcasting) is impossible.
This isn't used anywhere in Cuberite so it's now deprecated.
* Update entity position after removing it from the world.
Fixes broadcasts being sent to the wrong chunk.
* Fix style
* cEntity: Update LastSentPosition when sending spawn packet
* Add Wno-deprecated-declarations to the lua bindings
* Kill uses of ScheduleMoveToWorld
|
| |
|
|
|
|
| |
* Update LastSentPosition when entity has no speed
* Restructure BroadcastMovementUpdate and always process relmove
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Closes #4357
|
| |
|
|
|
|
|
|
|
|
| |
* Vector3: Add custom fmt compatible formatter.
* cLuaState: Add fmt version of ApiParamError
* Use vector formatting in manual bindings
* Always log vectors with FLOG
|
| |
|
|
|
|
|
| |
Closes #4236
CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/".
#include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
|
| | |
|
| |
|
|
| |
Add check for number of empty lines between functions and fix the corresponding failures
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Move Broadcast functions from cChunkMap to cBroadcaster
- Remove cBroadcastInterface in favour of cBroadcaster.
- cChunk: Remove broadcast functions.
* resurect broadcast interface
* Absorb cBroadcaster into cWorld.
Removes the need for forwarding the function calls.
* Improve const-correctness
* Use Int8 instead of char
+ Comment `ForClients` functions
* Improve comments
* Broadcaster: Rename ForClients functions
|
| |
|
|
|
|
|
| |
1. Base knockback on an entity's bounding box intersection with the explosion
2. Armor blast protection reduces knockback
3. Don't apply knockback to players flying in creative mode
Fixes #4139
|
| |
|
|
|
|
|
| |
* Change reinterpret_cast -> static_cast wherever possible
* Remove more unnecessary `const_cast`s.
reinterpret_casts should be avoided for the same reason as c-style casts - they don't do any type-checking. reinterpret_cast was mainly being used for down-casting in inheritance hierarchies but static_cast works just as well while also making sure that there is actually an inheritance relationship there.
|
| | |
|
| |
|
|
|
|
|
| |
* Fixes a number of "<function>: not all control paths return a value" warnings on MSVC.
* Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults.
* Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message()
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* Cactus detection code follows pattern set in #3996
* Pickups are now destroyed on cactus contact
* Add cactus detection and destruction to Exp Orbs
Remove checks for IsExpOrb() in cEntity::Tick()
Exp Orbs do not call super::Tick() and so this condition was
pointless.
|
| |
|
|
|
|
|
|
|
|
| |
* Replace cEntity:m_IsSubmerged with m_IsHeadInWater
* Replace cEntity:m_IsSwimming with m_IsInWater
* Add API documentation for new symbols
* Apply SetSwimState to all entities, not just mobs and players
* Pickups now use IsOnFire to check if they are on fire before destruction
Fixes #3987
|
| |
|
|
|
|
|
|
|
|
|
| |
* Uses vanilla logic to decide which blocks rain falls through.
* Rain falls infinitely above the world, and stops at y=0.
* Entities will now be extinguished if they are under rain-blocking
blocks, and fire will now be extinguished by rain similarly.
* Create IsWeatherWetAtXYZ to identify wetness at a particular location.
* Use new code for enderman rain detection.
* Fixes issue #916
* Disable warnings for global constructors in the fire simulator.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* Fixed Clang 5.0 compile errors
* Fixed wrong comment
* Only disable warnings in Clang 5 or higher
* Added a CMake condition for the Clang 5 no-zero-as-null-pointer-constant warning
* Now using the use_nullptr branch of the Cuberite specific SQLiteCpp fork
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Fix #4024
* Fix clang error
* Add comment
* Fix behaviour
* Save Health as float
* Changed m_Health to float
* Remove redundant static_cast
* Fix casts
|
| |
|
| |
Fixes isue #2925
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
* Fire effect now shown for creative and spectator mode players
Fixes #3989
* Add documentation for IsFireproof
|
| |
|
|
|
|
| |
* Add cWorld::RemoveEntity and use in cEntity
* cEntity: Remove uneeded asserts from Destroy and DoMoveToWorld
|
| |
|
|
| |
This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
|
| |
|
|
|
|
|
| |
This affects m_IsSubmerged and IsSubmerged() for entities of all
types.
Also prevent squids from suffocating in water.
|
| | |
|
| | |
|
| |
|
|
| |
* Guardians don't take damage on land
* Squids suffocate on land
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| | |
* Changed entity ownership model to use smart pointers
|
| | | |
|
| |/
|
|
| |
* Added knockback for arrows, fixed knockback enchantment handling.
|
| |
|
|
|
|
|
|
| |
* Updated armor damage calculation.
+ Added lua docs, added casts from float to int.
* Changed verbage in docstring and comment.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
* Avoid pickups to sink into blocks and disappear
|
| | |
|
| |
|
|
|
|
| |
* Replaced cTracer usage with cLineBlockTracer.
* Exported new cLineBlockTracer utility functions to Lua API.
|
| |
|
| |
Fixes #3603
|
| |
|
|
| |
Fixes for issues #902 and #2917
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
On RasPi with gcc 4.8.2, the asserts wouldn't compile when tests were enabled.
Enforced the assumption that ASSERT code is generated only in Debug builds.
|
| |
|
| |
protocol for vehicles now properly handled, protocol for boat paddles now properly handled, boats can no longer spawn underwater, boats now properly float, boat metadata now properly broadcasted.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Semistable update to 15w31a
I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written.
* Update to 15w34b protocol
Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff!
* Partially update to 15w35e
Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d.
* Add '/blk' debug command
This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible.
* Fix CRLF normalization in CheckBasicStyle.lua
Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't.
The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored.
* Update to 15w40b
This includes chunk serialization. Fully functional chunk serialization for 1.9.
I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code.
* Write long-by-long rather than creating a buffer
This is a bit faster and should be equivalent. However, the code still doesn't look too good.
* Update to 15w41a protocol
This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added.
* Update to 15w45a
* 15w51b protocol
* Update to 1.9.0 protocol
Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks).
* Fix item pickup packet not working
That was a silly mistake, but at least it was an easy one.
* 1.9.2 protocol support
* Fix version info found in server list ping
Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately.
* Fix build errors generated by clang
These didn't happen in MSVC.
* Add protocol19x.cpp and protocol19x.h to CMakeLists
* Ignore warnings in protocol19x that are ignored in protocol18x
* Document BLOCK_FACE and DIG_STATUS constants
* Fix BLOCK_FACE links and add separate section for DIG_STATUS
* Fix bat animation and object spawning
The causes of both of these are explained in #3135, but the gist is that both were typos.
* Implement Use Item packet
This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block.
* Handle DIG_STATUS_SWAP_ITEM_IN_HAND
* Add support for spawn eggs and potions
The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending.
* Remove spammy potion debug logging
* Fix wolf collar color metadata
The wrong type was being used, causing several clientside issues (including the screen going black).
* Fix 1.9 chunk sending in the nether
The nether and the end don't send skylight.
* Fix clang build errors
* Fix water bottles becoming mundane potions
This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion.
Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging.
* Copy Protocol18x as Protocol19x
Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names).
* Make thrown potions use the correct appearence
This was caused by potions now using metadata.
* Add missing api doc for cSplashPotionEntity::GetItem
* Fix compile error in SplashPotionEntity.cpp
* Fix fix of cSplashPotionEntity API doc
* Temporarilly disable fall damage particles
These were causing issues in 1.9 due to the changed effect ID.
* Properly send a kick packet when connecting with an invalid version
This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping.
I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way).
* Handle server list pings from unrecognized versions
This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse).
* Use cPacketizer for the disconnect packet
This also should fix clang build errors.
* Add 1.9.3 / 1.9.4 support
* Fix incorrect indentation in APIDesc
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| | |
[Attempt 2] Fixed cChunk::m_Entities corruption upon world travel
|
| | | |
|
| |/
|
|
| |
cPawn instances can no longer push an entity they are attached to. cEntity now has a IsAttachedTo method.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
- Supports Overworld and Nether spawns.
- Supports spawning under objects, but still above ground (e.g. under the leaves of a tree).
- Protects against spawning in oceans.
- Protects against spawning in water.
- Uses a radial search about the origin, rather than a linear.
- Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548)
- Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);)
|
| |
|
| |
Right now you will be on fire if there is a block of lava right above you, even if it doesn't pour down.
|
| |
|
|
|
| |
This not only provides fire resistence, but also prevents blaze fireballs.
See #2556
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | | |
|
| |/
|
|
| |
Ad fix a load of warnings
|
| |
|
|
| |
Fixes #1435.
|
| |
|
|
| |
Spaces around some operators are checked.
|
| |
|
|
|
|
|
|
| |
•Pathfinder improvements
•Fixes #1217
•Fixes #1933
Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
|
| | |
|
| | |
|
| |\
| |
| | |
Unify packetizer
|
| | | |
|
| |/
|
|
|
| |
Ref.: #1792
Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
|
| |
|
|
|
| |
Plugins may or may not allow teleport to the new position.
Updated the HookNotify plugin with it.
|
| | |
|
| | |
|
| |
|
|
| |
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/Mobs/Monster.h
|
| | | |
|
| | |\
| | |
| | | |
1.8 Protocol Update
|
| | | |\ |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/Items/ItemHoe.h
|
| | | | | | |
|
| | | |_|/
| |/| | |
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/Blocks/ChunkInterface.h
|
| | | |/
| |/| |
|
| | |/
| |
| |
| | |
Reported by tonibm9 in #1300.
|
| |/ |
|
| | |
|
| |
|
|
| |
The equipment-getting functions return a copy already, so we can't take a pointer, really.
|
| |
|
|
| |
We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
|
| | |
|
| | |
|
| |
|
|
| |
- Added Thorns and Respiration enchantments
|
| |
|
|
|
|
|
|
| |
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
|
| |
|
|
|
|
| |
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/World.h
|
| | |
| |
| | |
Fixes #1181
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
|
| | | |
|
| | | |
|
| | | |
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
|
| | | | |
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\| |
|
| | | |
| | |
| | |
| | | |
* Fixes #901
|
| | |/
| |
| |
| |
| | |
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
|
| | |\ |
|
| | | |\
| | | |
| | | | |
Death messages
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | |\| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
|
| | | |\ \
| | | |/
| | |/| |
Fixes to projectiles and the undead
|
| | | | | |
|
| | | | | |
|
| | | |/
| | |
| | |
| | | |
* Fixes #1131
|
| | | | |
|
| | |/ |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
It wasn't really working and needs more development
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
|
| | |
| |
| |
| | |
Fixes #1039, fixes #851
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
+ Implemented bed home positions
* Fixed some inventory and health server/client mismatches after world
change
|
| |/ |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/Entities/Player.cpp
|
| | | |
|
| | | |
|
| |/ |
|
| |\
| |
| | |
Implemented cacti damage
|
| | | |
|
| | |
| |
| | |
@madmaxoft can you comment?
|
| | |
| |
| | |
Please @tigerw make sure this is correct.
|
| | |
| |
| |
| |
| | |
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| |\ |
|
| | |\
| | |
| | | |
Add entity invulnerable
|
| | | | |
|
| | | |\ |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | |\ \ \
| | |_|/
| |/| | |
Fixed lots of warnings, and other small changes.
|
| | | | |
| | | |
| | | |
| | | | |
Other small changes.
|
| | | |/ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\| |
|
| | | |
| | |
| | |
| | | |
Mob Knockback is far too much #776
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
* Also fixed a potential issue with position sending - if someone moved
slowly enough, their position would never be updated.
|
| | | | |
|
| |\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
src/World.h
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/
| |
| |
| | |
Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
|
| |/
|
|
| |
* Added comments to BroadcastMovementUpdate() and the collision tracer
|
| | |
|
| |\
| |
| | |
Fixes to redstone & general
|
| | |
| |
| |
| |
| | |
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
|
| |/
|
|
|
|
|
| |
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
|
| |
|
|
|
| |
This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7.
This change fixes #854.
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/ChunkMap.cpp
|
| | | |
|
| |/
|
|
|
|
|
| |
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
* Implemented mob drowning
* Iron Golems and squids are excluded
|
| | |
|
| |
|
|
|
|
| |
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
|
| |\ |
|
| | | |
|
| |/ |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* Fixed curved rails being a little broken
+ Implemented detector rails
+ Implemented block collisions on rails
* Fixed snapping to rail
- Removed minecart physics conditions in Entity.cpp as minecarts use
their own simulator when on rails
Fixes #148 and #217; partially implemented #215.
This is Cave Johnson, and we're done here.
|
| |
|
|
|
| |
* Players now search for an area around themselves to teleport to when
detaching from something
|
| |
|
|
|
|
| |
+ They are destroyed instantly by creative mode
* Physics is much improved
+ Basic implementation of powered rails
|
| |
|
|
|
|
|
| |
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Ref.: #407
|
| |
|
