| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |
|
|
| |
* Flush out all pending, buffered changes at the end of each tick, after every chunk is ticked. This makes every block update client-side in unison, instead of unlucky ones only being sent 1 tick later.
* Re-add buffer for outgoing network data; IOCP async WSASend has higher overhead than expected... Fixes regression introduced in 054a89dd9
|
| |
|
|
|
| |
* When the cause of destruction was world-induced (CanBeAt check failed) there is no tool. Pass the nullptr directly to ConvertToPickups and let it handle it.
* Fixes #4795
- Remove unused a_Digger parameter to ConvertToPickups.
|
| |
|
|
|
|
| |
+ DoWith calls now broadcast the block entity and mark the chunk dirty
+ Add block entity change queue to synchronise BE updates with block updates
* Fixed a few incorrect assertions about BE type
- Remove manual overloads
|
| |
|
| |
* Fixes #5144
|
| |
|
| |
* replace push_back with emplace_back when a new object was created in the function call
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Rename ChunkData Creatable test
* Add missing Y-check in RedstoneWireHandler
* Remove ChunkDef.h dependency in Scoreboard
* Prepare ChunkData for BlockState storage
+ Split chunk block, meta, block & sky light storage
+ Load the height map from disk
- Reduce duplicated code in ChunkData
- Remove saving MCSBiomes, there aren't any
- Remove the allocation pool, ref #4315, #3864
* fixed build
* fixed test
* fixed the debug compile
Co-authored-by: 12xx12 <44411062+12xx12@users.noreply.github.com>
|
| |
|
| |
Use the standard NDEBUG.
|
| | |
|
| |
|
|
|
|
|
|
| |
+ A cPlayer, once created, has a strong pointer to the cClientHandle. The player ticks the clienthandle. If he finds the handle destroyed, he destroys himself in turn. Nothing else can kill the player.
* The client handle has a pointer to the player. Once a player is created, the client handle never outlasts the player, nor does it manage the player's lifetime. The pointer is always safe to use after FinishAuthenticate, which is also the point where cProtocol is put into the Game state that allows player manipulation.
+ Entities are once again never lost by constructing a chunk when they try to move into one that doesn't exist.
* Fixed a forgotten Super invocation in cPlayer::OnRemoveFromWorld.
* Fix SaveToDisk usage in destructor by only saving things cPlayer owns, instead of accessing cWorld.
|
| |
|
|
| |
* Hopefully fixes #5094
|
| |
|
|
|
|
| |
+ Use libdeflate
+ Use std::byte
* Fix passing temporary to string_view
+ Emulate make_unique_for_overwrite
|
| |
|
|
|
|
|
|
|
|
| |
* Fix potential destruction crashes
* Fix destructors accessing destroyted objects
* Fix cPlayer not destroying windows (Destroyed never called)
* Tentatively fixes #4608, fixes #3236, fixes #3262
- Remove cEntity::Destroyed() and replace with cEntity::OnRemoveFromWorld()
* Add missing call to OnRemoveFromWorld
|
| | |
|
| |
|
|
| |
Loaded entities are directly moved into the chunk data, instead of having to go through cWorld, as if they were just spawned. This avoid dirtying the chunk.
|
| | |
|
| |
|
|
|
|
|
|
|
| |
* Turn off global-constructors warning. These are needed to implement cRoot signal handler functionality
* Add Clang flags based on version lookup instead of a compile test. The CMake config process is single threaded and slow enough already
* Reduced GetStackValue verbosity
+ Clarify EnchantmentLevel, StayCount, AlwaysTicked, ViewDistance signedness
+ Give SettingsRepositoryInterface a move constructor to simplify main.cpp code
- Remove do {} while (false) construction in redstone handler
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* [FIX] Add correct implementation of seed drops.
> Official percentage of drops has been implemented
* Fix C++ conventions
* Change "Vals" variable to "m_Vals"
* [FIX] Add correct implementation of Carrots, Potatoes, Wheat & Beetroots seed
* Add Fortune support with crops
Add fortune support with Wheat, Carrots, Potatoes & Beetroots seeds
* [FIX] Right-clicking on a grown Beetroot in survival consume 2 bone meals
Fix #4805
* Add documentation for "cWorld::IsFullGrownPlantAt" method
* Fix dispenser that full grown a plant
> Change methods cItemDyeHandler::FertilizePlant & cItemDyeHandler::growPlantsAround to static
* Display particle even if tree doesn't grow
* When right-clicking on a full grown melon / pumpkin seed, no longer produce a melon / pumpkin
Before this commit, when you right-click on a melon or a pumpkin seed, a melon / pumpkin block spawned.
With this commit, it no longer spawns
* [FIX] Do not create melon / pumpkin block when right-clicking with a bone meal
This fix will prevent the creation of a melon / pumpkin block when you right-click with a bone meal on a melon / pumpkin plant
- It just detect if the plant is full grown. if yes, the method "Grow" is not called
- Remove IsFullGrownPlant
Co-authored-by: 12xx12 <12xx12100@gmail.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
|
| |
|
|
|
| |
- Remove improper accesses in cChunk destructor
* Fixes #4894
|
| |
|
|
|
| |
- Removed normal BlockHandler knowledge of block entities during conversion
+ Added cBlockEntity::ConvertToPickups that handles it
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* BlockHandler initialisation is a constant expression
If we can't make it all namespaces, this is the next best I guess.
+ Tag handlers constexpr, const as needed
+ Inherit constructors
* Privatise handler functions
* More constexpr
Co-authored-by: Alexander Harkness <me@bearbin.net>
|
| |
|
|
|
| |
* Reduces confusion when using overloaded operator< and priority_queue
Co-authored-by: peterbell10 <peterbell10@live.co.uk>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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>
|
| |
|
|
|
| |
+ Add EnderChest saving, as Vanilla does
- Remove CreateBlockEntities. Storage should save & load everything so looping over chunk data is not needed
|
| | |
|
| |
|
|
|
| |
- No longer try getting from the chunkmap if GetNeighborChunk fails, since nothing else does this and entities (in future) will not tick close to an unloaded chunk edge
* GetRelNeighborChunk uses FindChunk
|
| |
|
|
|
|
| |
- Remove TouchChunk
- Remove unused bool return value in GenerateChunk
- Remove ShouldGenerateIfLoadFailed
|
| |
|
|
|
|
|
|
| |
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
|
| | |
|
| |
|
|
| |
+ Add Y validity check to SimulatorManager
|
| |
|
| |
* Changed switch for call in cChunk for call to function cBlockEntity to remove unnecessary confusions while implementing new BlockEntities
|
| |
|
|
|
|
|
| |
* Pistons/Ice no longer need to FastSetBlock first (#4600), and the former don't drop items when broken in creative
- Begin migration away from stationary fluids
* Tick the chunk after applying a client's changed
* Broadcast pending blocks at the end of a tick
|
| |
|
|
|
|
| |
* 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
|
| | |
|
| | |
|
| |
|
|
| |
- cSimulator no longer wakes up positions already woken by cChunk::SetBlock
|
| | |
|
| |
|
| |
Confer issue #3696
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Avoid inefficient AString -> c_str() -> AString round trip
* Avoid redundant string init expressions
* Avoid unnecessary return, continue, etc.
* Add .clang-format to help with clang-tidy fix-its
* Avoid unnecessary passing by value
* Avoid unnecessary local copying
* Avoid copying in range-for loops
* Avoid over-complicated boolean expressions
* Some violations missed by my local clang-tidy
* Allow unnecessary continue statements
* Add brackets
* Another expression missed locally
* Move BindingsProcessor call into clang-tidy.sh and add space
* Fix pushd not found error
* Different grouping of CheckBlockInteractionRate
|
| |
|
| |
* Add cEntity::GetBoundingBox, and use where appropriate.
|
| |
|
|
| |
As documented here: https://www.spigotmc.org/threads/item-pickup-radius.337271/#post-3141146
|
| | |
|
| |
|
|
|
| |
* cBlockHandler.OnUpdate uses Vector3 params.
Also slightly changed how block ticking works.
|
| | |
|
| |
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
| |
Co-authored-by: peterbell10 <peterbell10@live.co.uk>
Co-authored-by: mluchterhand <mluchterhand@max.de>
|
| |
|
| |
Co-authored-by: mluchterhand <mluchterhand@max.de>
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests.
|
| |
|
|
|
|
|
|
|
|
| |
* Vector3: Add custom fmt compatible formatter.
* cLuaState: Add fmt version of ApiParamError
* Use vector formatting in manual bindings
* Always log vectors with FLOG
|
| |
|
|
| |
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
|
| |
|
|
|
|
|
| |
* 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.
|
| |
|
|
|
| |
* cChunkData: Change interface to use Vector3i
* cChunk: Add Vector3i overloads for bounded block get and set functions.
|
| |
|
|
|
|
| |
* 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.
|
| | |
|
| | |
|
| | |
|
| |\
| |
| | |
cChunk: Don't assume GetBlockEntity coords are valid
|
| | | |
|
| |\ \
| | |
| | | |
* Changed entity ownership model to use smart pointers
|
| | |/ |
|
| |/ |
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
* BigFlowers fixes
* Correct upper part meta
* Documented parameters to DoesIgnoreBuildCollision
|
| |
|
|
|
|
|
|
|
|
| |
* 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
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
* Store block entities in a map from block index
* Cleanup ForEachBlockEntity
* Cleanup DoWithBlockEntityAt
|
| |
|
|
| |
The assumption is not needed and was invalid under a stress-test.
|
| | |
|
| | |
|
| | |
|
| |
|
| |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Logicparrot's instructions
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
-> 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>
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Remove client can be called with a client that is not present in the chunk
|
| | |
|
| |
|
|
|
|
| |
Iterating through the list of clients in chunks was taking up a significant
amount of time with larger numbers of clients due to processor stalls.
Changing the data structure to a vector fixed the issue.
|
| | |
|
| | |
|
| |\
| |
| | |
Chunk queue collapsing: MK II
|
| | |
| |
| |
| |
| | |
This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78
and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
|
| | |
| |
| |
| |
| | |
Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields.
Fixes #2213.
|
| | | |
|
| | |
| |
| |
| | |
Should prevent cascading farmland updates on breaking melons
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Ad fix a load of warnings
|
| |\
| |
| |
| |
| |
| | |
Conflicts:
src/Mobs/Monster.cpp
src/Vector3.h
|
| | | |
|
| | |
| |
| |
| | |
Spaces around some operators are checked.
|
| |/ |
|
| |\
| |
| | |
Unify packetizer
|
| | | |
|
| | | |
|
| |/
|
|
|
| |
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
- send update if it's not a leaves block and (the original checks)
|
| | |
|
| |
|
|
| |
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
|
| |
|
|
| |
Fixes #1618.
|
| |
|
|
| |
Fixes CID 72670.
|
| |\ |
|
| | |\ |
|
| | | |\ |
|
| | | | | |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
MCServer/Plugins/Core
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/MobSpawner.h
src/Mobs/Monster.h
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/Noise/Noise.h
src/World.h
|
| | | | |_|/
| | |/| | |
|
| | |\| | | |
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | | | | | | |
|
| | |_|/ / /
|/| | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
|
| | | |/ / /
| |/| | | |
|
| | | | | | |
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/ClientHandle.cpp
|
| | |/ / / |
|
| | |\ \ \
| | | | |
| | | | | |
Improved furnaces
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Therefore improving cChunk's variable boundary checking.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
|
| | |/ / / |
|
| |/ / / |
|
| | | | |
|
| | |/
|/| |
|
| |\ \ |
|
| | | | |
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/Mobs/Monster.h
|
| | |\| |
|
| | | | |
|
| |\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
src/Blocks/ChunkInterface.h
|
| | |/ |
|
| |/
|
|
| |
THis wil hopefully allow for unit testing
|
| |
|
|
| |
This fixes the second issue of #1313.
|
| |
|
|
| |
This fixes #1370.
|
| |\ |
|
| | |\
| | |
| | | |
remove y-coord from chunks
|
| | | | |
|
| |/ / |
|
| |/
|
|
|
|
| |
Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked.
The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't.
Fixes #1354.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/World.h
|
| | |
| |
| |
| | |
Fixes #1196.
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| | |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| | |
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.
|
| | | |
|
| | |\
| | |
| | | |
Implemented trapped chests & others
|
| | | |
| | |
| | |
| | |
| | |
| | | |
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
+ 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
src/Entities/Entity.h
src/Entities/Player.h
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Haha, see desc.
* Improved redstone speed through a marking dirty system. Only a select
few devices are still continuously simulated
* Fixed redstone crashing with recent piston changes
|
| | | |
|
| | | |
|
| | | |
|
| |\| |
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/Chunk.cpp
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
* Fixes #879
* Fixes #714
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\|
| | |
| | |
| | |
| | | |
Conflicts:
src/Chunk.h
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/Chunk.cpp
src/Chunk.h
|
| | | | | |
|
| | | | | |
|
| | |_|/
|/| | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/ClientHandle.cpp
src/Entities/FallingBlock.cpp
src/Mobs/AggressiveMonster.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
|
| | | |/
| |/|
| | |
| | | |
There are only half as many bytes for light than there are blocktypes.
|
| |/ /
| |
| |
| |
| |
| | |
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
|
| |\ \
| | |
| | | |
Chunky sparsing
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/ |
|
| | | |
|
| | |
| |
| |
| |
| | |
* Use a single index to determine from when to begin copying data
* Use heightmap to determine first nonair block
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
+ Added nibble compression
* Fixed an off by one
|
| | |
| |
| |
| | |
* Changed array to be continuous, so no more layer splitting
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | | |
* Fixed undefined behaviour
* Fixed compression failure
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Issues:
* Chunks are flipped
* Slow/inefficient/badly coded
* Only blocktypes are 'compressed'
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Bug fixes and optimizations.
We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
|
| | | | | |
|
| |/ / /
| | |
| | |
| | | |
There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
|
| | |/
|/| |
|
| |\ \
| | |
| | | |
Lilypads
|
| | |/ |
|
| |/
|
|
| |
This fixes a server hang when teleporting to coords too far away.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| | |
Add Skulls/Heads to MCServer
|
| | | |
|
| | | |
|
| | | |
|
| |/
|
|
| |
Fixes #675.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| | |
| |
| |
| | |
Note that they just mirror chests now, so no per player inventory.
|
| | |
| |
| |
| |
| | |
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.
|
| |
|
|
| |
Absolute coords were passed to a handler expecting relative coords.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
Conflicts:
GNUmakefile
|
| |
|
