Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed asserts about chunk queued. | Mattes D | 2017-01-19 | 1 | -1/+0 |
| | | | | The assumption is not needed and was invalid under a stress-test. | ||||
* | Initial support for the 1.11 protocol. | Mattes D | 2016-12-16 | 1 | -2/+2 |
| | |||||
* | Spectators added (#2852) | bibo38 | 2016-10-12 | 1 | -1/+10 |
| | |||||
* | cChunk::SetAlwaysTicked implies cChunk::stay (#3361) | LogicParrot | 2016-10-09 | 1 | -0/+2 |
| | |||||
* | Configurable dirty unused chunk cap to avoid RAM overuse (#3359) | LogicParrot | 2016-09-03 | 1 | -0/+13 |
| | | | Configurable dirty unused chunk cap to avoid RAM overuse | ||||
* | Makes tall grass and large flowers bonemealable | QUSpilPrgm | 2016-06-03 | 1 | -0/+31 |
| | | | | Adds the bonemeal particle effect to some more places | ||||
* | Update Dispensers and let them act more like in Vanilla | QUSpilPrgm | 2016-06-03 | 1 | -8/+11 |
| | | | | | | | | - 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 | ||||
* | 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135) | Pokechu22 | 2016-05-14 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Out of world blocks are now always considered air blocks | LogicParrot | 2016-04-23 | 1 | -10/+0 |
| | |||||
* | Reduced unnecessary block updates | LogicParrot | 2016-04-22 | 1 | -10/+12 |
| | |||||
* | Revert "Move mob tick code to cChunk" | LogicParrot | 2016-04-06 | 1 | -40/+10 |
| | |||||
* | Move mob tick code to cChunk | LogicParrot | 2016-04-06 | 1 | -10/+40 |
| | |||||
* | Improved player freeze code | LogicParrot | 2016-04-05 | 1 | -2/+13 |
| | |||||
* | Players never fall through unloaded chunks or end up inside solids on teleport | LogicParrot | 2016-03-31 | 1 | -1/+1 |
| | |||||
* | Entities are never lost | LogicParrot | 2016-03-30 | 1 | -3/+2 |
| | |||||
* | Fix #3030 | Alexander Harkness | 2016-02-20 | 1 | -9/+1 |
| | | | | Logicparrot's instructions | ||||
* | Proper entity destruction in non-ticking chunks | LogicParrot | 2016-02-19 | 1 | -48/+34 |
| | |||||
* | cMonster::m_Target safety across worlds | LogicParrot | 2016-02-03 | 1 | -1/+9 |
| | |||||
* | Fixed cChunk::m_Entities corruption upon world travel | LogicParrot | 2016-02-02 | 1 | -1/+28 |
| | |||||
* | Updated old forum links | Mathias | 2016-01-31 | 1 | -1/+1 |
| | |||||
* | Spiders now friendly at daylight, new cChunk functions | LogicParrot | 2016-01-21 | 1 | -69/+94 |
| | |||||
* | Reorganised the redstone simulator | Tiger Wang | 2015-12-18 | 1 | -96/+0 |
| | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved | ||||
* | allow use failures to propagate from the entity/block to the player | Gargaj | 2015-12-13 | 1 | -2/+3 |
| | |||||
* | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 1 | -1/+1 |
| | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
* | Adjusted height validation using cChunkDef::IsValidHeight() | Julian Laubstein | 2015-11-23 | 1 | -9/+9 |
| | |||||
* | Implemented brewing | Lukas Pioch | 2015-11-03 | 1 | -0/+53 |
| | |||||
* | Maked it compileable for clang-3.7 | Lukas Pioch | 2015-09-25 | 1 | -1/+1 |
| | |||||
* | Fixed wrong assumtion regarding RemoveClient | tycho | 2015-09-19 | 1 | -1/+5 |
| | | | | Remove client can be called with a client that is not present in the chunk | ||||
* | Fixed erase | tycho | 2015-09-19 | 1 | -1/+1 |
| | |||||
* | Removed a significant performance issue. | tycho | 2015-09-18 | 1 | -78/+62 |
| | | | | | | 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. | ||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 1 | -1/+0 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 1 | -25/+25 |
| | |||||
* | Merge pull request #2224 from cuberite/ChunkQueueCollapsing | worktycho | 2015-07-04 | 1 | -16/+0 |
|\ | | | | | Chunk queue collapsing: MK II | ||||
| * | Reinstate "Chunk queue collapsing" | Tiger Wang | 2015-06-10 | 1 | -16/+0 |
| | | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18. | ||||
* | | Added neighbor specification in the OnNeighborChanged() block callback. | Mattes D | 2015-07-01 | 1 | -1/+1 |
| | | | | | | | | | | Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields. Fixes #2213. | ||||
* | | BlockArea: Fixed a crash with areas higher than chunk height. | Mattes D | 2015-06-30 | 1 | -1/+1 |
| | | |||||
* | | Call Neighbour changed handlers when a melon is created | tycho | 2015-06-23 | 1 | -0/+3 |
| | | | | | | | | Should prevent cascading farmland updates on breaking melons | ||||
* | | Fixed melon metadata when growing from stem. | Mattes D | 2015-06-23 | 1 | -6/+9 |
|/ | |||||
* | Implemented nether portal scanning code. | Lane Kolbly | 2015-06-10 | 1 | -1/+1 |
| | |||||
* | Revert "Chunk queue collapsing" | worktycho | 2015-06-07 | 1 | -0/+16 |
| | |||||
* | Moved Chunk Broadcasts over to the regular queue | tycho | 2015-06-05 | 1 | -16/+0 |
| | |||||
* | Make -Werror disabling file only | tycho | 2015-05-19 | 1 | -2/+2 |
| | | | | Ad fix a load of warnings | ||||
* | Merge remote-tracking branch 'origin/master' into warnings | Tiger Wang | 2015-05-10 | 1 | -12/+12 |
|\ | | | | | | | | | | | Conflicts: src/Mobs/Monster.cpp src/Vector3.h | ||||
| * | CheckBasicStyle: checks spaces around * and &. | Mattes D | 2015-05-09 | 1 | -9/+9 |
| | | |||||
| * | More style checking. | Mattes D | 2015-05-09 | 1 | -3/+3 |
| | | | | | | | | Spaces around some operators are checked. | ||||
* | | Fixed some Visual Studio warnings | Tiger Wang | 2015-05-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 1 | -4/+4 |
|\ | | | | | Unify packetizer | ||||
| * | Fixed signedness warnings in Protocol. | Mattes D | 2015-03-21 | 1 | -2/+2 |
| | | |||||
| * | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 1 | -2/+2 |
| | | |||||
* | | Correct world height validations. | Tommy Santerre | 2015-03-20 | 1 | -3/+3 |
|/ | | | | | 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 | ||||
* | Fixed client kick/crash if many block changes happend | Howaner | 2015-03-09 | 1 | -3/+15 |
| | |||||
* | Weather: Snow starts forming when the top block is at the right height or higher | STRWarrior | 2015-02-25 | 1 | -66/+57 |
| | |||||
* | Fixed flowing water turning into ice when snowing | STRWarrior | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | fix logic bug in cChunk::FastSetBlock filtering out leaves meta changes | Raekye | 2015-01-26 | 1 | -7/+9 |
| | | | | - send update if it's not a leaves block and (the original checks) | ||||
* | filter out leaves meta changes from being sent to the client | Raekye | 2015-01-26 | 1 | -0/+4 |
| | |||||
* | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 1 | -1/+1 |
| | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
* | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 1 | -8/+8 |
| | | | | Fixes #1618. | ||||
* | cChunk: Fixed missing initialization. | Mattes D | 2014-12-21 | 1 | -0/+2 |
| | | | | Fixes CID 72670. | ||||
* | Merge branch 'master' into redstone | Tiger Wang | 2014-12-13 | 1 | -9/+11 |
|\ | |||||
| * | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 1 | -7/+10 |
| |\ | |||||
| | * | Merge branch 'master' into MobSpawner | Howaner | 2014-11-29 | 1 | -6/+6 |
| | |\ | |||||
| | | * | Chunk: Fixed same-name iterators. | Mattes D | 2014-11-27 | 1 | -5/+5 |
| | | | | |||||
| | * | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-18 | 1 | -60/+60 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core | ||||
| | * \ \ | Merge branch 'master' into MobSpawner | Howaner | 2014-09-26 | 1 | -5/+9 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h | ||||
| | * | | | | Implemented mob spawner. | Howaner | 2014-09-19 | 1 | -2/+5 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| | * | | | | Moved all Noise-related files into a separate folder. | Mattes D | 2014-11-18 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -1/+1 |
| |\| | | | |||||
| * | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 1 | -51/+51 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-10-20 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Cleaned up simulators | Tiger Wang | 2014-10-25 | 1 | -3/+3 |
| |_|/ / / |/| | | | | |||||
* | | | | | Use 3 priorities. | Howaner | 2014-10-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 1 | -51/+51 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| * | | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -51/+51 |
| | |/ / / | |/| | | | |||||
* | | | | | Use two lists and 2 chunk send prioritys. | Howaner | 2014-10-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -7/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | | Fixed error with non-const function | Julian Laubstein | 2014-10-19 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1502 from mc-server/furnaces | Tiger Wang | 2014-10-18 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Improved furnaces | ||||
| | * | | | Furnaces now update their block entity type | Tiger Wang | 2014-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Therefore improving cChunk's variable boundary checking. | ||||
| | * | | | Improved furnaces | Tiger Wang | 2014-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070 | ||||
| * | | | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -5/+5 |
| |/ / / | |||||
* / / / | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Update Chunk.cpp | worktycho | 2014-09-28 | 1 | -1/+1 |
| | | | |||||
* | | | Use factory method to construct redstone simulator data | Tycho | 2014-09-28 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tycho | 2014-09-26 | 1 | -0/+3 |
|\ \ | |||||
| * | | Fixed issue with casting | tycho | 2014-09-26 | 1 | -0/+3 |
| | | | |||||
* | | | Removed more unessicary includes | Tycho | 2014-09-26 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -1/+1 |
| |\| | |||||
| * | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | Fixed a redstone sim failure with droppers. | Mattes D | 2014-09-11 | 1 | -1/+1 |
| |/ | |||||
* / | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 1 | -3/+3 |
|/ | | | | THis wil hopefully allow for unit testing | ||||
* | Removed chunk's unused Y coord. | Mattes D | 2014-09-06 | 1 | -3/+3 |
| | | | | This fixes the second issue of #1313. | ||||
* | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 1 | -12/+38 |
| | | | | This fixes #1370. | ||||
* | Merge remote-tracking branch 'origin/master' into EntitiesInBox | madmaxoft | 2014-09-04 | 1 | -4/+3 |
|\ | |||||
| * | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 1 | -4/+3 |
| |\ | | | | | | | remove y-coord from chunks | ||||
| | * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -4/+3 |
| | | | |||||
* | | | Added cWorld::ForEachEntityInBox() | madmaxoft | 2014-09-03 | 1 | -0/+25 |
|/ / | |||||
* / | Rewritten block entity loading. | Mattes D | 2014-08-29 | 1 | -0/+10 |
|/ | | | | | | 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. | ||||
* | Code formatting fixes. | Howaner | 2014-08-19 | 1 | -0/+1 |
| | |||||
* | CheckBasicStyle checks the src folder as well. | madmaxoft | 2014-08-14 | 1 | -10/+16 |
| | |||||
* | Fixed style issues | Tycho | 2014-08-06 | 1 | -3/+3 |
| | |||||
* | Removed dependecy of redstone simulator on NoteBlock | Tycho | 2014-08-05 | 1 | -0/+1 |
| | |||||
* | Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly | Tycho | 2014-08-05 | 1 | -0/+34 |
| | |||||
* | Exported the beacon. | Howaner | 2014-07-30 | 1 | -0/+33 |
| | |||||
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -23/+17 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 1 | -23/+17 |
| | | | | | | | | Fixes #1196. | ||||
* | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -12/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -46/+47 |
|\| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -43/+43 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -2/+3 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -3/+3 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -3/+3 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -94/+125 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | | | | | | | | 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. | ||||
| * | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -11/+11 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -14/+14 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -3/+5 |
| |\ | | | | | | | Implemented trapped chests & others | ||||
| | * | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| * | | Fixed style consistency. | madmaxoft | 2014-07-10 | 1 | -59/+62 |
| | | | |||||
| * | | Implemented support for forced chunk ticking. | madmaxoft | 2014-07-10 | 1 | -2/+28 |
| |/ | | | | | | | Fixes #1160. | ||||
| * | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -2/+2 |
| | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -0/+6 |
|\| | |||||
| * | Added asserts for cChunk::GetBlockEntity() coords. | Mattes D | 2014-06-24 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -2/+7 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 1 | -1/+3 |
| | | |||||
* | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -23/+10 |
| | | |||||
* | | Fixed order of initalisation | Tycho | 2014-06-12 | 1 | -2/+2 |
| | | |||||
* | | Removed unnessicary indirection from Entity iterator list | Tycho | 2014-06-12 | 1 | -5/+5 |
| | | |||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -41/+33 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | Redstone fixes and improvements [SEE DESC] | Tiger Wang | 2014-06-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -1/+14 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -2/+5 |
| | | |||||
* | | Removed use of auto | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -163/+52 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 1 | -14/+16 |
| |\ | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| | * | Suggestions two | Tiger Wang | 2014-06-01 | 1 | -7/+9 |
| | | | |||||
| | * | More comments! | Tiger Wang | 2014-05-29 | 1 | -5/+4 |
| | | | |||||
| | * | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
| * | | Added comments, reformatted code. | madmaxoft | 2014-05-29 | 1 | -3/+3 |
| | | | |||||
| * | | Implemented style changes | Tycho | 2014-05-24 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed stylistic issues | Tycho | 2014-05-21 | 1 | -2/+2 |
| | | | |||||
| * | | Renamed cChunkBuffer to cChunkData | Tycho | 2014-05-21 | 1 | -19/+19 |
| | | | |||||
| * | | Fixed minor style issues | Tycho | 2014-05-21 | 1 | -4/+4 |
| | | | |||||
| * | | Fixed bug in setting metas | Tycho | 2014-05-10 | 1 | -18/+0 |
| | | | |||||
| * | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 1 | -1/+19 |
| |\| | | | | | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | | Fixed bad merge | Tycho | 2014-04-27 | 1 | -13/+9 |
| | | | |||||
| * | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 1 | -14/+19 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -153/+33 |
| | | | | |||||
* | | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -36/+38 |
| | | | | |||||
* | | | | Cauldrons fill | Tiger Wang | 2014-05-29 | 1 | -1/+0 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | | Fixed a buffer overflow in cChunk:SetLight(). | madmaxoft | 2014-05-02 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | There are only half as many bytes for light than there are blocktypes. | ||||
* / | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -1/+19 |
|/ / | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | Merge pull request #863 from mc-server/chunkysparsing | Mattes D | 2014-04-26 | 1 | -33/+97 |
|\ \ | | | | | | | Chunky sparsing | ||||
| * | | Implemented comments | Tiger Wang | 2014-04-25 | 1 | -6/+6 |
| | | | |||||
| * | | Fixed indent | Tiger Wang | 2014-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | Another small speed improvement? | Tiger Wang | 2014-04-24 | 1 | -12/+2 |
| | | | |||||
| * | | Implemented suggestions | Tiger Wang | 2014-04-24 | 1 | -22/+6 |
| |/ | |||||
| * | Replaced all the .data() calls so the code compiles in VS2008 | Tycho | 2014-04-10 | 1 | -5/+5 |
| | | |||||
| * | Maybe speed improvements? | Tiger Wang | 2014-04-07 | 1 | -47/+28 |
| | | | | | | | | | | * Use a single index to determine from when to begin copying data * Use heightmap to determine first nonair block | ||||
| * | Attempt to fix errors | Tiger Wang | 2014-04-07 | 1 | -2/+2 |
| | | |||||
| * | Blocklight and skylight now compressed | Tiger Wang | 2014-04-07 | 1 | -24/+82 |
| | | |||||
| * | Nibbletypes are compressed | Tiger Wang | 2014-04-05 | 1 | -15/+34 |
| | | | | | | | | | | + Added nibble compression * Fixed an off by one | ||||
| * | Speed and memory improvements | Tiger Wang | 2014-04-04 | 1 | -61/+14 |
| | | | | | | | | * Changed array to be continuous, so no more layer splitting | ||||
| * | Merge remote-tracking branch 'origin/master' into chunkysparsing | Tiger Wang | 2014-04-03 | 1 | -1/+12 |
| |\ | |||||
| * | | Fixed some bugs | Tiger Wang | 2014-04-03 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | * Fixed undefined behaviour * Fixed compression failure | ||||
| * | | Performance improvements and chunk flipping fixed | Tiger Wang | 2014-04-02 | 1 | -30/+32 |
| | | | |||||
| * | | Sort of implementation of chunk sparsing | Tiger Wang | 2014-03-23 | 1 | -17/+92 |
| | | | | | | | | | | | | | | | | | | | | | Issues: * Chunks are flipped * Slow/inefficient/badly coded * Only blocktypes are 'compressed' | ||||
* | | | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -2/+2 |
| | | | | |||||
* | | | | Implemented the skeleton code for the beacon. | STRWarrior | 2014-04-12 | 1 | -0/+2 |
|/ / / | | | | | | | | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon. | ||||
* | / | Fixed missing - that caused all neighbour lookups to go to the chunkmap | Tycho | 2014-04-08 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 1 | -1/+1 |
|\ \ | | | | | | | Lilypads | ||||
| * | | Fixed a potential crash | Tiger Wang | 2014-03-28 | 1 | -1/+1 |
| |/ | |||||
* / | Fixed chunk neighbor-getting for long distances. | madmaxoft | 2014-03-27 | 1 | -0/+11 |
|/ | | | | This fixes a server hang when teleporting to coords too far away. | ||||
* | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 1 | -1/+1 |
| | |||||
* | Add Flower Pots | Howaner | 2014-03-07 | 1 | -0/+35 |
| | |||||
* | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -5/+5 |
| | |||||
* | Removed an unused member variable from cChunk. | madmaxoft | 2014-02-24 | 1 | -7/+0 |
| | |||||
* | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+35 |
|\ | | | | | Add Skulls/Heads to MCServer | ||||
| * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -3/+3 |
| | | |||||
| * | Add Heads completely | Howaner | 2014-02-18 | 1 | -0/+33 |
| | | |||||
| * | Add Skulls/Heads | Howaner | 2014-02-17 | 1 | -0/+2 |
| | | |||||
* | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 1 | -0/+32 |
|/ | | | | Fixes #675. | ||||
* | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -1/+0 |
| | |||||
* | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 1 | -4/+10 |
| | |||||
* | Changed pointers to references | Tycho | 2014-02-01 | 1 | -1/+1 |
| | |||||
* | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -2/+4 |
| | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
* | Basic command block implementation | andrew | 2014-01-18 | 1 | -0/+34 |
| | |||||
* | Disabled excessive entity-related logging in Debug mode. | madmaxoft | 2014-01-16 | 1 | -2/+15 |
| | |||||
* | fixed bad merge | Tycho Bickerstaff | 2013-12-22 | 1 | -4/+0 |
| | |||||
* | merged in changes | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+9 |
|\ | |||||
| * | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+16 |
| |\ | |||||
| * | | Chunk is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -3/+2 |
| | | | |||||
* | | | merged in warnings changes | Tycho Bickerstaff | 2013-12-22 | 1 | -11/+4 |
| |/ |/| | |||||
* | | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+16 |
|/ | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -20/+21 |
| | |||||
* | Attempt at fixing cChunkDef::Height signedness. | madmaxoft | 2013-12-20 | 1 | -6/+1 |
| | |||||
* | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 1 | -0/+32 |
| | |||||
* | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 1 | -0/+32 |
| | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | Improved redstone loading performance | Tiger Wang | 2013-12-13 | 1 | -2/+10 |
| | |||||
* | Fixed QueueSetBlock not sending to client changes | Tiger Wang | 2013-12-13 | 1 | -2/+1 |
| | |||||
* | Redstone data is now loaded on chunk load | Tiger Wang | 2013-12-13 | 1 | -0/+6 |
| | |||||
* | Fixed warning unchecked enum value at Chunk.cpp line 841 | worktycho | 2013-12-09 | 1 | -2/+4 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
* | | Added basic ender chests | Tiger Wang | 2013-12-07 | 1 | -0/+2 |
| | | | | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -2/+2 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 1 | -5/+26 |
|/ | | | | | | | 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. | ||||
* | Fixed an error in cChunk's block ticking. | madmaxoft | 2013-12-04 | 1 | -2/+2 |
| | | | | Absolute coords were passed to a handler expecting relative coords. | ||||
* | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 1 | -1/+18 |
| | |||||
* | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Fixed loads more of them. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -7/+51 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2732 |