flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,783 Commits 1 Branch 0 Tags 92 MiB
c2260addf4
Commit Graph

2980 Commits

Author SHA1 Message Date
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
archshift
1d68469718 Fixed "Dependency" typos 2014-07-29 22:43:25 -07:00
Mattes D
b41c8b5de7 Merge pull request #1262 from mc-server/CanBeTerraformed 
Added cBlockInfo::CanBeTerraformed and made finishers use it
 2014-07-30 07:09:33 +02:00
madmaxoft
7022ae7988 Fixed FinishGen.h types. 2014-07-30 07:08:29 +02:00
archshift
487c572429 Entity.h: Moved constants out of some unnamed enum 2014-07-29 19:14:56 -07:00
Howaner
438e4088d6 Changed size_t to 'unsigned long' 2014-07-30 01:22:51 +02:00
Howaner
9a4d80fc3b Fixed compile error with clang. 2014-07-30 00:45:03 +02:00
STRWarrior
931443ac67 Added soulsand to the terraformed list. 2014-07-29 22:40:40 +02:00
STRWarrior
adae2b70b1 Added cBlockInfo::CanBeTerraformed and made finishers use it 
I might have forgotten some of them though
 2014-07-29 22:31:31 +02:00
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Mattes D
30e64ed4d8 Merge pull request #1061 from mc-server/portals 
Portals and others
 2014-07-29 17:48:56 +02:00
Mattes D
d715eb7f5e Merge pull request #1254 from mc-server/SingleTopBlockFinisher 
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
 2014-07-29 17:47:40 +02:00
Mattes D
8287f2d933 Merge pull request #1252 from mc-server/RoughRavinesGen 
Rough ravines gen
 2014-07-29 17:46:57 +02:00
Tiger Wang
cb77b39dc6 Detrailed whitespace 2014-07-29 16:36:24 +01:00
STRWarrior
4ccf14f3b3 Some finishing touches 
Removed whitespace
fixed dead bush comment
 2014-07-29 17:01:15 +02:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
STRWarrior
c8c01b055d Fixed comment above cFinishGenSingleTopBlock 2014-07-29 15:24:11 +02:00
STRWarrior
57bb03148a SingleTopBlock: All blocktypes and biometypes get initialized properly 2014-07-29 13:13:23 +02:00
madmaxoft
1acd03f96f Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API. 2014-07-28 17:09:39 +02:00
STRWarrior
e74984675c Using suggestions 2014-07-28 16:53:01 +02:00
STRWarrior
579f850506 Forgot Mesa Plateau biome. 2014-07-28 14:28:16 +02:00
STRWarrior
bf1aa79932 Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock 
Now accepts a vector of biomes and a vector of allowed blocks.
 2014-07-28 14:23:29 +02:00
madmaxoft
f5f9656917 cAuthenticator: Added GetUUIDsFromPlayerNames(). 2014-07-28 12:37:48 +02:00
STRWarrior
5b69b2ce4f DistortedHeightmap: Now generates gravel in deep ocean. 2014-07-28 12:30:16 +02:00
madmaxoft
fd4ee20b2a Hotfixed compilation problems. 2014-07-27 23:15:51 +02:00
Howaner
2bdc2701f4 Change Group->SetColor() again. 2014-07-27 21:58:00 +02:00
Mattes D
0814a977f8 Merge pull request #1236 from Howaner/Inventory2 
Fix item durability.
 2014-07-27 21:39:39 +02:00
Howaner
3d73040327 Use AString(1, Color[0]) 2014-07-27 21:14:45 +02:00
STRWarrior
d61f1d0f4a NetherClumpGenerator: Fixed generating stuff on halfslabs and fences 2014-07-27 20:48:39 +02:00
Howaner
9be92fa71d Use Color[0]. 2014-07-27 20:44:00 +02:00
madmaxoft
579b80fd3a Added a missing include for abs(float). 2014-07-27 20:08:33 +02:00
madmaxoft
003f0e69a9 Updated NetherForts' weights. 2014-07-27 20:04:55 +02:00
madmaxoft
30893e7ee2 RoughRavines: Made floor and ceiling settings-adjustable. 
The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges.
 2014-07-27 19:57:47 +02:00
madmaxoft
960ab982b9 RoughRavines: Added per-height radius modifier. Ledges! 2014-07-27 16:05:45 +02:00
STRWarrior
3addd4890c Removed forgotten comment 2014-07-27 14:04:34 +02:00
STRWarrior
bfad1be567 Made nether ceiling smooth. 2014-07-27 14:03:23 +02:00
madmaxoft
472f70a676 RoughRavines: More settings - size, width, roughness 2014-07-27 13:54:27 +02:00
Howaner
7f9f46c911 Fixed group color's. 2014-07-27 13:47:21 +02:00
STRWarrior
fe7018bd00 Added a ceiling to disguise the bedrock above it. 2014-07-27 13:12:45 +02:00
STRWarrior
50fc1a5469 NetherClumpFoliage: Fixed assert 2014-07-27 11:59:54 +02:00
Howaner
a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
madmaxoft
ce54936f01 Updated NetherFort prefabs to latest Gallery content. 2014-07-27 00:08:25 +02:00
madmaxoft
77f4297c6e RoughRavines: Initial generator implementation. 
This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values.
 2014-07-27 00:03:26 +02:00
Howaner
f79e682664 Fixed plugin count and fixed plugin loading, when settings.ini was regenerated. 2014-07-27 00:03:00 +02:00
Howaner
c2a2aea9f8 Derp. 2014-07-26 17:09:59 +02:00
Mattes D
56f4174943 Merge pull request #1232 from mc-server/splash-entity 
Moved potion static functions to EntityEffect to create splash potions through the world
 2014-07-26 16:47:11 +02:00
Howaner
6e2025d125 Change comment. 2014-07-26 13:29:25 +02:00
Howaner
ef4d68adfd Merge branch 'master' into Inventory 2014-07-26 13:27:27 +02:00
Howaner
4de8f5ca29 Rename function. 2014-07-26 13:26:14 +02:00
Howaner
ba36e79bc5 Merge branch 'master' into Inventory2 
Conflicts:
	src/BlockInfo.cpp
 2014-07-26 13:23:11 +02:00
archshift
16e0beb5b6 SplashPotionEntity: Use const cItem & instead of a cItem 2014-07-26 03:55:40 -07:00
archshift
60d4a16514 Fixed indentations, removed redundant init code in SplashPotionEntity.cpp 2014-07-26 03:48:16 -07:00
archshift
0298d34406 Moved potion static functions to EntityEffect to create splash potions through world 2014-07-26 03:48:16 -07:00
archshift
1595ef73dc Endianness.h: undefined ntohll before redefining 2014-07-26 03:42:42 -07:00
STRWarrior
a39e19e94a Tweaks to NetherClumpFoliage 
Simplefied the way NetherClupFoliage creates the X and Z coordinate.
 2014-07-25 21:01:40 +02:00
STRWarrior
0f298c8b84 Speed up the NetherClumpFoliage finisher. 
Using IntNoiseXX instead of CubicNoiseXX.
 2014-07-25 14:23:36 +02:00
Tiger Wang
d3012d6904 Merge remote-tracking branch 'origin/master' 2014-07-24 21:38:46 +01:00
Tiger Wang
3a6002de5b Fixed block drops 
* Fixes #1242 (the issue addressed within)
 2014-07-24 21:38:25 +01: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
STRWarrior
9678341a11 Made the cWorld::SpawnMobFinalize function more readable. 2014-07-24 12:15:48 +02:00
Tiger Wang
1156914dd6 Suggestions 2014-07-23 21:12:59 +01:00
tonibm19
997a643977 Moar view distance! 
Let's blow up our computers! :D
 2014-07-23 20:28:56 +02:00
Howaner
396739cc0f Fix item durability. 
Fixes #1181
 2014-07-23 16:32:09 +02:00
STRWarrior
7e38c123fc TallGrass: Less grass on mountains. 2014-07-23 11:23:35 +02:00
STRWarrior
9080f14dc2 Fixed possible crash in the NetherClumpFoliage finisher. 2014-07-23 11:02:42 +02:00
madmaxoft
dfadcf7453 BlockLeaves: Fixed comment style. 2014-07-23 09:12:06 +02:00
madmaxoft
ba8cb3b0a6 Fixed MSVC bindings regeneration. 
Still one typo had been left in the cmake file.
 2014-07-22 23:33:08 +02:00
madmaxoft
e171285408 Fixed Bindings generation in MSVC. 
The bindings weren't regenerated because of the typo in the dependencies cmake variable.
 2014-07-22 23:29:23 +02:00
archshift
f78bf254e3 Merge pull request #1234 from mc-server/GeneratorTweaks 
ExtremeHillsPlus and ExtremeHills spawn with grass only
 2014-07-22 14:20:06 -07:00
archshift
4044d0a6e6 Export SendEntityAnimation to ToLua 2014-07-22 13:10:12 -07:00
Tiger Wang
bc5db3274f Fix misguided comment on bits... 
...obviously written by someone very confused, also known as me
 2014-07-22 21:09:37 +01:00
archshift
9045246e74 Export BroadcastEntityAnimation with ToLua 
Fixes #752
 2014-07-22 13:02:28 -07:00
Tiger Wang
18a0b60c12 Merge remote-tracking branch 'origin/master' into saplingsandleaves 
Conflicts:
	src/Defines.h
 2014-07-22 18:30:31 +01:00
Tiger Wang
a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
STRWarrior
5b148c30f7 Extreme Hills M variant only spawn with grass and stone 
Removed gravel.
 2014-07-22 14:44:26 +02:00
Tiger Wang
0a15e1f420 Suggestion and failed merge fix 2014-07-22 10:33:16 +01: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
31b22e14b7 Updated prefabs to current Gallery content. 2014-07-22 10:04:53 +02:00
Tiger Wang
8050a5b98a Suggestions 2014-07-21 22:49:06 +01:00
STRWarrior
bea574bf54 ExtremeHillsPlus and ExtremeHills spawn with grass only 
Turns out only the M variants have stone and gravel in them.
 2014-07-21 18:53:56 +02:00
madmaxoft
7672418ca8 Merged branch 'origin/Foliage'. 2014-07-21 18:18:54 +02:00
madmaxoft
dd0ab04481 Defines.h: Fixed a warning. 2014-07-21 18:07:51 +02:00
madmaxoft
63cc008340 CheckBasicStyle: Added a lua shebang. 2014-07-21 17:57:50 +02:00
madmaxoft
26ad3dbee4 CheckBasicStyle: Doesn't require LuaFileSystem. 
Instead it uses the list of files generated by CMake.
 2014-07-21 17:40:45 +02:00
madmaxoft
5194eef07d CMake: generates a list of all source files. 
This will be used for the style-checking script.
 2014-07-21 17:40:44 +02:00
madmaxoft
9e7b9a4ebe Normalized spaces after "catch". 2014-07-21 17:40:44 +02:00
madmaxoft
fe6a3b5d72 CheckBasicStyle: Checks spaces after keywords, no space before ")". 2014-07-21 17:40:43 +02: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
STRWarrior
39623251c4 Fixed a missing enter. 2014-07-21 16:34:35 +02:00
STRWarrior
ce956bcdf2 Removed y for-loop. 
Only the top block now gets long grass.
 2014-07-21 16:01:16 +02:00
STRWarrior
0c816dd697 Fixed indentation 2014-07-21 10:58:13 +02:00
archshift
8593d48579 Cuboid: added explicit copy assignment operator 2014-07-20 15:01:15 -07:00
STRWarrior
a4470da876 Changed CubicNoiseXX to IntNoiseXX 
Added some comments
 2014-07-20 22:43:31 +02:00
Mattes D
b41bd2da5c Merge pull request #1213 from mc-server/chat-color 
Refactored cChatColor
 2014-07-20 20:36:08 +02:00
STRWarrior
76b79b51ad Renamed cFinishGenFoliage to cFinishGenTallGrass 
Better grass density
Added double tall grass.
 2014-07-20 19:22:41 +02:00
STRWarrior
51ad6cd1b2 Fixed warnings 2014-07-20 16:31:28 +02:00
STRWarrior
7bf9da7441 First attempt for a new foliage finisher 2014-07-20 16:23:45 +02:00
Tiger Wang
2823ee9026 Revert "Only one instance of server can be started" 
This reverts commit 6484e9814a.

* Fixes #1200
 2014-07-20 13:49:15 +01:00
Tiger Wang
ba24f50e5e Line tracer invalid chunk fix 
* Fixes #1230
* Additionally improved speed in some scenarios
 2014-07-20 13:39:14 +01:00
Tiger Wang
d0e7b2f18b Merge branch 'master' into saplingsandleaves 
Conflicts:
	src/Bindings/DeprecatedBindings.cpp
	src/Blocks/BlockSapling.h
 2014-07-20 12:02:23 +01:00
Tiger Wang
f68b04e029 Proper comment for DropBlock() 2014-07-20 12:00:20 +01:00
archshift
e8262373e1 NBTChunkSerializer.cpp: Added break after serializing the splash potion 2014-07-20 03:19:46 -07:00
Tiger Wang
6ab9afd0fd Bug and crash fixes 
* 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
 2014-07-20 10:46:45 +01:00
archshift
726312602d Added m_TicksAlive to entities, allows projectiles to hit their creators 2014-07-20 01:43:07 -07:00
archshift
9e155c6add Added destroy-timer system to splash potion entities 2014-07-20 01:38:36 -07:00
Howaner
897d68dc35 Add armor items directly to the armor slots. 2014-07-20 01:22:58 +02:00
archshift
14826b6606 main.cpp: field style fixes 2014-07-19 15:44:19 -07:00
archshift
638ea10027 ChatColor.h: The @deprecated tag slipped. Oops. 2014-07-19 15:28:55 -07:00
archshift
1831c2e652 Socket: removed unused Socket destructor 2014-07-19 14:50:31 -07:00
archshift
ed01e12ed7 main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATED 2014-07-19 14:50:01 -07:00
archshift
ada88a5805 Monsters: Made IsUndead overridable by the respective mob classes 2014-07-19 14:35:35 -07:00
archshift
52add840cf Fixed attempts to call c_str on ChatColors 2014-07-19 11:15:21 -07:00
archshift
d5b163bd3d Removed references to deprecated cChatColor::Color 2014-07-19 11:12:34 -07:00
archshift
dd7df28844 Refactored cChatColor 
- Changed std::string fields to const char-pointers in order to wipe out potential issues with static initialization and global destructors
- Deprecated cChatColor::Color() because the name does not match the value
 2014-07-19 11:09:39 -07:00
madmaxoft
e612d07eea CheckBasicStyle: Checks for braces not on separate lines. 
Only the opening braces at the end of a line are checked, others (such as inline getters and setters or initializers) are valid.
 2014-07-19 15:25:28 +02:00
madmaxoft
08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
madmaxoft
822d83009d CheckBasicStyle: Check spaces around commas. 
We want no space in front of and at least one space after a comma.
 2014-07-19 15:08:49 +02:00
madmaxoft
1cb26bda8e Fixed spaces after commas in protocol data. 
The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
 2014-07-19 15:07:28 +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
Mattes D
c2aa7d78bf Merge pull request #1223 from mc-server/fixes 
Fixed small issues throughout the codebase
 2014-07-19 13:31:35 +02:00
madmaxoft
9e7958e7fb Fixed MSVC bindings generation. 2014-07-19 13:22:16 +02:00
archshift
11f8198a80 World.cpp: fixed not all enum fields being used in m_Dimension switch 2014-07-19 02:56:46 -07:00
archshift
7c861f98a2 Minecart: slimmed down SpawnOn by keeping subtype in the payload enum 2014-07-19 02:55:36 -07:00
archshift
f86eefa2ae Trees.cpp: removed unused "debug" fields 2014-07-19 02:54:44 -07:00
archshift
f5bcfdc58c Splash potions: Renamed PotionParticleType to PotionColor for clarity 2014-07-19 02:51:39 -07:00
archshift
93c6520e1e Fixed splash potion color on toss 2014-07-19 02:46:31 -07:00
archshift
041bfd5860 Fixed clamping issues 2014-07-19 01:40:29 -07:00
madmaxoft
c7b7938c04 Renamed AllToLua_lua script. 
Fixes #1222.
 2014-07-19 09:57:23 +02:00
archshift
f94cf49980 Authenticator.cpp: Killed a global destructor warning 2014-07-18 21:38:55 -07:00
archshift
0960e6ae8f Moved Windows custom command to src/CMakeLists.txt 2014-07-18 19:53:47 -07:00
archshift
135dc333c1 CMakeLists: Moved Bindings-specific code to subdir 2014-07-18 19:05:51 -07:00
archshift
3d368b015e Blocks/CMakeLists.txt: Fixed header list after merge of master 2014-07-18 17:41:44 -07:00
archshift
8325304693 CMake: Add Bindings library from subdirectory 2014-07-18 17:41:44 -07:00
archshift
84fef3c156 src/CMakeLists.txt: Replaced glob with list of files 
On MSVC, CMake will traverse all the CMakeLists and add their source and header files to one conglomerate SOURCE list.
 2014-07-18 17:41:44 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
34c8ff7b24 src/CMakeLists: Small changes for increased readability 2014-07-18 17:41:43 -07:00
archshift
dcaa3262a2 OSSupport/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
5d966be741 HTTPServer/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
de48688fdb Generating/Prefabs/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
0859ee3995 Simulator/CMakeLists.txt: Replaced glob with list of files 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
archshift
06bef093bf Generating/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
1a05b7c5d7 BlockEntities/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
5890d04f21 UI/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
15aacc24a5 Protocol/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
archshift
61c4e2e5cb Blocks/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
archshift
465743757a Items/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
archshift
1d8e3e2bb8 Entities/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
archshift
2f811fc6a2 Mobs/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
madmaxoft
76b33970b0 Merge branch 'Inventory2' 2014-07-18 23:51:36 +02:00
madmaxoft
13311c700f Clarified RemoveItem()'s comments. 2014-07-18 23:47:46 +02:00
madmaxoft
44a4a83292 Merge branch 'Entities' 2014-07-18 23:21:04 +02:00
madmaxoft
19d012c96e Fixed slime-related comments. 2014-07-18 23:20:42 +02:00
Howaner
51b91befbd Added RemoveItem() function to the player inventory. 2014-07-18 23:11:59 +02:00
madmaxoft
749f073d70 Merge branch 'Sign' 2014-07-18 22:45:50 +02:00
madmaxoft
23037ce7ec Normalized code style for both sign handlers. 2014-07-18 22:41:48 +02:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01: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
Howaner
44c944716b Removed cBlockSignPostHandler descend. 2014-07-18 17:04:01 +02:00
Howaner
509d3d3b62 Slime sizes are 1, 2 or 4 and not 1, 2 or 3. 2014-07-18 16:55:28 +02:00
Howaner
e32b0ce4fa Moved comment. 2014-07-18 16:38:59 +02:00
Tiger Wang
f1be1eb674 Monster fixes 
* Fixes #1203
* Fixes #627
 2014-07-18 10:47:00 +01:00
archshift
9529a42559 Fixed creative players not being able to drink 
Fixes #1215
 2014-07-18 01:56:26 -07:00
madmaxoft
204b591172 CheckBasicStyle: Proper spaces with commas. 2014-07-18 09:58:29 +02:00
madmaxoft
2df5e26d3b Fixed spaces before commas. 2014-07-18 09:57:34 +02:00
madmaxoft
d52a51f7b6 Removed duplicate IPvX labels. 2014-07-18 09:18:11 +02:00
Mattes D
35d0a0009e Merge pull request #1208 from Howaner/MobInventory 
Spawns skeletons with a bow in their hands
 2014-07-18 09:06:59 +02:00
archshift
ffe44c13d0 Moved ChatColor.h out of defines where it was not needed 2014-07-17 23:25:14 -07:00
archshift
33b0a719da ProtocolRecognizer.cpp: removed unused NumBytesRead 2014-07-17 18:39:44 -07:00
archshift
32b25ec7f7 Generator: removed rnd definitions that are never read 2014-07-17 18:34:47 -07:00
Howaner
eeacb6f222 Added a extra wall sign handler. 
Fixes #1119
 2014-07-18 02:19:30 +02:00
Howaner
33bd78dcdd Skeletons should spawn with a bow in the hand. 
Fixes #1184
 2014-07-18 01:26:27 +02:00
Howaner
2e9aed793a Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary. 2014-07-18 01:16:49 +02:00
Howaner
9c32e31edf Items should first added to the first slot, not the latest. 2014-07-18 01:02:25 +02:00
archshift
bc94ad4b5a Fixed NULL being passed instead of a double to AddEntityEffect 2014-07-17 14:34:58 -07:00
Howaner
fba93aac2a Split into more lines. 2014-07-17 23:32:01 +02:00
Tiger Wang
0f8c24e04d Fixed issues relating to saplings and leaves 
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
 2014-07-17 22:26:53 +01:00
madmaxoft
b2716c720e Fixed code style in Trees.cpp. 
The src folder now has zero BasicStyle violations.
 2014-07-17 23:25:21 +02: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
archshift
488ecb6912 Player.cpp: Fixed compile error 2014-07-17 14:08:54 -07:00
archshift
5c0789e15e Player.cpp: Added Wither death message 2014-07-17 14:08:21 -07:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
Howaner
52d4c49d5c Fixed many slime bugs. 
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
 2014-07-17 22:32:23 +02:00
madmaxoft
7a9f9ab744 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-07-17 22:23:08 +02:00
madmaxoft
a02509ff4b Initial version of a script to check basic style. 
This script reports basic violations of the style, such as indentation using spaces, alignment using tabs, trailing whitespace etc. Passing this script does NOT mean that the style is clean, it's only for fast-checking purposes.
 2014-07-17 22:19:52 +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
Howaner
68cc9c6f91 Fix sapling drop. 2014-07-17 21:35:34 +02:00
madmaxoft
7fff12bfac Fixed spaces around single-line comments. 
There should be at least two spaces in front and one space after //-style comments.
 2014-07-17 19:13:23 +02:00
madmaxoft
993fd14ddf Fixed basic whitespace problems. 
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
 2014-07-17 16:33:09 +02:00
Tiger Wang
3dd9649665 Fixed mob knockback 
* Fixes #901
 2014-07-17 14:32:52 +01:00
Tiger Wang
db36f1a9fa Fixed crash with entities in unloaded chunks 
* Fixes #1190
 2014-07-17 13:54:28 +01:00
Tiger Wang
c3b4b70a73 Merge pull request #1183 from Howaner/Sounds 
Reset meta to zero when the blocks explode
 2014-07-17 10:39:38 +01:00
madmaxoft
70f304a96b Fixed 3 MSVC warnings in SplashPotionEntity. 2014-07-17 11:07:33 +02:00
madmaxoft
430d8b42a5 Updated cPawn::KilledBy signature for custom death messages. 2014-07-17 11:07:10 +02:00
madmaxoft
7d0fc85d00 Merge branch 'master' into potions 2014-07-17 11:01:26 +02:00
madmaxoft
64c8b0d51b Reformatted cItemPotionHandler. 2014-07-17 10:51:44 +02:00
madmaxoft
cd1e6f8ef0 Fixed formatting for cWitherSkullEntity 2014-07-17 10:24:29 +02:00
Mattes D
98244e96d1 Merge pull request #1193 from mc-server/deathmessages 
Death messages
 2014-07-17 10:12:22 +02:00
madmaxoft
e66b81b395 Merge remote-tracking branch 'origin/master' into potions 2014-07-17 10:06:13 +02:00
Tiger Wang
174906efca Another fix for excessive food drain 2014-07-16 22:22:45 +01:00
Tiger Wang
960fcaa90c Fixed a bug with buckets 
* Additionally fixed cLineBlockTracer's EntryFace parameter when a block
was hit on the first iteration along the projected line
 2014-07-16 22:22:00 +01:00
Tiger Wang
9194438fb5 Fixed another redstone simulator crash 2014-07-16 22:21:00 +01:00
Mattes D
e444106d09 Merge pull request #1192 from mc-server/skinuuid 
Skins
 2014-07-16 13:30:57 +02:00
Tiger Wang
c5d00f3ec5 Suggestions 2014-07-16 12:05:09 +01:00
Tiger Wang
2189f37c20 Resolved backwards compatibility issues 2014-07-16 11:38:52 +01:00
Tiger Wang
ad247735fd Function rename 2014-07-16 11:23:26 +01:00
Tiger Wang
f2c4f56ccd Unified functions 
Thanks @Howaner!
 2014-07-16 11:21:02 +01:00
Tiger Wang
1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang
1df5a1f237 Fixed a DropSpenser AddFace bug 2014-07-15 22:53:44 +01:00
madmaxoft
3f8ec7699f Merge remote-tracking branch 'origin/master' into potions 2014-07-15 22:42:00 +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
Tiger Wang
74155f947c Merge pull request #1191 from Masy98/Blocks 
Removed stairs and carpet from IsSolid
 2014-07-15 21:09:41 +01:00
Masy98
b579451731 Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. 2014-07-15 20:34:49 +02:00
Masy98
d272e46821 Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. 2014-07-15 20:32:49 +02:00
Howaner
74b6bf01a9 Derp. 2014-07-15 18:33:28 +02:00
Mattes D
5147220f12 Merge pull request #1189 from Masy98/Blocks 
Added various missing blocks in the lists in BlockInfo.cpp
 2014-07-15 14:54:45 +02:00
madmaxoft
9a970479ef Fixed code formatting. 2014-07-15 14:54:24 +02:00
madmaxoft
639dfdb67d Merge remote-tracking branch 'origin/ClearMetaMixin' 2014-07-15 14:44:18 +02:00
Masy98
7f4029f8f4 Added Brick fence to m_Transparent 2014-07-15 14:06:03 +02:00
Tycho
57f4e871bb Fixed FindClosestPlayer 2014-07-15 12:52:02 +01:00
Masy98
2d245264b1 Added various missing blocks in the lists in BlockInfo.cpp 2014-07-15 13:34:45 +02:00
Tycho
01a31a1872 Added super typedef 2014-07-15 12:27:36 +01:00
madmaxoft
f5259d7651 Only the cEntityEffect::effXXX constants are Lua-exported. 
The rest of the classes don't need exporting, there's no interface using them anyway.
 2014-07-15 11:24:48 +02:00
madmaxoft
5193335efa Reformatted EntityEffect code. 2014-07-15 09:48:11 +02:00
madmaxoft
d274851578 Fixed a MSVC warning in cEntityEffect::CreateEntityEffect(). 2014-07-15 09:43:45 +02:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
madmaxoft
e2a1118f88 Pass cItem by reference. 
Fixes CID 66445.
 2014-07-15 08:48:12 +02:00
madmaxoft
7195c7dfe2 Added missing member initialization to cGridStructGen. 
Fixes CID 68228.
 2014-07-15 08:28:31 +02:00
Tycho
0e5fa2662a COnverted Lilypad back to mixin 2014-07-15 00:01:16 +01:00
Tycho
8fd636aa72 Revert "Converted some blockhandlers to use cClearMetaOnDrop" 
This reverts commit 333f4f982c.
 2014-07-14 23:59:24 +01:00
Tiger Wang
82fe5c05f0 Fixed redstone simulator crash 
* Fixes #1176
* Fixed #1186
 2014-07-14 23:03:30 +01:00
Tiger Wang
5b1552435f Fixed some meta resetting bugs 
* Fixes #1174
* Fixes #1171
 2014-07-14 21:57:44 +01:00
Tiger Wang
ad6494fb36 Maybe improved arrow sinking 2014-07-14 21:56:40 +01:00
Tiger Wang
f0187cc8f9 Fixed placing liquids over liquids 
* Fixes #1182
 2014-07-14 21:55:46 +01:00
archshift
40bb98510a ItemHandler.cpp: removed redundant food and drink checks 2014-07-14 13:46:43 -07:00
archshift
061010288a Readability and clarity changes 2014-07-14 13:46:43 -07:00
Tycho
2cd3443fbb Added documentation 2014-07-14 21:21:17 +01:00
Tycho
333f4f982c Converted some blockhandlers to use cClearMetaOnDrop 2014-07-14 20:50:56 +01:00
Tycho
093b5c6456 Simplified ClearMetaOnDrop 2014-07-14 20:33:30 +01:00
Tycho
515c3cbc67 Added cClearOnDrop Mixin to cPumpkin 2014-07-14 20:28:16 +01:00
Tycho
1929d16724 Added first implementation of cClearMetaOnDrop 2014-07-14 20:26:36 +01:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Howaner
1c6c612f76 Reset meta to zero when the block explode. 2014-07-14 19:07:31 +02:00
Mattes D
a4d9ccded4 Merge pull request #1177 from mc-server/ChestFix 
Fixed Issue with Comparing agast the wrong chest, potentially causing crashes
 2014-07-14 16:29:56 +02:00
archshift
0409daf736 EntityEffect: Inlined functions, added explicit copy constructor and operator. 2014-07-13 15:43:49 -07:00
archshift
f77723128c Changed separating comment style from asterisks to slashes. 2014-07-13 15:23:23 -07:00
Mattes D
69eaa55b55 Merge pull request #1172 from mc-server/coverity_fixes 
Coverity fixes
 2014-07-13 17:10:57 +02:00
worktycho
4315deb90b Added parenthasies 2014-07-13 16:07:35 +01:00
Tycho
6892b448db Merge branch 'master' into ChestFix 2014-07-13 16:03:29 +01:00
worktycho
e1a561286a Fixed Issue with Comparing agast the wrong chest, potentially causing crashes. 2014-07-13 16:03:14 +01:00
worktycho
132b367316 CopyPaste Error 
Fixes CID 70460.
 2014-07-13 15:32:44 +01:00
worktycho
64697f0cab Another COpyPaste Error 
Fixes CID 70461
 2014-07-13 15:29:43 +01:00
Tycho
2a0c041ad8 Adjusted calls to CreateProjectile that passed Items 2014-07-13 15:25:52 +01:00
worktycho
4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01:00
worktycho
bfc485bfe2 Fix CopyPaste error that ment a_MaxRelX wasdn't checked 
Fixes CID 70464
 2014-07-13 15:05:54 +01:00
madmaxoft
31415aec63 Fixed MSVC warnings in SoundEffect functions. 2014-07-13 13:31:09 +02:00
Howaner
9b0b57bcbc Update. 2014-07-13 11:11:40 +02:00
Howaner
e48d172f49 Merge branch 'master' into Sounds 2014-07-13 11:09:19 +02:00
Mattes D
48b5c11022 Merge pull request #1133 from Howaner/Sheep 
Sheep fixes
 2014-07-13 11:04:24 +02:00
Mattes D
398cead1f3 Merge pull request #1166 from Howaner/GlobalFixes 
Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE)
 2014-07-13 11:02:28 +02:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
6484e9814a Only one instance of server can be started 
This disallows the UDP multicasting that the original code enabled.

xoft deterrent, in PR #1151 you implied that this was unwanted behaviour
(but comments gone now as I force pushed - check emails?).

Revert at will if unsatisfactory :P
 2014-07-13 00:17:33 +01:00
Tiger Wang
e11f41d048 Revert failed fix for #31 
This reverts commit 69dc9b4c9a.
 2014-07-13 00:17:31 +01:00
Howaner
dc5c43c0aa Changed comments. 2014-07-13 01:04:43 +02:00
Howaner
4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
Howaner
905fed09a6 Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) 2014-07-13 00:51:42 +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
Tiger Wang
945dfe75d7 Comment grammar correction 2014-07-12 22:52:45 +01:00
Tiger Wang
9f4348fb09 Simplified buckets code slightly 2014-07-12 22:50:28 +01:00
madmaxoft
e2e0f52ecb cNBTChunkSerializer: Fixed alignment. 2014-07-12 23:48:39 +02:00
madmaxoft
d72a81cb8e cHopperEntity: Simplified chest conditions. 2014-07-12 23:34:32 +02:00
madmaxoft
c4f1284d9c cChestEntity: Renamed a member to avoid confusion. 2014-07-12 23:30:34 +02:00
madmaxoft
9ab0f259c7 Fixed alignment. 2014-07-12 23:25:59 +02:00
Tiger Wang
084dec6ccf Merge pull request #1162 from daniel0916/Fixes 
Fix for bucket placing
 2014-07-12 22:09:50 +01: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
daniel0916
68668d7a6e Changes 2014-07-12 12:44:59 +02:00
archshift
8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07:00
archshift
83c69134c0 Merge remote-tracking branch 'origin/master' into potions 2014-07-11 17:37:28 -07:00
archshift
4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07:00
madmaxoft
f73042fb02 Simplified the player data loading. 2014-07-11 23:12:57 +02:00
Tiger Wang
416c160fb5 Suggestions 2014-07-11 19:40:33 +01:00
daniel0916
ca6bcacdb9 Changes 2014-07-11 17:58:35 +02:00
Tiger Wang
6a33fa84ae Suggestions 2014-07-11 12:43:24 +01:00
madmaxoft
ebea2b7efc Player data filenames are based on UUID. 2014-07-11 13:13:10 +02:00
Tiger Wang
df65e8b7bb Improved LinkedPowering speed 
* Additionally fixed wires powering other wires through blocks
 2014-07-11 12:06:16 +01:00
madmaxoft
6cea81e383 Fixed a missing return value. 2014-07-11 00:06:58 +02:00
madmaxoft
2bd486660a Preparation for player UUID-based storage: LoadFromFile() 2014-07-11 00:06:05 +02:00
madmaxoft
729cc7f6ff Fixed style consistency. 2014-07-10 23:04:33 +02:00
madmaxoft
9e22f46b15 Implemented support for forced chunk ticking. 
Fixes #1160.
 2014-07-10 18:18:32 +02:00
daniel0916
a8efb62088 Changes 2014-07-10 17:46:07 +02:00
daniel0916
944c04a209 Maybe fixed whitespaces 2014-07-10 16:38:19 +02:00
daniel0916
47ceb9e79d Maybe fixed whitespaces 2014-07-10 16:36:28 +02:00
daniel0916
a11ad977ce Fixed Bucket Placing 2014-07-10 16:10:42 +02:00
madmaxoft
db75989157 Fixed a missing "inline" keyword. 2014-07-10 12:46:09 +02:00
madmaxoft
ce670accc9 Fixed Vector3.h compilation in MSVC2008. 2014-07-10 12:37:21 +02:00
madmaxoft
a6d30a7254 Removed lilypad from plains village prefabs. 2014-07-10 12:27:08 +02:00