1
0
Fork 0
Commit Graph

480 Commits

Author SHA1 Message Date
Mattes D 1b1f971752 Merge remote-tracking branch 'planetx/master' 2014-12-11 11:17:54 +01:00
Mattes D 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
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 d00ebd7ee7 Merge pull request #1555 from mc-server/c++11
C++11
2014-12-07 15:01:36 +01:00
Mattes D 263fabc816 Replaced most auto_ptr with unique_ptr. 2014-12-06 23:03:17 +01:00
Tiger Wang 3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
Mattes D e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Howaner bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner 2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +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
Tiger Wang 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
Howaner 8b028c5c78 Finished mob spawner implementation. 2014-11-18 15:33:41 +01:00
Howaner 42120e2ea5 Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Howaner 165533c27e Fixed 1.8 world item format reading. 2014-10-29 15:47:43 +01:00
Alexander Harkness 232343065f Fixed compile (typos). 2014-10-27 22:03:11 +00:00
Alexander Harkness b67eb2169e Another one.# 2014-10-27 20:16:51 +00:00
Mattes D f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02: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
Tiger Wang 5089f04cf6 Replace &*[0] accesses with .data() 2014-10-21 13:20:06 +01:00
Tiger Wang 987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang 9e4a5f824a Removed WSSCompact 2014-09-30 22:20:21 +01:00
Tiger Wang d1814d2d67 Merge remote-tracking branch 'origin/master' into chestcarts
Conflicts:
	src/Entities/Minecart.cpp
2014-09-27 18:40:00 +01:00
Howaner 033d16babb Merge branch 'master' into MobSpawner
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
Mattes D 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
madmaxoft 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
Howaner af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
worktycho 411c69b420 Merge pull request #1419 from mc-server/redstoneTests
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
Howaner 749c6092d3 Added type checking to map loading. 2014-09-26 14:31:52 +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
Tycho 9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Howaner 32ecb121a3 derp 2014-09-24 15:30:52 +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
madmaxoft 3676a84916 Fixed cParsedNBT::FindTagByPath().
There was an off-by-one error in the name handling.
2014-09-20 23:01:42 +02:00
Howaner 718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
Tycho 6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tiger Wang 3e74113427 Implemented Chest Minecarts 2014-09-12 23:18:02 +01: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 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
Mattes D 103fa8812d WorldStorage no longer queues chunks into generator. 2014-09-05 23:26:00 +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 137b021d26 Rewritten chunk status to specify whether the chunk is in queue.
This fixes #1370.
2014-09-05 22:16:48 +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
Mattes D c140ba2367 Merge pull request #1351 from LO1ZB/remove-a_RelY
remove y-coord from chunks
2014-09-03 21:47:00 +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
LO1ZB 42fb71f261 commit 2014-09-03 13:52:32 +02:00
LO1ZB a600e3bdfe hopefully the last commit for removing y-coord from chunks. :) 2014-09-03 00:14:51 +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 26b8471280 Merge branch 'master' into fixes 2014-08-30 22:17:49 +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
Tiger Wang 431b7ed0b7 Merge branch 'master' of https://github.com/mc-server/MCServer
Conflicts:
	src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang 114b14faad Removed unused code 2014-08-29 13:44:01 +01:00
LO1ZB 3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Mattes D 64fec204c4 Added initializers for class members.
As reported by Coverity, these weren't initialized.
2014-08-21 22:39:53 +02:00
madmaxoft 7bfb0b05d0 CheckBasicStyle: multi-level indent change. 2014-08-04 13:20:29 +02: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 054ce9bcc4 Anvil: Wolf owner not saved if not present. 2014-08-04 11:29:40 +02:00
madmaxoft 3136fc6246 Wolf uses UUID for owner.
Fixes #1277.
2014-08-03 22:04:52 +02:00
madmaxoft 6ce61d1a6f Fixed a ToLua warning - operator = not supported. 2014-08-03 22:04:48 +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
archshift 4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -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
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft 6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
archshift e8262373e1 NBTChunkSerializer.cpp: Added break after serializing the splash potion 2014-07-20 03:19:46 -07:00
madmaxoft 08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
madmaxoft 00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Mattes D 4293db5eae Merge pull request #1214 from mc-server/anti-glob
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
archshift f5bcfdc58c Splash potions: Renamed PotionParticleType to PotionColor for clarity 2014-07-19 02:51:39 -07:00
archshift 725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift 9fe4b61df3 WorldStorage/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -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 c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02: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
madmaxoft e2e0f52ecb cNBTChunkSerializer: Fixed alignment. 2014-07-12 23:48:39 +02:00
Tiger Wang e71e432633 Suggestions and bug fix
* 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
2014-07-12 22:06:25 +01:00
archshift 8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07:00
Tiger Wang 6a33fa84ae Suggestions 2014-07-11 12:43:24 +01: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 164ffe50ad Made things consistent 2014-07-08 12:34:39 +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 f4e3c01a71 Various fixed
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
2014-07-04 16:49:24 +01:00
madmaxoft 632e8680b1 Removed world-saving log messages.
Ref.: http://forum.mc-server.org/showthread.php?tid=1518
2014-07-04 11:50:50 +02:00
Tiger Wang 89a26cc786 Suggestions 2014-07-02 21:07:34 +01:00
Tiger Wang b94fef3089 Removed unneeded code 2014-06-30 19:15:10 +01:00
Tiger Wang dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +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
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Howaner c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner 46b84aa8b6 The motion is already set in AddBasicEntity() 2014-06-17 01:17:35 +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
Tiger Wang 9c7a6bc443 Health of monsters is now saved 2014-06-04 20:09:02 +01:00
Tiger Wang c4e0da2d0a Fixed mob loading, part of #1058 2014-06-04 09:22:19 +01:00
Howaner 142fa83124 Code improvements 2014-05-28 19:32:20 +02:00
Howaner e7a7c45c36 Add throw sound and fix arrow server crash. 2014-05-28 16:39:59 +02:00
Tycho 4ab8288116 Merge branch 'master' into chunksparsing/structs 2014-05-24 12:44:49 +01:00
Tycho 024027db89 Renamed cChunkBuffer to cChunkData 2014-05-21 19:58:48 +01:00
Mattes D ac00568183 Merge pull request #998 from mc-server/StatManager
Statistic Manager
2014-05-18 22:30:34 +02:00
Tycho 8a0d3f7921 Fixed issue with types not being defined for an unused parameter 2014-05-18 15:37:17 +01:00
andrew 466ff2204f Fixes 2014-05-13 14:53:15 +03:00
archshift 3a5e04d118 More switch warnings. 2014-05-11 16:54:42 -07:00
archshift 3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07:00
archshift 6c57b38b74 Fixed a warning and a complaint about a never-read variable. 2014-05-11 13:44:30 -07:00
andrew e3c6c8f3dd Fixed stat serialization 2014-05-11 20:30:54 +03:00
andrew c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Tycho d478e3cfb1 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.h
2014-05-10 05:05:44 -07:00
Mattes D a38d8b6513 Merge pull request #992 from mc-server/coverity_fixes
Coverity fixes
2014-05-09 21:20:27 +02:00
Mattes D a2e18f0e01 Fixed size_t in FireworksSerializer. 2014-05-09 20:32:27 +02:00
Mattes D 1a5a123301 Fixed message formatting. 2014-05-09 20:16:29 +02:00
Mattes D 294b7ca24a Even more size_t fixes. 2014-05-09 20:05:00 +02:00
Mattes D d67ea97a26 More size_t fixes. 2014-05-09 19:57:59 +02:00
Mattes D 5b54dc3eac Build fixes after the last size_t batch. 2014-05-09 19:33:22 +02:00
worktycho c4cd201f18 Range Check on schematic size
Fixes CID 55830
2014-05-09 17:39:13 +01:00
Mattes D fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
worktycho 99af4453ef Check the height and width values read.
Fixes CID 55831
2014-05-09 17:30:47 +01:00
Mattes D d1b719885d Merge pull request #989 from Howaner/Anvil
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
2014-05-07 22:18:53 +02:00
Howaner fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner 80bcc43c7b Fix MagmaCube save. 2014-05-07 12:43:21 +02:00
Howaner d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
Tycho ec407dd27d Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
2014-05-03 06:07:56 -07:00
madmaxoft b6b86b7270 Fixed warnings in FastNBT. 2014-05-01 22:43:37 +02:00
Tycho 8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07:00
madmaxoft 772b57ca04 Anvil saver pads data to 4K boundaries.
Fixes #524.
2014-05-01 18:00:10 +02:00
Mattes D 709015369d Merge pull request #940 from Howaner/GlobalFixes
Add entity invulnerable
2014-04-28 20:58:15 +02:00
Howaner 26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new."
This reverts commit d50f8f6f11.
2014-04-28 13:51:22 +02:00
Mattes D c063051645 Merge pull request #954 from mc-server/projectiles-split
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift 9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
Mattes D a0f6149d05 Merge pull request #948 from jfhumann/staticFixes
Fixes motivated by Coverity #1
2014-04-27 17:00:37 +02:00
Tycho 57b8ee9163 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift cb93a57963 Moved cGhastFireballEntity out of ProjectileEntity.h 2014-04-26 17:41:07 -07:00
archshift de7eaa5735 Moved cFireChargeEntity out of ProjectileEntity.h 2014-04-26 17:35:31 -07:00
archshift 08b77f4880 Moved cThrownSnowballEntity out of ProjectileEntity.h 2014-04-26 17:24:44 -07:00
archshift bc5c28a0be Moved cThrownEnderPearl out of ProjectileEntity.h 2014-04-26 17:08:39 -07:00
archshift de23a115a5 Moved cThrownEggEntity out of ProjectileEntity.h 2014-04-26 17:02:47 -07:00
archshift 477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Tycho e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
archshift aef2c8ec62 Further refactored, Reverted Minecart change
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00
Howaner 49f6819829 Fixes 2014-04-26 16:44:15 +02:00
archshift b2f40a7a11 Removed unused assignments. 2014-04-25 18:18:46 -07:00
jfhumann c8d5fcfffa Fix for minor resource leak (CID 43616) 2014-04-26 00:43:01 +02:00
archshift d64e46186f Merge remote-tracking branch 'upstream/master' 2014-04-25 10:50:10 -07:00
archshift e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
archshift 62e5234535 Small changes; warning fixing. 2014-04-24 20:25:03 -07:00
archshift 8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07:00
archshift 06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
jfhumann 67344a3782 Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tiger Wang 82b3d543e7 Rewrote redstone powering to use power levels 2014-04-15 13:15:56 +01:00
Tycho 10e72a122c Removed check for enqueuing a chunk that is already enqueued to be loaded
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
2014-04-08 08:43:28 -07:00
madmaxoft 396abb5db6 Fixed silly Clang's warnings in FastNBT. 2014-04-04 10:19:21 +02:00
Tycho b449ad8613 Merge branch 'MacFixes'
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
2014-04-02 06:54:57 -07:00
madmaxoft bcd7f9669b Added schematic string serializer self-test. 2014-04-02 11:56:27 +02:00
madmaxoft 87e0bd54b4 BlockArea: Switched internal coords to Vector3i. 2014-03-25 21:59:41 +01:00
Mattes D cac5149974 Merge pull request #833 from mc-server/EnderCrystal
Ender crystals
2014-03-25 21:02:23 +01:00
andrew 2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
Samuel Barney 71e9133e49 Added one more missing newline. 2014-03-25 10:34:31 -06:00
andrew 6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft 9447cd20f3 Fixed a crash in firework rockets.
Fixes #816.
2014-03-17 22:12:02 +01:00
Mattes D dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
Howaner 4e0edc9fa7 Add anvil direction. 2014-03-16 17:42:23 +01:00
Howaner d6edd5f24e Remove old debug messages. 2014-03-15 11:53:55 +01:00
Howaner 8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00