| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
| |
* Change TimeOfDay to WorldDate
* Do not wrap at 20 minutes, continue incrementing
* Fixes #4737
* Fixes #5159
|
| |
|
|
|
| |
* Use the batch update feature of the packet.
* Lengthen interval between time and ping update packets (ref. http://github.com/cuberite/cuberite/issues/4082#issuecomment-348675321).
|
| |
|
| |
* Fixes #5144
|
| |
|
|
|
| |
+ Add boss bar
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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>
|
| | |
|
| |
|
|
|
|
|
|
| |
+ 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
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
| |
* 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
|
| |
|
|
|
|
|
| |
* Some const and inheritance correctness
* Devirtualise SendBlockTo(Vector3i)
Co-authored-by: 12xx12 <12xx12100@gmail.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* [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>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* fixed network
fixed explosion
fixed ticking
added network broadcast to Setter method
added nullptr protection
using macros in 1.10 Protocol_1_10.cpp
revealed functions to LUA API
small fixups, typos, less functions used
fixed more doc
readded info that saving is done only if the beam is displayed
made the constructor transfer all needed members
fixed wrong commit
removed default parameters on SpawnEnderCrystal
fixed wrong metadata
moved call to destroy in the right place
fixed some typos
Fixed Ender Crystal
* fixed documentation
* fixed doc and added proper error message
* Parameters, arrows
* Parameters
Co-authored-by: 12xx12 <12xx12100@gmail.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
|
| |
|
|
|
| |
* Fixes #4990
Co-authored-by: 12xx12 <12xx12100@gmail.com>
|
| |
|
|
| |
cWorld:DigBlock in lua api
|
| |
|
|
| |
Co-authored-by: 12xx12 <12xx12100@gmail.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
|
| |
|
|
|
| |
* Reduces confusion when using overloaded operator< and priority_queue
Co-authored-by: peterbell10 <peterbell10@live.co.uk>
|
| |
|
|
|
|
| |
- 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
|
| | |
|
| | |
|
| |
|
|
|
|
| |
* Call OnPlaced/OnBroken in PlaceBlock/DigBlock
- Remove unused Placing/Breaking handlers
* Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors
|
| |
|
| |
* cWorld * -> cWorld
|
| |
|
|
|
|
|
|
|
| |
* Make puking pickups fly nicer
* Improve entity position updates
* Move determination of whether a delta is too big for a packet into the protocol handlers
+ Less jittery movement
+ Generalise CollectEntity to take any entity
|
| |
|
| |
Refactored all cBlockHandler and cItemHandler descendants to use Vector3.
|
| |
|
|
|
| |
* cBlockHandler.OnUpdate uses Vector3 params.
Also slightly changed how block ticking works.
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
* Falling blocks can now be spawned at any position.
* Added a /cake command to Debuggers that throws a cake in a nice slow arc.
* Fixed regular falling blocks.
|
| |
|
|
|
|
|
|
|
| |
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>
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
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.
|
| |
|
| |
Fixes #4292.
|
| |
|
|
|
|
|
| |
* Replace cWorld::FindClosesPlayer with cWorld::DoWithClosestPlayer
* Implement experience reward splitting into the orb sizes used in vanilla
* Modified speed calculation in cExpOrb::Tick to make the orbs fly towards the player
Fixes #4216
|
| |
|
| |
Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
| |
|
|
| |
This allows players game mode to update to the default after portal to another world.
Fixes #4207
|
| |
|
|
|
|
|
|
|
|
|
| |
* 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.
|
| |
|
|
| |
Prevents nullptr dereferences before Start has been called.
|
| |
|
|
| |
Start now does nothing more than launch the world's threads.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
* Add cWorld::RemoveEntity and use in cEntity
* cEntity: Remove uneeded asserts from Destroy and DoMoveToWorld
|
| |
|
|
| |
This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* Threaded world interface into ConvertBlockToPickups
* Changed how cBlockPiston::PushBlocks sets the old block to air, so that the block exists for the DropBlock call.
* Removed unused a_Digger argument.
* Removed incorrect comment
* This time actually removed a_Digger references.
|
| | |
|
| |\
| |
| | |
* 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
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
- NBT: Added saving / loading of material
- Added the material in the item handler of the boat
- Drop the correct boat if destroyed
- APIDoc: Added desc and functions
|
| |
|
|
|
| |
- Added override keyword
- Removed inherited member variables
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Also fixed a bit of documentation in the CPP source.
|
| |
|
| |
Configurable dirty unused chunk cap to avoid RAM overuse
|
| |
|
|
| |
Otherwise, some API calls just don't seem to happen
.gitignore tweak for test executables
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| | |
Reorganised the redstone simulator
|
| | |
| |
| |
| |
| |
| | |
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
|
| |/
|
|
| |
Fixes #2746.
|
| |
|
|
|
|
| |
Fixes #2603
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
|
| |
|
|
|
|
|
|
|
|
| |
- 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);)
|
| | |
|
| | |
|
| |
|
|
|
| |
* Llama-ified and condensed Schedule/QueueTask
- Removed hackery done with piston animations
|
| | |
|
| | |
|
| |\
| |
| | |
Improved spider AI
|
| | |
| |
| |
| | |
Fixes #2335
|
| |/ |
|
| |\
| |
| | |
Chunk queue collapsing: MK II
|
| | |
| |
| |
| |
| | |
This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78
and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
|
| | |
| |
| |
| |
| |
| | |
Made the portal size configurable
Alpha-sorted SetXYZNetherPortalXYZ functions
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | | |
|
| |/ |
|
| |
|
|
| |
Spaces around some operators are checked.
|
| |
|
|
| |
Also started refactoring how broadcasts are handled
|
| |\
| |
| | |
Unify packetizer
|
| | | |
|
| | |
| |
| |
| |
| | |
Ref.: #1792
Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
|
| |/
|
|
|
| |
This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data.
Fixes #1556.
|
| |
|
|
| |
Monsters will now attack. Additional checks have been added when generating spawn.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
|
| |
|
|
| |
Fixes #1618.
|
| |\ |
|
| | |\
| | |
| | | |
Prepare chunk
|
| | | |
| | |
| | |
| | |
| | | |
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
|
| | |\ \
| | |/
| |/| |
Prevent multiple logins with same username, unless allowed in settings
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\ \ |
|
| | | |/ |
|
| | | |
| | |
| | |
| | |
| | | |
It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting).
Fixes #1597.
|
| | | | |
|
| | |\|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/Noise/Noise.h
src/World.h
|
| | | |\
| | | |
| | | | |
Fixed a security problem with signs.
|
| | | | | |
|
| | | |\| |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | |/ |
|
| | |\| |
|
| | | | |
|
| | | | |
|
| | |/
|/| |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
|
| | | | |
|
| |\| |
| | |
| | |
| | |
| | | |
Conflicts:
src/World.h
|
| | |\ \
| | |/
| |/| |
|
| | | | |
|
| |\| |
| | |
| | |
| | |
| | | |
Conflicts:
src/ClientHandle.cpp
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/ |
|
| |/ |
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/Mobs/Monster.h
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/Blocks/ChunkInterface.h
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
THis wil hopefully allow for unit testing
|
| | |_|/
|/| | |
|
| |\ \ \ |
|
| | | | | |
|
| | | |/
| |/|
| | | |
Added Spectator gamemode
|
| | | | |
|
| |\| |
| | |
| | |
| | |
| | | |
Conflicts:
src/Items/ItemHoe.h
|
| | |/ |
|
| |\| |
|
| | | |
|
| | | |
|
| |/ |
|
| |
|
|
| |
This fixes #1370.
|
| |\ |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| |
|
| |
I need this for a GameRule plugin.
|
| | |
|
| |\ |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| | |
Conflicts:
src/World.h
|
| | | |
|
| | |
| |
| |
| | |
Fixes #1196.
|
| | |
| |
| | |
Fixes #752
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
|
| | | |
| | |
| | |
| | | |
Fixes #1160.
|
| | |/
| |
| |
| | |
* Fixed piston extension non-solidness
|
| | |
| |
| |
| |
| | |
* Fixed the "fix" that broke the fix for #535, thereby fixing said issue
* Fixed #535
|
| | |
| |
| |
| |
| | |
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/World.h
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
call @maxmaxoft!
calling...
call connected (0:20)
call ended
|
| | | | |
|
| | | |
| | |
| | | |
Meant to be semicolons up there.
|
| | | | |
|
| | | |
| | |
| | | |
Also changed the function names.
|
| | | |
| | |
| | | |
@madmaxoft can you comment?
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
|
| | | |
| | |
| | |
| | | |
Fixes #1039, fixes #851
|
| | | |
| | |
| | |
| | | |
This alone doesn't work properly yet, further changes to cPlayer are needed.
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\| | |
|
| | | |
| | |
| | |
| | | |
As suggested by @worktycho.
|
| | |/
| |
| |
| |
| | |
* Fixes #879
* Fixes #714
|
| |/ |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/Vector3.h
|
| | |
| |
| |
| |
| |
| | |
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
|
| |\| |
|
| | | |
|
| |\|
| |
| |
| |
| | |
Conflicts:
src/World.h
|
| | | |
|
| |/ |
|
| |\
| |
| |
| |
| | |
Conflicts:
lib/tolua++/CMakeLists.txt
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/ChunkMap.cpp
|
| | | |
|
| | |\
| | |
| | | |
Beds now work properly, fixes #707
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also fixes FS392
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
|
| | | | |
|
| | | | |
|
| |\| |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
|
| | |\ \
| | | |
| | | | |
Add TNT load/save
|
| | | |\| |
|
| | | | | |
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
src/ClientHandle.cpp
|
| | | | |
| | | |
| | | |
| | | | |
+ Added fireworks
|
| |\ \ \ \
| | |/ /
| |/| | |
|
| | |\ \ \
| | | |/
| | |/| |
Add Flower Pots
|
| | | | | |
|
| | | | | |
|
| | |/ / |
|
| | | |
| | |
| | |
| | | |
cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
|
| | | | |
|
| | | | |
|
| | |/ |
|
| |/ |
|
| | |
|
| | |
|
| |\ |
|
| | |\
| | |
| | | |
Add Skulls/Heads to MCServer
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Fixes #675.
|
| | |/ |
|
| | | |
|
| | |
| |
| |
| |
| | |
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678.
|
| | |\
| | |
| | | |
Broadcast particle effect
|
| | | | |
|
| | |\ \
| | |/
| |/|
| | | |
This merges pull request #661.
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
|
| | | | |
|
| |/ / |
|
| | | |
|
| |\| |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/Root.cpp
src/Root.h
src/World.cpp
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
|
| | | | | |
|
| | |_|/
|/| | |
|
| | | | |
|
| | |/
|/|
| |
| | |
Also added a "noop" redstone simulator that does the same as the fluid version.
|
| |\ \
| | |
| | | |
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
|
| | | | |
|
| | |/ |
|
| |/
|
|
|
| |
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/World.h
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
|
| |\|
| |
| |
| |
| |
| | |
Conflicts:
src/Blocks/BlockRail.h
src/World.h
|
| | |\
| | |
| | | |
More Interfaces to decouple Generator from the rest of the code
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
|
| | | | |
|
| | | | |
|
| | |/
|/| |
|
| |\|
| |
| |
| |
| | |
Conflicts:
src/World.h
|
| | |\ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \
| |_|/
|/| |
| | |
| | | |
Conflicts:
src/World.h
|
| | | |
| | |
| | |
| | | |
If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
|
| | |/
|/|
| |
| | |
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
|
| | | |
|
| |/ |
|
| | |
|
| |\
| |
| | |
Added cWorld::SpawnMinecart.
|
| | | |
|
| | | |
|
| | | |
|
| |/
|
|
|
| |
ScheduleTask schedules a SceduledTask object to be run x ticks in the future.
In is exported to lua, fixes #150
|
| |
|
|
| |
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
|
| |
|
|
| |
As requested in #508; no guarantees about it.
|
| | |
|
| |
|
|
| |
Any monster will be able to explode, and also this fixes #425.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Game of Thrones music in Minecraft, here I come!
|
| | |
|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/Bindings/Bindings.cpp
src/Bindings/Bindings.h
src/Blocks/BlockHandler.cpp
|
| | | |
|
| | |
| |
| |
| |
| | |
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.
|
| |
|
|
| |
Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
|
| | |
|
| | |
|
| |
|
|
|
| |
Conflicts:
VC2008/MCServer.vcproj
|
| |
|
|
|
| |
Conflicts:
GNUmakefile
|
| |
|
