b268db4caa
Use cChunkDef::Height for Y coord comparison where applicable.
2016-09-27 14:32:20 +02:00
d2e8643607
Fixed type-casting-related warnings.
2016-08-24 22:26:53 +02:00
8eaa8613da
CMake: Remove needless minimum version specifications.
2016-07-18 22:11:42 +02:00
a781be5456
SelfTests: Moved SchematicFileSerializer test into a separate project.
2016-06-18 13:12:08 +02:00
ca6ef58b1e
Bulk clearing of whitespace
2016-02-05 23:50:18 +02:00
752d99c8b8
MCServer to Cuberite
2016-01-29 21:47:00 +02:00
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
80e1eb37dd
Renamed leftover strings to Cuberite / Server, as needed.
...
Also upgraded the user setting file for MSVC to 2013.
2016-01-01 21:05:09 +01:00
1ee61c4f23
Fix off by two error in ReadString
2015-12-18 15:53:41 +00:00
456253c651
Check for invalid tags when reading a compound tag
2015-12-18 15:20:24 +01:00
9e6161305d
Fixed String Parsing crash bug
...
Check string length against actual remaining data, not an abitary constant
2015-12-18 12:08:55 +01:00
d05fdbdee9
Test for correct coordinates when fishing
...
Fun fact: this was able to actually deadlock the server depending on where you were standing :)
2015-12-10 20:54:55 +01:00
48f84cc3e9
changed mob age from char to int
2015-11-16 14:13:44 +01:00
9749c3aac9
Implemented brewing
2015-11-03 18:00:55 +01:00
079bb7c016
Update Loops required for JsonCPP
2015-10-26 00:16:35 +00:00
9da404ea2d
Fixed a race condition between chunk loader and generator.
...
When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded.
Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not.
2015-10-04 14:06:37 +02:00
82d9ac1e1c
Namechange to Cuberite
2015-09-25 10:14:17 +02:00
6e4122e551
Unified the doxy-comment format.
2015-07-31 16:49:10 +02:00
d2a0c85764
Chunks that fail to load are offloaded to extra files.
...
Ref.: #1970
2015-07-31 08:49:23 +02:00
08aa3f6ff5
Added reason parameter to load failures.
2015-07-31 08:48:23 +02:00
7379848ae5
Moved AString reading hack to cFile.
2015-07-31 08:48:22 +02:00
804805d35a
Silenced and fixed many warning messages across multiple files.
2015-07-29 09:49:30 -06:00
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
0c3a3427cd
Merge pull request #2340 from hallucino/ageable-mobs
...
Support ageable mobs
2015-07-15 09:57:04 +02:00
53207d3f18
Support ageable mobs
...
Move ageable stuff in Monster directly
2015-07-14 22:41:31 +02:00
0cb0bbe51a
Changing the shared_ptr/unique_ptr constructors to the make_shared/make_unique functions
2015-07-12 21:02:47 +02:00
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
8df31067d4
Externalized cPrefabPiecePool self-test.
2015-06-19 16:15:59 +02:00
882f7c70c0
Fixed log files' timestamps
...
Also made Release mode log less technical information about the world
storage threads.
2015-06-14 11:23:14 +01:00
d390214929
SelfTests are registered and executed after logging framework init.
...
Fixes #2228 .
2015-06-11 22:20:04 +02:00
e82cd6e4eb
Fixes multiple furnace issues, including from loading world storage
2015-06-03 02:19:22 -07:00
48c153bf53
Fixed warnings in MSVC.
...
It complained about undefined return values or using uninitialized variables.
2015-06-02 12:51:43 +02:00
95b81b3ef1
Disable -Werror for warnings in tests.
2015-05-24 14:16:05 +01:00
dae9e5792a
Made -Weverything an error.
2015-05-24 12:56:56 +01:00
77f1f58c0a
Make -Werror disabling file only
...
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
846d16315a
CheckBasicStyle: checks spaces around * and &.
2015-05-09 12:58:55 +02:00
c13b1931ff
More style checking.
...
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
6caf08da99
cSetChunkData constructor explicitly requires std::move() instead of
...
unsafely stealing data
2015-04-27 21:18:56 +02:00
3d398baf35
cPainting saving implemented
...
Additionally, it now inherits from cHangingEntity.
2015-03-13 23:05:06 +00:00
e15e30a030
Fixed confusion over Item Frame directions
2015-03-13 22:29:27 +00:00
1a60785ca2
Flower pots: In 1.8 items are saved with the name and not the id.
2015-02-18 23:33:27 +01:00
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
268ea71e4a
Fixed negative return values in SchematicFileSerializer.
...
Fixes CID 103165.
2015-01-23 10:03:39 +01:00
2df8e4863f
Fixed warnings in FastNBT.cpp.
2015-01-20 23:52:53 +01:00
f232704203
WSSAnvil: Added clamping to entity coords.
...
Fixes CID 72854.
2014-12-21 22:37:48 +01:00
e192da5316
FastNBT: Added a sanity check for number of list items.
...
Fixes CID 55812.
2014-12-21 22:25:01 +01:00
6e8e1c6d8d
Added Rabbits
2014-12-20 10:31:34 +01:00
c836b52dd1
Added Entity Guardian
2014-12-18 19:30:32 +01:00
781b3303a5
Merge pull request #1657 from mc-server/PrepareChunk
...
Prepare chunk
2014-12-11 17:06:18 +01:00
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
1b1f971752
Merge remote-tracking branch 'planetx/master'
2014-12-11 11:17:54 +01:00
fcd3d1bfed
Added a cWorld:PrepareChunk function.
...
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
2014-12-10 22:35:16 +01:00
ce3adf89fa
Check to see if header write out is required
2014-12-08 11:23:19 -08:00
1674f505f8
Added timestamp to merged files WSSAnvil
2014-12-08 08:28:44 -08:00
65c1d4f7b6
Added timestamp to merged files WSSAnvil
2014-12-08 08:26:37 -08:00
a1da0e7205
Added timestamp to new files WSSAnvil
2014-12-08 08:22:40 -08:00
8f5e861674
Added Timestamp info to chunks in WSSAnvil
2014-12-07 14:44:08 -08:00
d00ebd7ee7
Merge pull request #1555 from mc-server/c++11
...
C++11
2014-12-07 15:01:36 +01:00
263fabc816
Replaced most auto_ptr with unique_ptr.
2014-12-06 23:03:17 +01:00
3acdf25b05
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
e2a04f580a
BasicStyle: Added missing braces to control statements.
2014-12-05 16:59:11 +01:00
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
bcbd73f7d8
MobSpawner fixes.
2014-12-01 14:58:13 +01:00
2478e290f9
Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.
2014-11-29 15:20:44 +01:00
648fee1a08
Merge branch 'master' into MobSpawner
2014-11-29 12:05:35 +01:00
0ca891da6d
WSSAnvil: Fixed bad code in arrow loading.
2014-11-26 10:14:11 +01:00
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
8b028c5c78
Finished mob spawner implementation.
2014-11-18 15:33:41 +01:00
42120e2ea5
Merge branch 'master' into MobSpawner
...
Conflicts:
MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
165533c27e
Fixed 1.8 world item format reading.
2014-10-29 15:47:43 +01:00
232343065f
Fixed compile (typos).
2014-10-27 22:03:11 +00:00
b67eb2169e
Another one.#
2014-10-27 20:16:51 +00:00
f8c54f4243
Merged branch 'master' into c++11.
2014-10-23 08:40:39 +02:00
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
b979cad893
cItemFrame: Fixed a forgotten rename.
2014-10-21 22:32:17 +02:00
a42fa071bc
Properly exported cItemFrame and cHangingEntity to Lua.
2014-10-21 22:02:30 +02:00
5089f04cf6
Replace &*[0] accesses with .data()
2014-10-21 13:20:06 +01:00
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
9e4a5f824a
Removed WSSCompact
2014-09-30 22:20:21 +01:00
d1814d2d67
Merge remote-tracking branch 'origin/master' into chestcarts
...
Conflicts:
src/Entities/Minecart.cpp
2014-09-27 18:40:00 +01:00
033d16babb
Merge branch 'master' into MobSpawner
...
Conflicts:
src/MobSpawner.h
src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
305778f22f
Merge pull request #1456 from Howaner/Fixes
...
Fixed player custom names in 1.8 and added type checking to map loading
2014-09-26 23:01:22 +02:00
0d83477540
Fixed UNUSED macro so that it doesn't require type knowledge.
...
Introduced new UNUSED_VAR macro that is used when type knowledge is available (for local variables).
2014-09-26 22:53:39 +02:00
af997a09ca
Merge branch 'master' into Fixes
2014-09-26 22:23:36 +02:00
411c69b420
Merge pull request #1419 from mc-server/redstoneTests
...
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
749c6092d3
Added type checking to map loading.
2014-09-26 14:31:52 +02:00
7cdcf0a883
Anvil: Arrow Tile tags are a short in Vanilla
2014-09-25 19:01:44 +02:00
daf5127b28
Fixed hanging direction bugs.
2014-09-25 18:37:24 +02:00
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
32ecb121a3
derp
2014-09-24 15:30:52 +02:00
1d588b5195
Don't create two entity lists.
2014-09-24 15:17:20 +02:00
65077c314a
Merge branch 'master' into WorldLoader
2014-09-24 15:00:49 +02:00
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
2832685c02
Merge branch 'master' into WorldLoader
2014-09-23 22:16:05 +02:00
0b40ce971c
Fixed a crash in WSSAnvil.
...
Reported as #1448 .
2014-09-23 22:12:47 +02:00
366af5067b
MCServer world compatiblity with vanilla and mcedit.
2014-09-23 19:16:17 +02:00
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
3676a84916
Fixed cParsedNBT::FindTagByPath().
...
There was an off-by-one error in the name handling.
2014-09-20 23:01:42 +02:00
718eb227ab
Implemented mob spawner.
2014-09-19 23:00:54 +02:00
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
3e74113427
Implemented Chest Minecarts
2014-09-12 23:18:02 +01:00
0a651b9fd8
Added Y-wise asserts to signs.
...
This should help detect #1313's second case.
2014-09-06 18:59:17 +02:00
9f9302f470
Anvil: Fixed an off-by-one error in the loader.
...
Fixes #1307 .
2014-09-06 13:32:16 +02:00
dd0aa22d2e
Fixed scoreboard loader type checks.
...
Fixes scoreboard loading error reported on the Dropper map in #1307 .
2014-09-06 13:11:08 +02:00
103fa8812d
WorldStorage no longer queues chunks into generator.
2014-09-05 23:26:00 +02:00
4230eb3d92
Fixed loading empty chunks.
...
Reported on the Dropper map in #1307 .
2014-09-05 22:55:39 +02:00
137b021d26
Rewritten chunk status to specify whether the chunk is in queue.
...
This fixes #1370 .
2014-09-05 22:16:48 +02:00
254c8c9154
Anvil: Fixed loading block entities with invalid Y coord.
2014-09-05 16:40:03 +03:00
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
c140ba2367
Merge pull request #1351 from LO1ZB/remove-a_RelY
...
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
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
42fb71f261
commit
2014-09-03 13:52:32 +02:00
a600e3bdfe
hopefully the last commit for removing y-coord from chunks. :)
2014-09-03 00:14:51 +02:00
a0687b42e4
Clang wants volatile...
2014-09-02 23:05:24 +02:00
92a60bf4d5
Added strict error reporting to chunk loading.
...
This should help with #1307 .
2014-09-02 22:41:02 +02:00
5c53608dd0
Added CustomName saving.
2014-09-02 19:34:58 +02:00
26b8471280
Merge branch 'master' into fixes
2014-08-30 22:17:49 +02:00
fc7da22738
WSSAnvil: Removed leftover debugging code.
2014-08-30 22:11:52 +02:00
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
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
114b14faad
Removed unused code
2014-08-29 13:44:01 +01:00
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
64fec204c4
Added initializers for class members.
...
As reported by Coverity, these weren't initialized.
2014-08-21 22:39:53 +02:00
7bfb0b05d0
CheckBasicStyle: multi-level indent change.
2014-08-04 13:20:29 +02:00
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
054ce9bcc4
Anvil: Wolf owner not saved if not present.
2014-08-04 11:29:40 +02:00
3136fc6246
Wolf uses UUID for owner.
...
Fixes #1277 .
2014-08-03 22:04:52 +02:00
6ce61d1a6f
Fixed a ToLua warning - operator = not supported.
2014-08-03 22:04:48 +02:00
6b1f7e7a45
Renamed "select..." methods to "set..." and better IsValidEffect() function.
2014-07-31 18:15:39 +02:00
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
dcd226d904
Added beacon load/save.
2014-07-30 22:50:34 +02:00
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
0298d34406
Moved potion static functions to EntityEffect to create splash potions through world
2014-07-26 03:48:16 -07:00
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
c0b62ef139
Added a queue for setting chunk data.
...
Fixes #1196 .
2014-07-24 18:32:05 +02:00
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
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
e8262373e1
NBTChunkSerializer.cpp: Added break after serializing the splash potion
2014-07-20 03:19:46 -07:00
08748bafe2
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
4293db5eae
Merge pull request #1214 from mc-server/anti-glob
...
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
f5bcfdc58c
Splash potions: Renamed PotionParticleType to PotionColor for clarity
2014-07-19 02:51:39 -07:00
725d1fd1e2
Subdirs: Only add_library if not using MSVC
2014-07-18 17:41:43 -07:00
9fe4b61df3
WorldStorage/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
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
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
Moritz Borcherding
Mattes D
LogicParrot
Mathias
bibo38
worktycho
Gargaj
Julian Laubstein
Lukas Pioch
Samuel Barney
NiLSPACE
Hallucino
Tiger Wang
HaoTNN
Woazboat
Howaner
Matyas Dolak
Masy98
planetx
Alexander Harkness
Alexander Harkness
Tycho
LO1ZB
archshift