| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
|
|
|
| |
+ Added new biome-dependent flower placement
* Update planter algorithm
Co-authored-by: 12xx12 <12xx12100@gmail.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
|
| |
|
|
|
| |
- Remove improper accesses in cChunk destructor
* Fixes #4894
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* TNT: Implement tracing algorithm
+ Add intensity tracing
* Fix iterating over all players to SendExplosion, even those not in range
* Implemented TNT entity interaction
* Fixed misaligned destruction tracing
* Finalise TNT algorithm
- Remove BlockArea and just use chunks
Using SetBlock makes it so that we can update everything properly, and does appear to be faster.
* BlockInfo learns about explosion attentuation
* Rename Explodinator parameters
* TNT: pull block destruction into common function
Co-authored-by: Alexander Harkness <me@bearbin.net>
|
| |
|
|
|
| |
+ Always make a chunk for the player to go into
* Fixes #4847
|
| |
|
|
| |
- MoveEntityToNewChunk, AddEntity can fail. Ensure we handle these cases correctly
|
| | |
|
| |
|
|
|
|
| |
- Remove TouchChunk
- Remove unused bool return value in GenerateChunk
- Remove ShouldGenerateIfLoadFailed
|
| |
|
|
|
|
| |
- Removed calls that constructed an empty chunk, found it was invalid, and did nothing with said chunk
Partially addresses #2324
|
| |
|
|
|
|
|
|
| |
Partially reverts #3129, whose addition of these parameters was superseded by #3149 that fixed generated leaves' metas.
References:
https://github.com/cuberite/cuberite/pull/4417#discussion_r334950513
e0bcd754009f16480437b2c1fa5e7fbedab31496
|
| |
|
|
| |
- No more unique_ptr storage
|
| |
|
|
|
|
| |
* Call OnPlaced/OnBroken in PlaceBlock/DigBlock
- Remove unused Placing/Breaking handlers
* Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors
|
| | |
|
| |
|
|
|
| |
+ Pass block, use relatives
* Fixes everything immediately converting abs back to rel and getting block, when these data were already available
|
| |
|
|
|
|
| |
* WakeUp is for singular changes (block breaking for example). The simulator should check blocks around the position and discover other affected blocks as it sees fit
* AddBlock is for when you know a whole area is to be updated; chunk loading, or area wakeups for example
+ Prepares for correct handling of destroyed blocks after removal of SolidBlockHandler in the redstone simulator
|
| | |
|
| | |
|
| |
|
| |
* Add cEntity::GetBoundingBox, and use where appropriate.
|
| |
|
|
|
| |
* cBlockHandler.OnUpdate uses Vector3 params.
Also slightly changed how block ticking works.
|
| |
|
|
|
|
|
|
|
| |
* Fix stack overflow in breaking ice.
Stupid fix, but it does work and is used in other places too...
* Replace hotfix for pistons with better one
* Fix comments in BlockBed handler
|
| |
|
|
|
|
|
|
|
| |
The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change)
The BlockInfo.h file was removed from Globals.h (main change)
The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics)
The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor)
Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header.
That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified.
eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
|
| | |
|
| |
|
|
|
|
|
|
|
| |
* Lock hopper when powered by redstone
* Add to manual bindings
* Add hopper API documentation
Co-authored-by: Mat <mail@mathias.is>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 28654b1f42a98c0f9910e333a9c8074fe30aff24
Author: Alexander Harkness <me@bearbin.net>
Date: Fri Mar 27 11:58:34 2020 +0000
Remove whitespace
commit f1492e174b51e168bf4fb150c2d7b7096c393057
Author: Odin <SirRobo@users.noreply.github.com>
Date: Fri Mar 27 04:30:32 2020 +1100
Add issue comment
commit b64166d68a327e8a9bf80720ff6e9c6af93921b5
Author: Odin <SirRobo@users.noreply.github.com>
Date: Fri Mar 27 03:42:35 2020 +1100
Don't run OnBroken with pistons
Stops piston duplication bug and doesn't break water and lava simulation
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* TNT position fixes
* Don't add offset to explosion spawn coords
* Don't make other entities push TNT
* Correct initial TNT speed
* Fix typo
* Improvements
* Revert unwanted change
* Style fixes
* Update format
|
| | |
|
| |
|
|
|
| |
* Improvements to knockback
* SetSpeed for explosions
* Improve code consistency
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
Removed dependency on cChunkDataCallback.
Moved all the serializing code into a worker class.
Changed the serialization into a single-call action.
|
| |
|
|
| |
The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests.
|
| | |
|
| |
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Closes #1244
Initially I was just going to add the cChunkData to cSetChunkData but profiling revealed
that the copying wasn't even the biggest slowdown. Much more time was being spent in
cChunk::CreateBlockEntities and cChunk::WakeUpSimulators than was in memcpy so I've made
those significantly faster as well.
Optimisations performed:
* cSetChunkData now stores blocks in a cChunkData object
* cChunkData objects can now perform moves even if they are using different pools
* cChunk::CreateBlockEntities now iterates in the correct order and only over present chunk sections
* Similarly for cChunk::WakeUpSimulators
* cSetChunkData::CalculateHeightMap now shortcuts to the highest present chunk section before checking blocks directly
|
| |
|
|
|
|
|
| |
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
|
| |
|
|
|
|
| |
* WriteBlockArea: Fix erasing of block entities.
* cChunkMap::DoExplosionAt destroys block entities
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Made BroadcastSoundEffect take vector parameters.
* Added docs for new vectored methods
* Removed old code
* Fixed lua warnings
* Made old BroadcastSoundEffect not an override.
* m_Block to m_BlockPos, used Vector3d constructor where prettier.
* a_Block to a_BlockPos
* Changed thunderbolt a_Block to a_BlockPos
|
| | |
|
| | |
|
| |
|
|
| |
This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
|
| | |
|
| | |
|
| |\
| |
| | |
* Changed entity ownership model to use smart pointers
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
* Added bed entity
* Export cBedEntity to lua
* Set color of bed through item damage value
* Added bed entity to APIDoc
* NBT: Added loading and saving
* Crafting recipes for the colored beds
|
| | |
|
| |
|
| |
The original bindings accepted nil as the World param, causing a crash.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
| |
Configurable dirty unused chunk cap to avoid RAM overuse
|
| | |
|
| | |
|
| |
|
|
| |
Adds the bonemeal particle effect to some more places
|
| |
|
|
|
|
|
|
| |
- Added code to make bonemeal, potions, minecarts, XP bottles and boats work inside dispensers
- Dispensers are now able to place TNT if the block is transparent but not air
- Added return value that indicates the success of pumpkin, melon, sugarcane and cactus growing functions
- Changed return value of "GrowRipePlant" so that it actually indicates if the block was able to grow
- Fixed "GrowSugarcane" and "GrowCactus" in "GrowRipePlant" so that it only grows them a single block
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
|
| | |
|
| |
|
|
|
|
| |
Fixes #2603
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded.
Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78
and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Also started refactoring how broadcasts are handled
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
* Fixes #1728
|
| |
|
|
| |
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
|
| |
|
|
| |
Fixes #1618.
|
| | |
|
| |
|
|
|
| |
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/Items/ItemHoe.h
|
| | | |
|
| |/ |
|
| | |
|
| |
|
|
| |
This fixes #1370.
|
| | |
|
| |\ |
|
| | |\
| | |
| | | |
remove y-coord from chunks
|
| | | | |
|
| |/ / |
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| |
|
|
| |
Fixes #1196.
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | |
| |
| |
| | |
* Fixes #1190
|
| | |
| |
| |
| | |
There should be at least two spaces in front and one space after //-style comments.
|
| |/
|
|
| |
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
|
| |\
| |
| | |
Reset meta to zero when the blocks explode
|
| | | |
|
| | | |
|
| |\ \
| | |
| | | |
Coverity fixes
|
| | | | |
|
| | | |
| | |
| | | |
Fixes CID 43611
|
| | |/
|/| |
|
| |\ \ |
|
| | | | |
|
| |/ / |
|
| |\ \
| | |
| | | |
Implemented trapped chests & others
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
|
| |/ /
| |
| |
| | |
Fixes #1160.
|
| |/
|
|
|
| |
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
|
| | |
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/Chunk.cpp
|
| | |
| |
| |
| |
| | |
* Fixes #879
* Fixes #714
|
| |\|
| |
| |
| |
| | |
Conflicts:
src/Chunk.h
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/ClientHandle.cpp
src/Entities/FallingBlock.cpp
src/Mobs/AggressiveMonster.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | | |
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
|
| |\ \ \
| | |/
| |/| |
|
| | |/ |
|
| | | |
|
| |\|
| |
| |
| |
| |
| | |
Conflicts:
src/Chunk.cpp
src/Chunk.h
|
| | | |
|
| | |
| |
| |
| | |
Fixes #837.
|
| |/ |
|
| | |
|
| |\
| |
| |
| |
| | |
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
|
| |
|
|
| |
The Y coords weren't checked.
|
| |\
| |
| | |
Add Skulls/Heads to MCServer
|
| | | |
|
| | | |
|
| |/
|
|
| |
Fixes #675.
|
| |
|
|
| |
This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready.
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
|
| | | |
| | |
| | |
| | | |
* Fixed bug where explosions would sometimes never be sent
|
| | | |
| | |
| | |
| | |
| | | |
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
|
| | |/
|/| |
|
| |/ |
|
| |\
| |
| | |
TNT improvements
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
+ Added entity damage
+ Added entity propulsion
* Fixed #67 and fixed #230
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Game of Thrones music in Minecraft, here I come!
|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/Bindings/Bindings.cpp
src/Bindings/Bindings.h
src/Blocks/BlockHandler.cpp
|
| | |
| |
| |
| | |
Ref.: #407
|
| | |
| |
| |
| |
| | |
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
|
| |/
|
|
|
|
|
| |
If a coordinate was queued, and then the block there was broken, it
would reappear: double items!
Also now just sets meta if previous and current blocktypes matched.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
Conflicts:
GNUmakefile
|
| |
|
