1
0
Fork 0
Commit Graph

224 Commits

Author SHA1 Message Date
Mattes D 0dd1cd750b BlockEntities: Support cloning self. 2017-06-16 14:11:28 +02:00
Lukas Pioch 73a3c4e3be Exported boat
- 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
2017-05-24 19:02:18 +02:00
peterbell10 8a890cf945 Store cChunk::m_BlockEntities in a map (#3717)
* Store block entities in a map from block index
* Cleanup ForEachBlockEntity
* Cleanup DoWithBlockEntityAt
2017-05-22 22:27:55 +02:00
Lukas Pioch 41bfb22834 Corrected brewingstand and added support for fuel 2017-05-08 06:30:54 +02:00
Lukas Pioch fd6faedd55 NBT: Corrected firework loading 2017-03-22 14:21:48 +01:00
Mattes D 0870649994 Fixed TrappedChest saving. (#3423)
Vanilla uses "Chest" in NBT for trapped chests.
2016-11-07 21:16:55 +01:00
Mattes D d2e8643607 Fixed type-casting-related warnings. 2016-08-24 22:26:53 +02:00
LogicParrot ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
Mathias 752d99c8b8 MCServer to Cuberite 2016-01-29 21:47:00 +02:00
bibo38 657b0ed007 Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8
The NBT format now carries the texture data and transmit it to the client.
See: http://minecraft.gamepedia.com/Head#Block_entity
Related to #2674
2016-01-11 17:55:32 +01:00
Julian Laubstein 48f84cc3e9 changed mob age from char to int 2015-11-16 14:13:44 +01:00
Lukas Pioch 9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Mattes D 82d9ac1e1c Namechange to Cuberite 2015-09-25 10:14:17 +02:00
Mattes D 6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Mattes D d2a0c85764 Chunks that fail to load are offloaded to extra files.
Ref.: #1970
2015-07-31 08:49:23 +02:00
Mattes D 08aa3f6ff5 Added reason parameter to load failures. 2015-07-31 08:48:23 +02:00
Mattes D 7379848ae5 Moved AString reading hack to cFile. 2015-07-31 08:48:22 +02:00
Samuel Barney 804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
bibo38 6a27ec2ea0 Added Rabbit Metadata values.
Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation.
Fixes #1867
2015-07-17 01:09:06 +02:00
NiLSPACE 0c3a3427cd Merge pull request #2340 from hallucino/ageable-mobs
Support ageable mobs
2015-07-15 09:57:04 +02:00
Hallucino 53207d3f18 Support ageable mobs
Move ageable stuff in Monster directly
2015-07-14 22:41:31 +02:00
bibo38 0cb0bbe51a Changing the shared_ptr/unique_ptr constructors to the make_shared/make_unique functions 2015-07-12 21:02:47 +02:00
Samuel Barney aa94a275c6 Fixes compilation failures on MacOSX 10.10
* Replace old c-style casts with c++ casts
* Added `-Wno-error=old-style-cast` to Protocol18x.cpp
2015-07-09 11:15:37 -06:00
HaoTNN e82cd6e4eb Fixes multiple furnace issues, including from loading world storage 2015-06-03 02:19:22 -07:00
Mattes D 846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
Woazboat 6caf08da99 cSetChunkData constructor explicitly requires std::move() instead of
unsafely stealing data
2015-04-27 21:18:56 +02:00
Tiger Wang 3d398baf35 cPainting saving implemented
Additionally, it now inherits from cHangingEntity.
2015-03-13 23:05:06 +00:00
Tiger Wang e15e30a030 Fixed confusion over Item Frame directions 2015-03-13 22:29:27 +00:00
Howaner 1a60785ca2 Flower pots: In 1.8 items are saved with the name and not the id. 2015-02-18 23:33:27 +01:00
Mattes D a939e2ded9 WSSAnvil: Fixed chunk data padding.
When the chunk data fit perfectly into the old space, an extra 4 KiB of padding zeroes were written, overwriting the next chunk.
Fixes #1730.
2015-02-08 12:24:15 +01:00
Mattes D f232704203 WSSAnvil: Added clamping to entity coords.
Fixes CID 72854.
2014-12-21 22:37:48 +01:00
Masy98 6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98 c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Mattes D 33c6ff872e Cosmetic touchups.
Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
2014-12-11 14:34:09 +01:00
Mattes D 1b1f971752 Merge remote-tracking branch 'planetx/master' 2014-12-11 11:17:54 +01:00
planetx ce3adf89fa Check to see if header write out is required 2014-12-08 11:23:19 -08:00
planetx 1674f505f8 Added timestamp to merged files WSSAnvil 2014-12-08 08:28:44 -08:00
planetx 65c1d4f7b6 Added timestamp to merged files WSSAnvil 2014-12-08 08:26:37 -08:00
planetx a1da0e7205 Added timestamp to new files WSSAnvil 2014-12-08 08:22:40 -08:00
planetx 8f5e861674 Added Timestamp info to chunks in WSSAnvil 2014-12-07 14:44:08 -08:00
Mattes D 263fabc816 Replaced most auto_ptr with unique_ptr. 2014-12-06 23:03:17 +01:00
Mattes D e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Howaner bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner 648fee1a08 Merge branch 'master' into MobSpawner 2014-11-29 12:05:35 +01:00
Mattes D 0ca891da6d WSSAnvil: Fixed bad code in arrow loading. 2014-11-26 10:14:11 +01:00
Howaner 8b028c5c78 Finished mob spawner implementation. 2014-11-18 15:33:41 +01:00
Howaner 165533c27e Fixed 1.8 world item format reading. 2014-10-29 15:47:43 +01:00
Tiger Wang a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D b979cad893 cItemFrame: Fixed a forgotten rename. 2014-10-21 22:32:17 +02:00
Mattes D a42fa071bc Properly exported cItemFrame and cHangingEntity to Lua. 2014-10-21 22:02:30 +02:00
Howaner 7cdcf0a883 Anvil: Arrow Tile tags are a short in Vanilla 2014-09-25 19:01:44 +02:00
Howaner daf5127b28 Fixed hanging direction bugs. 2014-09-25 18:37:24 +02:00
Howaner 1d588b5195 Don't create two entity lists. 2014-09-24 15:17:20 +02:00
Howaner 65077c314a Merge branch 'master' into WorldLoader 2014-09-24 15:00:49 +02:00
madmaxoft 8d9dfc5d1a Anvil: Wolf collar color is a byte in Vanilla.
Kept the old Int reading for compatibility reasons.
Ref.: #1448
2014-09-23 22:22:38 +02:00
Howaner 2832685c02 Merge branch 'master' into WorldLoader 2014-09-23 22:16:05 +02:00
madmaxoft 0b40ce971c Fixed a crash in WSSAnvil.
Reported as #1448.
2014-09-23 22:12:47 +02:00
Howaner 366af5067b MCServer world compatiblity with vanilla and mcedit. 2014-09-23 19:16:17 +02:00
Howaner 4b38e077cf Merge branch 'master' into EntityCustomName
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
2014-09-23 14:39:49 +02:00
Mattes D 0a651b9fd8 Added Y-wise asserts to signs.
This should help detect #1313's second case.
2014-09-06 18:59:17 +02:00
Mattes D 9f9302f470 Anvil: Fixed an off-by-one error in the loader.
Fixes #1307.
2014-09-06 13:32:16 +02:00
Mattes D 4230eb3d92 Fixed loading empty chunks.
Reported on the Dropper map in #1307.
2014-09-05 22:55:39 +02:00
Mattes D 254c8c9154 Anvil: Fixed loading block entities with invalid Y coord. 2014-09-05 16:40:03 +03:00
madmaxoft d77221c715 Anvil: Cleanly refuse to store data that is too large.
Each chunk in MCA needs to be less than 1 MiB compressed; chunks that are larger will be refused with a log message.
2014-09-04 14:01:06 +02:00
madmaxoft 44c1d9c248 Anvil: switched inflate to stream mode.
This removes the fixed-size buffer which could have caused #1307 and #1366.
2014-09-03 19:36:53 +02:00
madmaxoft a0687b42e4 Clang wants volatile... 2014-09-02 23:05:24 +02:00
madmaxoft 92a60bf4d5 Added strict error reporting to chunk loading.
This should help with #1307.
2014-09-02 22:41:02 +02:00
Howaner 5c53608dd0 Added CustomName saving. 2014-09-02 19:34:58 +02:00
madmaxoft fc7da22738 WSSAnvil: Removed leftover debugging code. 2014-08-30 22:11:52 +02:00
Mattes D 22e3bbd0db Rewritten block entity loading.
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.
2014-08-29 19:19:47 +03:00
madmaxoft 1fa210c7f9 Refactored case-conversion functions.
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
2014-08-04 11:30:20 +02:00
madmaxoft 3136fc6246 Wolf uses UUID for owner.
Fixes #1277.
2014-08-03 22:04:52 +02:00
Howaner 6b1f7e7a45 Renamed "select..." methods to "set..." and better IsValidEffect() function. 2014-07-31 18:15:39 +02:00
Howaner 556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
Howaner dcd226d904 Added beacon load/save. 2014-07-30 22:50:34 +02:00
Tiger Wang 4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
archshift 0298d34406 Moved potion static functions to EntityEffect to create splash potions through world 2014-07-26 03:48:16 -07:00
madmaxoft c0b62ef139 Added a queue for setting chunk data.
Fixes #1196.
2014-07-24 18:32:05 +02:00
Tiger Wang 3385ed56b8 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
2014-07-22 10:24:28 +01:00
archshift f5bcfdc58c Splash potions: Renamed PotionParticleType to PotionColor for clarity 2014-07-19 02:51:39 -07:00
Tiger Wang 37140ae578 Merge branch 'master' into portals
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
2014-07-18 20:10:51 +01:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft 2423fbf2ef Normalized comments.
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.
2014-07-17 22:15:34 +02:00
madmaxoft cc452f51c8 Restructured cSplashPotionEntity code.
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
madmaxoft 8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Howaner 4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
archshift 8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07:00
Tiger Wang 372dbbb994 Merge pull request #1135 from mc-server/fixes
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
Tiger Wang 9e44b0aae1 Implemented trapped chests & others
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
Tiger Wang 89a26cc786 Suggestions 2014-07-02 21:07:34 +01:00
Howaner 20b32fc44e Code fixes. 2014-06-29 01:01:10 +02:00
Howaner 11d02a447e Save IsSheared from Sheep. 2014-06-28 13:19:32 +02:00
Tiger Wang bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
Howaner d4e1277724 Add entity health saving. 2014-06-24 16:06:26 +02:00
Tiger Wang 7615ed90c0 Merge branch 'master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
2014-06-21 22:14:23 +01:00
madmaxoft 79c1966290 MCA saver marks chunks as populated.
Fixes #140.
2014-06-20 21:30:11 +02:00
Tiger Wang ea49abd113 Time and weather is saved, part of #1058
Also fixed unreliability in Health and LootPickup loading.
2014-06-04 20:52:54 +01:00