flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,415 Commits 1 Branch 0 Tags 92 MiB
f657193f45
Commit Graph

5338 Commits

Author SHA1 Message Date
LogicParrot
bc4a6ec3ea Merge pull request #2877 from LogicParrot/spawn2 
Fixed non-natural spawning near player (egg, breeding, etc.)
 2016-01-16 17:02:06 +02:00
LogicParrot
ac2c79f797 Fixed non-natural spawning near player (egg, breeding, etc.) 2016-01-16 16:40:47 +02:00
LogicParrot
8c12227687 Fix crash when tamed wolf is hit by arrows 2016-01-16 16:37:37 +02:00
LogicParrot
5ca2f4fd0c Merge pull request #2875 from LogicParrot/fallDamage 
Fix fall damage crash when tamed wolves neabry
 2016-01-16 11:56:19 +02:00
LogicParrot
0601adba25 Fix fall damage crash when tamed wolves neabry 2016-01-16 11:29:11 +02:00
bibo38
41aa7cf123 Limited the username length to 16 characters. 
This fixes a client crash, because Minecraft requires that a username is not longer than 16 characters.
See also: http://minecraft.gamepedia.com/The_Player#Name
Fixes #2545
 2016-01-13 09:55:48 +01:00
LogicParrot
e77af000df Do not spawn mobs too close to player 2016-01-12 15:47:13 +02:00
LogicParrot
062b51c822 Merge pull request #2862 from LogicParrot/creeper 
Fixed creeper calling TargetIsInRange with null m_Target
 2016-01-12 15:42:39 +02:00
LogicParrot
3a24ed4b61 Fixed creeper calling TargetIsInRange with null m_Target 2016-01-12 15:26:51 +02:00
LogicParrot
41f2b6c99f Fixed crash introduced by #2821 2016-01-12 15:13:53 +02:00
LogicParrot
d4e99aedb1 Merge pull request #2859 from LogicParrot/attack2 
Fix mob attack interval
 2016-01-12 14:46:02 +02:00
LogicParrot
21df3cb0d8 Fix mob attack interval 2016-01-12 14:20:17 +02:00
LogicParrot
e0f13f9f26 Friendly wolf attack safety checks 2016-01-12 13:27:03 +02:00
LogicParrot
e2a053263f Merge pull request #2857 from LogicParrot/wolf 
AI: Tamed wolf defends owner
 2016-01-12 12:13:36 +02:00
LogicParrot
359e772dee Tamed wolf assists owner (attack / defence) 2016-01-12 11:47:59 +02:00
Mattes D
e4adf2f9ae Added detailed logging to cBlockArea::Read() bad Y coords. 
Ref.: http://forum.mc-server.org/showthread.php?tid=2307
 2016-01-12 10:19:44 +01:00
Lukas Pioch
fe72eaaec2 Exported GetSeed to lua and added file extension opendb to .gitignore. 2016-01-12 10:18:24 +01:00
LogicParrot
a4a17a2953 Merge pull request #2821 from LogicParrot/world2 
Fix pre - #2815 default world linkage configs
 2016-01-12 10:24:44 +02:00
worktycho
7aa0b7299d Merge pull request #2855 from bibo38/mobheads 
Changed the format of the MobHead data
 2016-01-11 23:52:25 +00: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
Austin Martin
8c7cc3ffe9 Fixed issue #2218 2016-01-10 20:53:02 -05:00
Mattes D
725db4475c Added "core.help" permission to Default rank. 2016-01-10 17:40:25 +01:00
bibo38
a45315ee74 Fixed not working packet decompression 
A compressed packed contains always the uncompressed size, but in the code this size was threatened as the compressed data size. This created a failure, when the client compressed a packet.
See: http://wiki.vg/Protocol#With_compression
Fixes #2841
Fixes #2467
 2016-01-10 15:16:29 +01:00
Mattes D
491dbda7d3 Fixed Clang warnings. 2016-01-06 16:20:12 +01:00
Mathias
d17c8fa349 Fixed typo 2016-01-03 16:29:04 +02:00
Mathias
8e2b2e7a18 More blocks that can't be mined with silktouch 2016-01-03 16:27:02 +02:00
Arnaud Meuret
e19109465d Fix typo (ammount) 2016-01-02 22:02:02 +01:00
Mattes D
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
Mattes D
6c9be8df4b Fixed default Nether generator params. 
The prefab file is "NetherFort"
 2015-12-30 13:37:28 +01:00
Mattes D
0054104017 Fixed problems in cBlockingSslClientSocket. 2015-12-30 13:00:02 +01:00
Mattes D
902f428342 Fixed the monster burn code. 
The old code failed when the monster was out of Y range.
 2015-12-30 01:15:13 +01:00
Mattes D
78eb4c8ed8 Removed excessive logging in redstone simulator. 2015-12-28 11:06:41 +01:00
LogicParrot
fc8a117a0c Deleted cPath::BlockTypeIsFence 2015-12-27 16:13:44 +02:00
Safwat Halaby
bfafc39576 Merge pull request #2814 from SafwatHalaby/chunk2 
Freeze player until chunk is loaded
 2015-12-26 21:08:12 +02:00
worktycho
b99b60720a Merge pull request #2820 from cuberite/UrlParser 
Added the cUrlParser class, exported to Lua API.
 2015-12-26 19:01:37 +00:00
Mattes D
958df6ad91 Added the cUrlParser class, exported to Lua API. 2015-12-25 18:50:25 +01:00
Safwat Halaby
687d1816c4 Update fences and gates list 
Update fences and gates list
 2015-12-25 19:19:22 +02:00
Safwat Halaby
400f875918 Freeze player until chunk is loaded 2015-12-25 17:47:06 +02:00
Safwat Halaby
6a22605fae Merge pull request #2795 from SafwatHalaby/doors 
"Special blocks" handling
 2015-12-25 15:03:39 +02:00
Safwat Halaby
74912a2aaf Fix pre - #2815 default world linkage configs 2015-12-25 14:59:54 +02:00
Safwat Halaby
b4649248d1 Nether and End in settings.ini by default, and created at startup 2015-12-25 13:49:13 +02:00
Safwat Halaby
87b2d60a0e Merge pull request #2816 from SafwatHalaby/redstone 
Silenced the Redstone Simulator console spam
 2015-12-24 18:57:34 +02:00
Safwat Halaby
75fea3cd1e Silenced the Redstone Simulator console spam 2015-12-24 17:58:34 +02:00
Mattes D
122d824a8a Added a Json parser and serializer to Lua API. 2015-12-24 14:00:31 +01:00
Safwat Halaby
dfeced18b2 PF - "Special blocks" handling 2015-12-24 06:20:16 +02:00
Julian Laubstein
d319c9dd58 Added IsBlockFence method to defines 2015-12-24 00:05:49 +01:00
Julian Laubstein
2713577dbf Fixed builds on FreeBSD 32bit 2015-12-23 17:13:47 +01:00
Safwat Halaby
7285a43cf6 Merge pull request #2806 from SafwatHalaby/gargraj-chicken 
[Gargaj] - Baby chickens don't lay eggs
 2015-12-23 16:31:35 +02:00
Safwat Halaby
1ccf7d9c8a Chicken egg code early bailout 2015-12-23 15:57:26 +02:00
Gargaj
fd2edf3ecf Baby chickens don't lay eggs 2015-12-23 15:54:07 +02:00
Mattes D
8422ada77f Fixed return value description in doxycomment. 2015-12-23 14:17:04 +01:00
Gargaj
8968a7174e add handling of water bottle 2015-12-22 20:25:59 +01:00
worktycho
76cd723867 Added GeoTrust Root Certificate 2015-12-22 16:08:02 +00:00
worktycho
ecb94e0dc6 Ignore == if followed by \ 
Ignore the space before == rule if immediately followed by a \. If it is imediatly followed by a \, then this is likely the base64 padding at the end of a certificate, which is followed by \n.
 2015-12-22 16:08:02 +00:00
Safwat Halaby
d112632d6a Merge pull request #2788 from SafwatHalaby/jump 
PF - Improved mob jumping
 2015-12-22 07:42:28 +02:00
then0rTh
4d264b8b33 cTeam:GetName returning wrong name 2015-12-21 20:25:33 +01:00
Safwat Halaby
8b4530740e PF - Improved mob jumping 2015-12-21 20:00:25 +02:00
Safwat Halaby
b4874d213c Revert "Changed cPath to have a reset method". 2015-12-21 16:47:43 +02:00
Lukas Pioch
938833bd6b Fixed spawn point. Wrong number for divisions and wrong highest spawn point. 2015-12-20 13:05:43 +01:00
tycho
d4289eee3c Fix race condition 2015-12-20 00:56:55 +01:00
Lukas Pioch
50a908fdc9 Fixes for clang-3.7 2015-12-19 22:43:37 +01:00
Tiger Wang
b8752bb26e Merge pull request #2542 from Haxi52/pinkstone 
Reorganised the redstone simulator
 2015-12-19 21:20:56 +00:00
tycho
d01562cb7d Use atomic bool for isthread terminate 2015-12-19 19:29:06 +01:00
Alexander Harkness
8b851d5048 Added HTTPS links wherever they are supported. 2015-12-19 14:30:32 +00:00
worktycho
1ee61c4f23 Fix off by two error in ReadString 2015-12-18 15:53:41 +00:00
tycho
456253c651 Check for invalid tags when reading a compound tag 2015-12-18 15:20:24 +01:00
Tiger Wang
5b62c4c314 Reorganised the redstone simulator 
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
 2015-12-18 13:17:38 +00:00
Mattes D
086c8b1834 Revised the explosion-related Lua API and docs. 
Fixes #2746.
 2015-12-18 12:40:34 +01:00
Mattes D
d135e49451 Removed unused class cChunkDataCollector. 2015-12-18 12:24:47 +01:00
tycho
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
Mattes D
f060d9f9b0 PieceStructures generator: Fixed wrong merge conflict resolution. 
Also improved reporting messages.
Ref.: http://forum.mc-server.org/showthread.php?tid=2256
 2015-12-17 19:33:12 +01:00
Lukas Pioch
d620dcdd08 Moved variables into scope, removed unused variables and fixed variables 2015-12-17 10:48:36 +01:00
Safwat Halaby
3c1f9e8a3a Merge pull request #2753 from cuberite/pathFix 
Path fix
 2015-12-16 18:39:23 +02:00
tycho
2c0ca0b4c3 Changed cPath to have a reset method. 
Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak"

This reverts commit 1515d37684.
 2015-12-16 10:49:42 +00:00
Gargaj
68ff0edfde allow horse control (still quite buggy) 2015-12-15 21:14:27 +01:00
tycho
0fb8646198 Delete copy and move constructors from cPath 
cPath is not safe to copy or move due to pointers into the std::map m_Map.
 2015-12-15 19:18:58 +00:00
Julian Laubstein
5af10b8cd3 Fixed warning regarding an uninitialized value 2015-12-15 17:20:34 +01:00
Julian Laubstein
8d5f4f2160 Fixed warning regarding an uninitialized value 2015-12-15 17:06:32 +01:00
Lukas Pioch
1515d37684 Changed raw cPath to an unique_ptr, fixes memory leak 2015-12-15 01:16:36 +01:00
worktycho
1e5ba8a1bb Merge pull request #2638 from Gargaj/master 
Implement block heights + adapt ground checks
 2015-12-14 20:31:33 +00:00
Julian Laubstein
378b2b8ca6 Strip meta from hopper on converting to pickup 2015-12-13 15:46:43 +01:00
Gargaj
66e6589883 blockheight mechanism 2015-12-13 15:16:15 +01:00
Safwat Halaby
1540867cb5 Set overgrown wart age to 3 2015-12-13 15:55:09 +02:00
Gargaj
f9008a4860 allow use failures to propagate from the entity/block to the player 2015-12-13 13:27:38 +01:00
Gargaj
e31676fe50 snow golems are "neutral" 2015-12-13 13:13:37 +01:00
Gargaj
0eb519b35a sheep color inheritance 2015-12-13 13:04:18 +01:00
Safwat Halaby
4851f5e2c9 Remove stray "return" 2015-12-13 08:04:41 +02:00
Safwat Halaby
91aec448eb Fixed mobs attacking Creative Mode players 2015-12-13 07:52:11 +02:00
Safwat Halaby
8a5df43e6c Decoupled cMonster and path recalc logic, re-implemented recalc 2015-12-13 07:13:34 +02:00
Gargaj
62265a0850 Stop pathfinding over cobble walls 
Also 1.5 blocks high, shouldn't pathfind over it.
 2015-12-13 00:02:56 +01:00
Gargaj
115865f845 Nether wart only ages to 3 
See http://minecraft.gamepedia.com/Nether_Wart
 2015-12-12 00:46:01 +01:00
Gargaj
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
Mattes D
b8fe09901b Fixed opposite condition in OreNests finisher. 2015-12-09 08:03:33 +01:00
Gargaj
86ea2ee50c stop creepers from exploding even if they just died 2015-12-08 22:34:32 +01:00
Julian Laubstein
d75ab544f4 Small spelling issues fixed 2015-12-08 21:58:53 +01:00
Gargaj
41761624c2 Tilling dirt should send block update 
There are BUD switches that are built on this (https://www.youtube.com/watch?v=Bk_ChvmtCNY) but more prominently, torches placed on dirt blocks should pop off when the dirt block is tilled.
 2015-12-06 12:59:38 +01:00
Gargaj
4132ff495c Spawn chickens from eggs as babies 
This actually works now with the breeding patch (would also close https://github.com/cuberite/cuberite/pull/2366)
 2015-12-05 15:54:34 +01:00
Gargaj
7a7cc1e66f fix wolf collars 
I don't know why this had an inversion but it consistently made the wrong collar color (i.e. yellow dye made the collar blue)
 2015-12-03 15:13:03 +01:00
Mattes D
ef7c6ea7e7 Merge pull request #2707 from Gargaj/rabbitstew 
Merge cItemMushroomSoupHandler into cItemFoodHandler
 2015-12-03 15:12:07 +01:00
Gargaj
72b2ab6406 Merge mushroom soup into generic food handler 
...and fix eating the bowl when eating rabbit stew
 2015-12-03 14:55:32 +01:00
Mattes D
03a972ec55 Use C++11 auto instead of per-platform types. 
Closes #2686.
 2015-12-03 14:39:36 +01:00
Mattes D
213419a4cc Merge pull request #2699 from SafwatHalaby/breedDocs 
Breeding documentation
 2015-12-03 13:57:58 +01:00
Mattes D
3de22f5183 Changed Nether defaults to use PieceStructures. 2015-12-01 11:39:02 +01:00
Mattes D
2c3d933349 Added more details to the cubeset format documentation. 2015-12-01 10:35:08 +01:00
Mattes D
b8fbba5eb9 Added PieceStructures generator. 2015-12-01 10:35:07 +01:00
Safwat Halaby
dbda48ead4 Added documentation for breeding code 2015-11-30 12:05:38 +02:00
Gargaj
4ae3b64b07 implement breeding 2015-11-29 20:14:28 +01:00
Mattes D
851ee6a27f Normalized OrePockets generator config names. 
All INI values use AllInitialCapsStyle, no underscores.
 2015-11-27 12:44:42 +01:00
Mattes D
326f5e04f7 OrePockets finisher is now configurable. 2015-11-25 15:06:32 +01:00
Mattes D
f2a8d5c047 Added OrePockets and DirtPockets finish gens. 2015-11-25 09:22:20 +01:00
Gargaj
1fb89a5409 fix escaped characters in signs (fixes #1736, fixes #2170) 2015-11-24 19:51:39 +01:00
Dave Tucker
83870f9fc0 Add enum for Sound and Particle Effects 
Fixes #2603

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
 2015-11-24 13:21:40 +00:00
Gargaj
853e6e6882 change from single followable item to multiple 2015-11-23 22:20:31 +01:00
Julian Laubstein
5d5f5c9fba Fixed display of helpmessage 2015-11-23 18:20:37 +01:00
Julian Laubstein
9d07be62d3 Changed static_cast to FloorC 2015-11-23 18:10:58 +01:00
Julian Laubstein
b87e0b6b15 Adjusted height validation using cChunkDef::IsValidHeight() 2015-11-23 03:17:32 +01:00
Julian Laubstein
2d8b265133 Added dash to helpstring output 2015-11-23 02:12:19 +01:00
Julian Laubstein
c32b5fcaa9 Removed dashes in help messages for consistency 2015-11-23 02:12:19 +01:00
Julian Laubstein
62b41c351c Added cChunkDef::IsValidWidth() 2015-11-23 01:30:48 +01:00
Safwat Halaby
5fae7a0eee Revert "Changed description to "Cuberite - Minecraft in C++!"" 
This reverts commit f4406c047e.
 2015-11-22 16:30:33 +02:00
Safwat Halaby
f4406c047e Changed description to "Cuberite - Minecraft in C++!" 2015-11-20 09:18:44 +02:00
Thomas Boerger
ffed489156 Include execinfo.h only on __GLIBC__ 2015-11-19 22:46:47 +01:00
Thomas Boerger
a16a9eab4f Define stacktrace functions only if __GLIBC__ is defined 2015-11-19 22:46:47 +01:00
Thomas Boerger
8f3f91d3db Check for __GLIBC__ to detect correct strerror_r version 2015-11-19 22:23:47 +01:00
Julian Laubstein
48f84cc3e9 changed mob age from char to int 2015-11-16 14:13:44 +01:00
samoatesgames
19ea5d5423 Improved spawn location calculations. 
- Supports Overworld and Nether spawns.
 - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree).
 - Protects against spawning in oceans.
 - Protects against spawning in water.
 - Uses a radial search about the origin, rather than a linear.
 - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548)
 - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);)
 2015-11-13 15:08:16 +00:00
worktycho
5f34097ab3 Blocks outside the world are never solid 
Fixes #2539
 2015-11-13 11:50:21 +00:00
Gargaj
5e840cf86f Avoid reading out of bounds 
as per https://github.com/cuberite/cuberite/pull/2630#discussion_r44377411
 2015-11-10 22:22:28 +01:00
Julian Laubstein
98bac62c07 Added cChunkDef::IsValidHeight() 2015-11-10 19:44:30 +01:00
Gargaj
67e6da4627 Avoid division by zero 
It won't do much because direction will still be a nullvector, but it at least avoids a CPU spike.
 2015-11-10 18:00:14 +01:00
Gargaj
51f8e0e36c fix shallow water + add future code for liquid fall dampening 2015-11-10 00:36:15 +01:00
Gargaj
b5de4a9a6f remove slab from inventory when using it on another slab (fixes #2610) 2015-11-09 21:12:32 +01:00
Gargaj
6d8baa6a75 idle/deflating creeper should be -1 
according to http://wiki.vg/Entities#Creeper
 2015-11-09 20:06:32 +01:00
Gargaj
4e991f4632 Add comment to Attack() return values 2015-11-09 15:51:35 +01:00
Gargaj
97ddcc1c0a neutral mobs shouldn't chase the player unless aggro'd 
code style

neutral mobs shouldn't chase the player unless aggro'd

neutral mobs shouldn't chase the player unless aggro'd

Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo

Conflicts:
	src/Mobs/PassiveAggressiveMonster.h

code style

Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo
 2015-11-08 23:42:26 +01:00
worktycho
171867009e Fix memory leak 
Fixes CID 132249
 2015-11-08 22:34:52 +00:00
worktycho
a1926ca16e Merge pull request #2615 from Gargaj/cavespider-attack 
Fix cavespider poisoning even if attack is in cooldown
 2015-11-08 22:08:40 +00:00
Gargaj
d413e34475 Fix chicken flying 
The gravity might not be correct but my rough timing (with a stopwatch) seems to be close.

Merge branch 'master' into patch-1

Merge branch 'master' into patch-1

Merge branch 'master' into patch-1
 2015-11-08 22:34:35 +01:00
Gargaj
392a3d319c fix cavespider poisoning even if attack is in cooldown 
make attack function more responsive

fix cavespider poisoning even if attack is in cooldown
make attack function more responsive

Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack

code style

fix cavespider poisoning even if attack is in cooldown
make attack function more responsive

fix cavespider poisoning even if attack is in cooldown
make attack function more responsive

Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack

code style

Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack

Merge branch 'master' into cavespider-attack

Merge branch 'master' into cavespider-attack

fix cavespider poisoning even if attack is in cooldown
make attack function more responsive

fix cavespider poisoning even if attack is in cooldown
make attack function more responsive

Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack

code style

fix cavespider poisoning even if attack is in cooldown
make attack function more responsive

fix cavespider poisoning even if attack is in cooldown
make attack function more responsive

Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack

code style

Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack

Merge branch 'master' into cavespider-attack

Merge branch 'master' into cavespider-attack

Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack
 2015-11-08 21:01:02 +01:00
Gargaj
2ce2d9b7ce add sound to stone pressure plates 
add sound to stone pressure plates
 2015-11-08 20:57:05 +01:00
Gargaj
429c896e33 Only send creeper updates when there is a change 
Otherwise this keeps spamming the metadata packet for all the creepers on the server.
 2015-11-07 21:57:32 +01:00
worktycho
e85082d2f1 Merge pull request #2609 from bibo38/slimeblock 
Slimeblock implementation
 2015-11-07 18:45:59 +00:00
bibo38
ea55e75672 Refactored code to use vectors in the cPistonHandler class 2015-11-07 17:34:54 +01:00
bibo38
429f615390 Added some code improvements 2015-11-07 17:23:02 +01:00
bibo38
0447af8bcb Renamed GetDirectionVec into VectorFromMetaData to improve code readability. 2015-11-07 17:23:02 +01:00
bibo38
f8c28cc373 Commented the GetDirectionVec method 2015-11-07 17:23:02 +01:00
bibo38
64012bf46f Fixed the style problems and added some comments 2015-11-07 17:23:02 +01:00
bibo38
5fa077f869 Removed unused CanPull method 2015-11-07 17:23:02 +01:00
bibo38
558991a725 Extracted block moving code into a seperate method 2015-11-07 17:23:02 +01:00
bibo38
f35060e8b5 Replaced the usage of pistonMeta with a direction vector to allow better meta value abstraction 2015-11-07 17:23:02 +01:00
bibo38
ceec6c936d Fixed pulling/pushing of breakable blocks, which are not required to be moved 2015-11-07 17:23:02 +01:00
bibo38
ede4eec4c5 Implemented the basic slime block pulling 2015-11-07 17:23:02 +01:00
bibo38
59a9ac5e6f Implemented the SlimeBlock into the CanPush method to allow slimeblocks to work correctly when pushed 2015-11-07 17:23:02 +01:00
bibo38
8f066a16ec Piston extension now works with the new recursive CanPushBlock method. 2015-11-07 17:23:02 +01:00
bibo38
e2d88106a9 Added the CanPushBlock method for the piston push check. 
This allows the recursive check for blocks to push, which is needed to implement the slime blocks into the piston system.
 2015-11-07 17:23:02 +01:00
bibo38
d92a92d78a Implemented the slime block dropping behaviour. 
Fixes #2530
 2015-11-07 17:23:02 +01:00
Gargaj
6ce98a702d fix pressure plate power levels 2015-11-07 16:28:37 +01:00
worktycho
7dae50fc14 Merge pull request #2618 from Gargaj/deadmeansdead 
Fix mobs firing when already dead
 2015-11-07 13:26:31 +00:00
Gargaj
31dac0cb2e don't attack if dead 2015-11-07 13:48:00 +01:00
Gargaj
ad1e24e50b code style 2015-11-07 13:32:52 +01:00
Gargaj
2f28c2f4ff implement pushing/shoving based on @NiLSPACE's suggestion 2015-11-07 13:29:18 +01:00
Gargaj
5bcd4b271e chickens don't take fall damage 2015-11-06 10:22:40 +01:00
Julian Laubstein
056822845d Merge pull request #2593 from cuberite/enderegg 
Destroy an ender crystal when hit by an egg.
 2015-11-05 18:10:19 +01:00
Alexander Harkness
1d4c6d3fbe Destroy an ender crystal, damage a dragon when hit by an egg. 2015-11-05 16:42:42 +00:00
Mattes D
1abf065953 MSVC: Reviewed warnings, disabled a useless one, re-enabled an old one. 2015-11-05 11:09:37 +01:00
Gargaj
a9579c4f06 Fix being set on fire while directly being under lava 
Right now you will be on fire if there is a block of lava right above you, even if it doesn't pour down.
 2015-11-04 18:00:29 +01:00
Lukas Pioch
9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Cengiz Can
bb48d8a7e8 Use an unreserved qualifier for thread local storage 
Fixes #1906
 2015-11-03 12:09:40 +03:00
bibo38
19b65ce357 Fixed failed assertation 
This was caused by a monster with a negative Y-axis.
Fixes #2336
 2015-11-03 08:39:18 +01:00
worktycho
47604cd914 Merge pull request #2591 from cuberite/chunkprepare-deadlock 
Fix deadlock, resolves #2521
 2015-11-03 00:23:45 +00:00
Tiger Wang
9de3a3f938 Examined a fix for #2588 2015-11-02 22:07:48 +00:00
Alexander Harkness
7e4c56ce0d Fix deadlock, resolves #2521 2015-11-02 18:21:35 +00:00
bibo38
435bae104d Implemented the Water Breathing Potion functionality. 
Fixes #2556
 2015-11-01 11:50:03 +01:00
bibo38
73b8be0fef Implemented the FireResistence potion effects. 
This not only provides fire resistence, but also prevents blaze fireballs.
See #2556
 2015-10-31 23:06:10 +01:00
Lukas Pioch
5ae19fb332 Debug mode: Fixed assertion, if player below y < 0 2015-10-31 14:26:24 +01:00
bibo38
ec5c38761f Changed for-loop iterator in File.cpp to a reference type to reduce object copying and fix the clang build. 
Fixes #2580
 2015-10-30 20:16:45 +01:00
Lukas Pioch
3e48b1f1eb Added cave spider to MobSpawner 2015-10-29 13:35:35 +01:00
Mattes D
a7c75d61ce Revert "Pressure plate fix" 2015-10-29 11:43:01 +01:00
Schwertspize
525b967c93 fixed pressure plate bugs 2015-10-28 22:21:46 +01:00
Alexander Harkness
d14c8fa446 Fix wrong teleport permission. (solves #2369) 2015-10-28 08:24:48 +00:00
Lukas Pioch
079bb7c016 Update Loops required for JsonCPP 2015-10-26 00:16:35 +00:00
Mattes D
da92286da9 Fixed a crash when sending messages too early after connection. 2015-10-21 20:59:48 +02:00
Julian Laubstein
979ab11044 ReTyped block ids 2015-10-15 10:53:32 +02:00
worktycho
183284a2a4 Removed unused typedef 2015-10-12 15:02:25 +01:00
Mattes D
5bd683a86d Fixed a possible crash in HTTPS server. 2015-10-08 19:08:11 +02:00
Mattes D
66e8190ca8 StyleCheck: Check spaces around ==, <=, >= 2015-10-08 17:43:26 +02:00
Mattes D
6c7f51a008 Fixed bindings for cTCPLink:StartTLSClient(). 
The bindings used to enforce client cert, now it's optional.
 2015-10-08 16:14:50 +02:00
Tiger Wang
4a8e7bddcc Merge pull request #2528 from OdnetninI/master 
Fixed flight in Spectator Mode
 2015-10-05 22:05:37 +01:00
OdnetninI
545aa2a989 Spectator Mode doesn't fly[FIX] 2015-10-05 21:59:15 +02:00
Mattes D
60800655c8 Generator: Fixed missing hitbox assignment. 
This had caused village houses to generate too close to each other.
 2015-10-05 21:15:08 +02:00
tycho
d8c860ae58 Improved the data structure for storing loaded chunks 
Should significantly increase the performance of deciding which chunks to stream
 2015-10-05 16:20:07 +01:00
Mattes D
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
tycho
e1d5e5e165 Improved types of utf 16 strings 2015-10-02 17:26:53 +02:00
tycho
899955f9e3 Remove a pair of unused broken functions 2015-10-02 17:26:53 +02:00
worktycho
dacab890cc The bottom layer cannot hold a valid spawn point 
Fixes #2510
 2015-10-01 14:49:26 +01:00
Mattes D
1c8e60f91a Added LuaState tracker and memory stats logging. 2015-09-28 21:30:31 +02:00
Mattes D
5614056640 Made Lua API check strings strictly. 
Previously nil was accepted as a string in cLuaState::CheckParamString(), now it's reported as an error.
 2015-09-28 14:53:50 +02:00
Tiger Wang
4ddff15710 Merge pull request #2498 from cuberite/UnicodeOnWindows 
Enabled Unicode support for Windows
 2015-09-28 09:14:09 +01:00
Safwat Halaby
db40172b64 Partial revert of #2446 2015-09-28 08:52:08 +03:00
Mattes D
7d551fe9f6 Added weather intervals to world.ini settings. 2015-09-28 01:02:17 +02:00
Safwat Halaby
fc1633d6e6 Disabled squids and Guardians pathfinding, #2460 2015-09-27 19:48:37 +03:00
worktycho
11c1686092 Merge pull request #2465 from electromatter/master 
Added BungeeCord support for Protocol18x
 2015-09-27 14:24:15 +01:00
Tiger Wang
803c0c6965 Added the _UNICODE flag on Windows 2015-09-26 22:19:29 +01:00
Mattes D
ad57ce5f99 Extended and fixed the cFile API. 2015-09-26 22:54:18 +02:00
Tiger Wang
a8bfe3a4c1 Prepared ScheduleTask for threading refactor 
* Llama-ified and condensed Schedule/QueueTask
- Removed hackery done with piston animations
 2015-09-25 18:56:49 +01:00
Lukas Pioch
e56aa4032d Maked it compileable for clang-3.7 2015-09-25 17:09:19 +02:00
Mattes D
741dc78547 Lilypads drop when not on source water. 
Lilypad blocks now break and drop as items when the block below them changes to non-water or non-source water.
Fixes #2404.
 2015-09-25 14:42:32 +02:00
Mattes D
82d9ac1e1c Namechange to Cuberite 2015-09-25 10:14:17 +02:00
tycho
b4f934b808 fixed cast 2015-09-24 15:54:32 +01:00
tycho
6e86d20f73 Add new "ForEach" function: ForEachLoadedChunk. 2015-09-24 15:54:32 +01:00
electromatter
a24cc01843 Merge branch 'master' into master 2015-09-21 22:44:34 -04:00
tycho
fd7b87741a Refactored cProtocol Chat handling 2015-09-21 12:32:56 +01:00
tycho
3c5ba56aba Ignore Sigpipe 2015-09-19 21:37:07 +02:00
tycho
a0519a487a Fixed wrong assumtion regarding RemoveClient 
Remove client can be called with a client that is not present in the chunk
 2015-09-19 19:34:20 +01:00
tycho
49724cd427 Fixed erase 2015-09-19 00:32:08 +01:00
tycho
dd168b0e8b Removed a significant performance issue. 
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.
 2015-09-18 16:27:32 +01:00
Mattes D
9871c0b073 Added CircleCI for stylechecking. 
This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
 2015-09-17 11:20:10 +02:00
tycho
3187dbf0aa Increase robustness of the logging subsystem 2015-09-15 16:19:49 +01:00
David Erbelding
d0fd51ea9d Fixed flint drop rates from 1/30 to 1/10 to match the wiki. 2015-09-13 23:18:21 -04:00
Mattes D
76d2f85b9a Fixed Lua output folders for Windows builds. 
Fixes #2468.
 2015-09-08 09:12:02 +02:00
Eric Chai
1ef6bd8169 added bungeecord support for protocol18x 2015-09-06 09:58:18 -04:00
Mattes D
dac97826f7 Renamed output directory to Server 2015-09-05 22:01:21 +02:00
Tiger Wang
511334c500 Fixes #2485 2015-09-02 21:11:25 +01:00
Matti Hanninen
c3d84a24a9 Include signal.h jointly for POSIX systems 
Otherwise, for example, FreeBSD the build fails due to SIGKILL not being
around.
 2015-08-27 08:15:08 +03:00
Tiger Wang
3b8dc45dc3 Merge pull request #2446 from cuberite/asyncpathfinder 
Fixed a position bug in the pathfinder
 2015-08-26 23:13:13 +01:00
Tiger Wang
dfc0f2ae00 Small fix for cEvent 
Don't bother using atomics since a synchronisation primitive is already
being used.
 2015-08-26 23:02:45 +01:00
Mattes D
69a44b2fee Merge pull request #2450 from nicodinh/patch-1 
Fixed false-positive error message in cRankManager::SetRankVisuals().
 2015-08-25 10:04:25 +02:00
AZARI Nicolas
f0fcd022a6 Update cRankManager::SetRankVisuals 2015-08-25 09:15:54 +02:00
Theo Tosini
92b1a3440d
Fix clang compile error 
Clang would previously fail on debug builds due to the use of an old-style cast.
 2015-08-23 23:11:08 -04:00
Tiger Wang
e254a76884 Removed unused function 
* Fixes #2444
 2015-08-22 19:35:56 +01:00
Tiger Wang
baf3a07804 Fixed a position bug in the pathfinder 2015-08-22 17:06:08 +01:00
Tiger Wang
3e0af6ca36 Cast UINT to WORD to appease warning 
* Additional minor cleanups
 2015-08-22 14:21:25 +01:00
Tiger Wang
f52a769761 Merge pull request #2427 from cuberite/fixes 
Fixed and improved restarting
 2015-08-22 13:07:34 +01:00
Matti Hänninen
12fb95ba2f Namespace qualify std::abs, use explicit cast 
Without 'std' namespace qualification Clang (at least Apple Clang 6.1)
seems to resolve 'abs' to the 'abs' function in 'cstdlib'.  This in turn
triggers the 'absolute-value' warning which in turn is promoted to
error.

Implicit casts trigger 'old-style-cast' warnings which are promoted to
errors.
 2015-08-22 00:36:29 +03:00
Tiger Wang
a341419b04 Merge pull request #2380 from cuberite/travis 
Use container-based infrastructure
 2015-08-20 17:18:08 +01:00
Tiger Wang
de2cce9b79 Fixed food drain bugs 2015-08-20 16:26:42 +01:00
Tiger Wang
5751ba0c1c Use container-based infrastructure for Travis 2015-08-20 16:15:55 +01:00
Tiger Wang
4315a11393 Fixed and improved restarting 
Restarts are now an actual, close-as-possible to application
exit+reopen.
 2015-08-20 16:15:23 +01:00
Samuel Barney
cc83c4641d * Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it. 
* Blocks now have an effect upon plant growth, just like in vanilla.
 2015-08-19 10:48:21 -06:00
Julian Laubstein
dd5201c29e Some warning fixes 2015-08-18 08:49:00 +02:00
Matti Hänninen
b20294604c Fix old style casts and implicit conversions 2015-08-12 16:51:38 +03:00
Mattes D
92ac33e923 Checked LeakFinder in MSVC2015, enabled support for it. 2015-08-10 13:54:19 +02:00
Mattes D
bfc698f0ed MSVC: Ignore the deprecation warning in 3rd party StackWalker. 2015-08-09 09:23:12 +02:00
Mattes D
a985949cfe Flush log file when a warning or error message is output. 
Fixes #2419.
 2015-08-08 10:40:40 +02:00
Samuel Barney
4996e53bf5 Refactored code to use cLuaState 
Fixes #2377.
 2015-08-07 21:17:21 +02:00
Nicholas W
fbbf27feea Fixed Iron Door 2015-08-01 08:47:55 -05: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
Mattes D
5dbe1e7303 Merge pull request #2376 from mjhanninen/fix-freebsd-build 
Fix FreeBSD build
 2015-07-29 15:36:57 +02:00
Mattes D
97beb2a350 Fixed custom recipes result clientside bug. 
Fixes #2345.
 2015-07-26 13:30:25 +02:00
Mattes D
c74d856b57 Fixed cNetworkSingleton's HasTerminated flag. 
Should fix random failures in Google-test.
 2015-07-23 16:15:21 +02:00
Matti Hänninen
6836bf6576 Fix FreeBSD build broken by strict compiler check 
Downgrade tautological-compare to warning to let the build pass on
FreeBSD 10.0. Note that I wasn't able to reproduce the problem on OS X
Clang; probably due to Clang version differences.
 2015-07-20 18:17:45 +03:00
Tiger Wang
84e31ba670 Merge pull request #2362 from scribblemaniac/fix-redstone 
Fixed redstone issue
 2015-07-17 23:37:47 +01:00
Samuel Barney
9fde99aca2 Added documentation for GetLargeTreeAdjustment 2015-07-17 15:26:21 -06:00
scribblemaniac
00c3144283 Fixed redstone issue 
Fixed issue where glowstone blocks would block power transmission
in some situations.
 2015-07-17 00:48:21 -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
Tiger Wang
c633dd8cec Merge pull request #2363 from scribblemaniac/improve-spider-ai 
Improved spider AI
 2015-07-16 22:22:48 +01:00
Tiger Wang
4b99a5bd49 Merge pull request #2364 from hallucino/ageable-mobs 
Spawn baby mobs
 2015-07-16 22:22:42 +01:00
Julian Laubstein
29d1f37258 Merge pull request #2360 from bibo38/waterfix 
Now Water sources will also be created on top of existing water sources.
 2015-07-16 23:07:24 +02:00
hallucino
9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
scribblemaniac
55aa438831 Improved spider AI 
Fixes #2335
 2015-07-16 11:15:57 -06:00
bibo38
3c9e113985 Now Water sources will also be created on top of existing water sources. 
See also on http://minecraft.gamepedia.com/Water#Source_blocks
Fixes #2097
 2015-07-15 23:36:51 +02:00
Tiger Wang
eadd761a29 Merge pull request #2348 from bibo38/customname 
Added CustomName and Health to sended Metadata of Monsters.
 2015-07-15 22:18:11 +01:00
Julian Laubstein
8b74adcfab Merge pull request #2353 from SamJBarney/DyedArmor 
Implements Dyed Leather Armor
 2015-07-15 22:31:48 +02:00
Samuel Barney
561296f269 Leather Armor can now be dyed. 
* Created new color class to handle dye-related coloring
 2015-07-15 14:05:36 -06:00
bibo38
d364b779d1 Added CustomName and Health to sended Metadata of Monsters. 
Fixes #2113
 2015-07-15 19:32:10 +02:00
Julian Laubstein
01f90ef97d Merge pull request #2350 from SamJBarney/PeonySnowFix 
Fixed Tall Grass placement
 2015-07-15 19:31:41 +02:00
Samuel Barney
4235feb7fd Fixed tall grass trying to be placed in cold biomes. 2015-07-15 11:04:09 -06:00
Tiger Wang
c390604bc1 Merge pull request #2349 from cuberite/maps 
Improved maps
 2015-07-15 17:13:55 +01:00
Alexander Harkness
2603013d79 Merge pull request #2036 from cuberite/sign-metamirror 
Should Fix sign flipping.
 2015-07-15 14:58:28 +01:00
NiLSPACE
0c3a3427cd Merge pull request #2340 from hallucino/ageable-mobs 
Support ageable mobs
 2015-07-15 09:57:04 +02:00
Julian Laubstein
d7b10607d4 Merge pull request #2356 from LO1ZB/ImproveHunger 
Fix food drain on movement.
 2015-07-14 23:16:36 +02:00
Tiger Wang
8656e149c8 Improved maps 2015-07-14 21:46:30 +01:00
Hallucino
53207d3f18 Support ageable mobs 
Move ageable stuff in Monster directly
 2015-07-14 22:41:31 +02:00
Tiger Wang
9d4d25cdbf Merge pull request #2352 from mmdk95/master 
Fix duping doors
 2015-07-14 21:32:28 +01:00
LO1ZB
405458d5e2 Fix food drain on movement. 2015-07-14 20:30:30 +02:00
mmdk95
c12704183b Fix duping doors (#1327) 2015-07-14 18:42:40 +02:00
Julian Laubstein
e92335b669 Merge pull request #2346 from SamJBarney/TreeGrowthUpdate 
Sapling Growth Update
 2015-07-14 16:36:53 +02:00
Samuel Barney
037dbf110d Torches can now be placed on top of upside down stairs. 2015-07-13 17:08:07 -06:00
Samuel Barney
d017fe5e39 Sapling Growth Update 
* Growth has been slowed down
* Saplings do not grow if they do not have enough space to grow
* Saplings do not grow unless the light level is 9 or above
* Dark Oak doesn't grow unless it is in a 2x2

Jungle Trees now will grow into a large tree when 2x2 saplings are used.
 2015-07-13 15:24:38 -06:00
Samuel Barney
051787dbc2 Switched from using std::max(std::min()) to using Clamp 2015-07-13 14:17:43 -06:00
Julian Laubstein
f6f27a139e Merge pull request #2344 from bibo38/make_ptr 
Changed allocation of smart pointers via make_xxx
 2015-07-13 00:54:58 +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
mmdk95
d3662e6589 Fixed DropSpenser sound #2333 2015-07-12 19:30:51 +02:00
Julian Laubstein
9b3b047004 Merge pull request #2330 from cuberite/libraryupdate 
Library update
 2015-07-12 14:46:33 +02:00
Tiger Wang
e69d4536ab Added JsonCPP library location to search paths 
* Fixed '-dirty' submodule changes
Probably fixes an issue somewhere too?
 2015-07-12 12:23:11 +01:00
Tiger Wang
ccfe04a0a2 Updated and submodularised JsonCPP 
Conflicts:
	lib/jsoncpp
 2015-07-09 23:10:51 +01:00
Samuel Barney
db3642de89 Fixed misplaced parens 2015-07-09 14:41:14 -06: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
Mattes D
a55eaba7fa Network: Fixed ServerHandle's address formatting. 2015-07-07 18:10:47 +02:00
Nounours Heureux
91833b7cb8 (Ender) Chests are obstructed by opaque blocks. 2015-07-07 12:29:52 +02:00
Mattes D
bebd4de144 Fixed warnings generated by 64-bit MSVC. 2015-07-07 11:50:06 +02:00
Samuel Barney
2faff189d4 Squashed Bonemeal Plant Growth Update 
* Fixed Crops growing to maturity with only 1 bonemeal
* Trees now go through growth stages with bonemeal, as they do in
Vanilla Minecraft
 2015-07-06 15:41:08 -06:00
worktycho
106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing 
Chunk queue collapsing: MK II
 2015-07-04 14:43:00 +01:00
Samuel Barney
ba0577bbd0 Moved grabbing the light value to after the transparency check. 2015-07-03 13:05:02 -06:00
Samuel Barney
0307b6aba0 Added missing parens 2015-07-02 16:19:23 -06:00
Samuel Barney
e248539d74 Grass now only dies if it has an opaque block above it. 
Grass only spreads to a dirt block if the light level is above 4 and the block above it is transparent.
 2015-07-02 16:16:05 -06:00
Samuel Barney
404cf5dcfd Farmland is now listed as an opaque block. 
Changed spread light falloff for farmland to what it was originally.
 2015-07-02 16:13:40 -06:00
Mattes D
66a164a9a7 Added neighbor specification in the OnNeighborChanged() block callback. 
Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields.
Fixes #2213.
 2015-07-01 10:40:16 +02:00
Mattes D
f6ab461383 BlockArea: Fixed a crash with areas higher than chunk height. 2015-06-30 14:08:21 +02:00
STRWarrior
e5cfe0cd96 Added a size check for portals. 
Made the portal size configurable

Alpha-sorted SetXYZNetherPortalXYZ functions
 2015-06-28 17:05:44 +02:00
tycho
257011b440 use atomic for state, to avoid torn reads 2015-06-27 12:10:24 +01:00
bibo38
bb46afcb7e Now Horses spawn with correct data values. 
The max-value of style is 4, of color is 6.
See http://wiki.vg/Entities#Horse
Also based on the if, the max value of HorseType is 7.
Bugfix #2259
 2015-06-26 19:32:16 +02:00
worktycho
0a7c54261f Merge pull request #2241 from lkolbly/master 
Work on NetherPortalScanner. Setup portal scanner to reset PortalCool…
 2015-06-26 14:12:29 +01:00
worktycho
7187c00342 Merge pull request #2282 from Haxi52/button-fixes 
Button fixes
 2015-06-25 15:46:33 +01:00
Mattes D
8e1437be08 Merge pull request #2290 from bibo38/mousefix 
Fixed Middle-Click Button in the ClickWindow-Packet.
 2015-06-25 16:11:56 +02:00
bibo38
31466fda5f Doors now get placed on the server-side. 
The Y-Value is already the lower door block(From ItemHandler.cpp:346).
Increasing it once again, places the door into the air, which is blocked by Cuberite.
Bugfix #2279
 2015-06-25 16:17:03 +02:00
bibo38
ec628846d2 Fixed Middle-Click Button in the ClickWindow-Packet. 
See http://wiki.vg/Protocol#Click_Window
The MiddleClick has the button 2 and not 0. Now you can max an item in an inventory in Creative mode, without inventory desync.
Bugfix #2260
 2015-06-25 13:01:48 +02:00
Hax52
9f1d1c058f Buttons no longer click on when already on. Buttons now play sound when clicking off. 2015-06-24 13:52:56 -05:00
Mattes D
c1780366b0 Merge pull request #2288 from cuberite/melonFix 
Call Neighbour changed handlers when a melon is created
 2015-06-24 14:59:47 +02:00
Mattes D
4f8e2f180d Added a forgotten break in cHangingEntity constructor. 
This had caused loading the cHangingEntity to fail in debug builds.
 2015-06-24 13:39:11 +02:00
tycho
b02b262a7c Call Neighbour changed handlers when a melon is created 
Should prevent cascading farmland updates on breaking melons
 2015-06-23 21:27:37 +01:00
worktycho
c0d8a4933e Merge pull request #2284 from cuberite/FixBiomeGen 
Generate biomes when pregenerating heights through CompositedHeiGen.
 2015-06-23 17:26:39 +01:00
Mattes D
2daa9c5854 Fixed melon metadata when growing from stem. 2015-06-23 17:23:35 +02:00
Mattes D
55a5f11b1b Fixed right-click with bonemeal. 
The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface).
 2015-06-23 15:23:11 +02:00
Mattes D
6cd71a1e73 Generate biomes when pregenerating heights through CompositedHeiGen. 
Fixes #2283.
 2015-06-23 14:45:35 +02:00
Tiger Wang
33fc1474d9 Fixed minor errors in Tycho's code 
Everything should work now :)
 2015-06-22 21:27:13 +01:00
Samuel Barney
e70e2b8ecc Rebased version of Code 2015-06-22 11:29:38 -06:00
Mattes D
3889b2cac2 Refactored block placement workflow. 
Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler.
 2015-06-21 19:49:22 +02:00
Mattes D
e06dd8f20e Added basic support for loading village prefabs from files. 2015-06-20 15:37:41 +02:00
worktycho
33d68572a6 Merge pull request #2255 from cuberite/LoadablePieces 
Loadable pieces
 2015-06-19 19:41:28 +01:00
Mattes D
8df31067d4 Externalized cPrefabPiecePool self-test. 2015-06-19 16:15:59 +02:00
Mattes D
ae16689420 PrefabPiecePool: Added loading from cubeset file. 2015-06-18 23:32:43 +02:00
Tiger Wang
6920e468ad Check the return value of InflateString 
Fixes #2256
 2015-06-18 11:19:41 +01:00
Mattes D
c6012a95bd LuaState: Added support for config-style usage. 
Globals and table values can be queried from the Lua state easily.
Use perfect forwarding.
 2015-06-17 17:13:45 +02:00
Tiger Wang
813ca04676 Fixes #2245 
Whoops :/
 2015-06-17 00:27:50 +01:00
tycho
6687ed03a1 Removed version 29 serilization 
This has been unused since support for <1.7 has been dropped.
 2015-06-16 10:24:06 +01:00
tycho
b259ab53fb Fixed override 
This was causing a compile error in clang 3.6
 2015-06-15 18:03:54 +01:00
Tiger Wang
f8c7efdcd7 Merge pull request #2244 from martindev2/#2092-TNT-Fire 
Fix block placement over fire
 2015-06-14 22:01:09 +01:00
worktycho
0cd64ab90b Fixed tigers format string 2015-06-14 13:18:01 +01:00
Martin McArthur
d8865339f5 implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top 2015-06-14 12:53:09 +01:00
Tiger Wang
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
Lane Kolbly
9d620a20a0 Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. 2015-06-13 16:09:43 -05:00
worktycho
d961693020 Merge pull request #2237 from lkolbly/master 
Fixing how village doors are generated in 1.8.
 2015-06-13 21:55:36 +01:00
NiLSPACE
8ecd545857 Merge pull request #2240 from cuberite/UpdatedPrefabs 
Updated prefabs from the Gallery server.
 2015-06-13 18:29:46 +02:00
Mattes D
ec4bd42dd8 Updated prefabs from the Gallery server. 2015-06-13 18:14:09 +02:00
Lane Kolbly
dafdded7d9 Fixed typo in BlockDoor.h 2015-06-13 08:00:20 -05:00
Nounours Heureux
d79f601d5a Added HOOK_KILLED 2015-06-13 10:00:31 +02:00
Mattes D
f0ee0b8ce8 NetherPortalScanner: Fixed type conversion warnings. 2015-06-13 08:46:05 +02:00
Alexander Harkness
ee3082a3c5 If defined, not just if. 2015-06-12 12:37:22 +01:00
Alexander Harkness
070801d561 Fixed build error on Linux 2015-06-12 11:57:34 +01:00
Mattes D
d390214929 SelfTests are registered and executed after logging framework init. 
Fixes #2228.
 2015-06-11 22:20:04 +02:00
Tiger Wang
dd4b415051 Reinstate "Chunk queue collapsing" 
This reinstates commit f36acb6835
     and reverts commit adfbc42c02.
 2015-06-10 15:16:05 +01:00
Mattes D
d436a71cbc Merge pull request #2162 from lkolbly/master 
Nether Portal Jumping & Creation Code
 2015-06-10 08:00:50 +02:00
Lane Kolbly
73b6a44d5f Implemented nether portal scanning code. 2015-06-09 18:23:57 -05:00
Alexander Harkness
1e77f27191 Merge pull request #2144 from mc-server/comparators 
Redstone improvements [SEE DESC]
 2015-06-09 09:15:08 +01:00
Mattes D
db863422b8 cBlockArea: Added CountSpecificBlocks() API function. 2015-06-08 21:52:13 +02:00
worktycho
adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
Alexander Harkness
f1a3535d6e Merge pull request #2210 from nounoursheureux/bucket-craft 
Cake crafting now give back the bucket
 2015-06-07 14:43:16 +01:00
Alexander Harkness
e2c4a0a595 Merge pull request #2211 from jan64/master 
Fix incorrent experience sending for 1.7 clients
 2015-06-07 14:41:27 +01:00
Nounours Heureux
24210cbd6f Fixed style 2015-06-07 15:22:47 +02:00
jan64
be4a5a0803 Fix incorrent experience sending for 1.7 clients 2015-06-07 15:21:18 +02:00
Nounours Heureux
1a7e8f3e4f Cake crafting now give back the bucket 2015-06-07 15:03:47 +02:00
Tiger Wang
061866616d Added moar comments 2015-06-07 12:54:07 +01:00
Tiger Wang
f44d123ba8 Vector hasher is now a separate class 2015-06-07 12:53:59 +01:00
Tiger Wang
ed6c37febc Use emplace to construct structures 2015-06-06 12:30:08 +01:00
Tiger Wang
a6983ec3c9 Improved link unpowering speed 
Also fixed compile errors
 2015-06-06 12:21:22 +01:00
Tiger Wang
171c59a01b Changed appropriate containers to unordered_map 
Thanks to @worktycho for guidance!

* Potential speed improvements
 2015-06-06 12:21:21 +01:00
Tiger Wang
6a831c0b6f Improved link power behaviour 2015-06-06 12:21:21 +01:00
Tiger Wang
bef7cce5ed Improved wires and repeaters 
* Fixed repeater cross-chunk power detection
+ Re-implemented horizontal wire cut-off checking
 2015-06-06 12:21:20 +01:00
Tiger Wang
151fe0fc59 Fixed wire consuming much resources 2015-06-06 12:21:19 +01:00
Tiger Wang
84534dfeb2 Redstone wire and trapdoor fixes 
* Fixes #1887
* Fixes #1763
* Fixes #1083
 2015-06-06 12:21:19 +01:00
Tiger Wang
bd48475085 Provides improvements to redstone wire 
Intermediary commit that fixes #1763.
 2015-06-06 12:21:18 +01:00
Tiger Wang
de5b1401f8 Comparators 2015-06-06 12:21:09 +01:00
Tiger Wang
f36acb6835 Merge pull request #2179 from mc-server/ChunkQueueCollapsing 
Chunk queue collapsing
 2015-06-06 10:55:12 +01:00
worktycho
54c1926a3a Merge pull request #2205 from birkett/master 
Daemon support on Linux
 2015-06-05 22:33:49 +01:00
tycho
ffbe5f6a2f Fix iterating 2015-06-05 22:31:22 +01:00
tycho
9ebbe969c8 Made the list of chunks to stream an unordered_set 
This should increase performance of chunk streaming
 2015-06-05 22:31:22 +01:00
tycho
bfe52277b4 Rewrote ChunkSending queue for significantly improved performance 2015-06-05 22:31:21 +01:00
tycho
19c95ee564 Moved Chunk Broadcasts over to the regular queue 2015-06-05 22:31:21 +01:00
Anthony Birkett
9dac390247 Daemon support on Linux. 
Added null console log listener, avoid printf() when stdout is closed.
 2015-06-05 15:47:47 +01:00
worktycho
519fd1d36d Merge pull request #2206 from mc-server/APIDumpTimeStamp 
APIDump time stamp
 2015-06-05 13:04:28 +01:00
Mattes D
1ec9665118 Fixed overshoot in cLineBlockTracer. 
Fixes #2161.
 2015-06-05 11:29:54 +02:00
Mattes D
99b182b4be Added Build info to the cRoot API. 2015-06-05 10:34:13 +02:00
Mattes D
649921f4a8 Provide some BuildInfo even for non-CI builds. 
Ref.: #2204
 2015-06-05 10:19:58 +02:00
Mattes D
5267285529 Merge pull request #2069 from HaoTNN/master 
Fixes lit furnace issue in #2051
 2015-06-05 10:12:10 +02:00
worktycho
c9ad1ecd3e Merge pull request #2203 from jan64/master 
Change SendChatType behavior for < 1.8 clients, update docs
 2015-06-04 11:28:43 +01:00
Cengiz Can
c967698b2d Skip unknown cflag for Apple clang & remove cSemaphore 2015-06-04 11:48:56 +03:00
jan64
fd964200b2 Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients 2015-06-03 18:11:12 +02:00
HaoTNN
6f1a3cb6dd Merge remote-tracking branch 'upstream/master' 2015-06-03 02:57:07 -07:00
HaoTNN
e82cd6e4eb Fixes multiple furnace issues, including from loading world storage 2015-06-03 02:19:22 -07:00
Mattes D
1f2c9b226c Merge pull request #2199 from jan64/master 
Added system and above action bar chat messages
 2015-06-03 09:49:28 +02:00
HaoTNN
3142598dee Merge branch 'master' of https://github.com/mc-server/MCServer 2015-06-02 16:08:57 -07:00
jan64
d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
Mattes D
a0a8e78c0d Added cmdline params for crashdump detailness. 
Win32-only, also fixed the call scripts.
Fixes #2184.
 2015-06-02 15:19:13 +02:00
Mattes D
a42daecd0b Merge pull request #2182 from birkett/master 
Use the new style command line parameters for Windows Service support.
 2015-06-02 15:05:05 +02:00
Mattes D
48c153bf53 Fixed warnings in MSVC. 
It complained about undefined return values or using uninitialized variables.
 2015-06-02 12:51:43 +02:00
Anthony Birkett
65a62601dc Use the new style command line parameters for Windows Service support. 
Ignore invalid or malformed command line parameters, prevent unhandled exceptions.
NOTE: Users will need to reinstall the service, now uses "-d" instead of "/service" in the start parameters.
 2015-06-01 14:41:06 +01:00
Mattes D
a54fa15bc6 Merge pull request #2172 from mc-server/LightingCallbacks 
Made cLightingThread own its callbacks
 2015-06-01 15:02:42 +02:00
Mattes D
25e83bc1d9 Fixed crafting recipe matching. 
Fixes #2096.
 2015-05-31 21:21:57 +02:00
Mattes D
98df75d5ab ManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures. 
Fixes forum report http://forum.mc-server.org/showthread.php?tid=1993
 2015-05-31 19:44:08 +02:00
tycho
9b798ff9dd Merge branch 'master' of github.com:mc-server/MCServer 2015-05-30 13:34:08 +01:00
tycho
bca13d9187 Fixed minor cast warning 2015-05-30 12:31:05 +01:00
Alexander Harkness
28bab37425 Fixed wrong indent. 2015-05-30 11:22:49 +01:00
Alexander Harkness
97ee861c20 Merge pull request #2171 from SafwatHalaby/fence 
PF - Handle all fencetypes
 2015-05-30 11:13:59 +01:00
tycho
06a74e45e2 Made cLightingThread own its callbacks 2015-05-30 11:11:17 +01:00
worktycho
b371208526 Merge pull request #2163 from mc-server/SimplifySpawn 
Clean up Spawn Prepare
 2015-05-30 10:59:52 +01:00
SafwatHalaby
5f7455bc19 PF - Handle all fencetypes 2015-05-30 12:49:49 +03:00
worktycho
2ce405883a Merge pull request #2169 from linnemannr/master 
Fix FreeBSD/clang errors caused by -Werror
 2015-05-30 10:32:35 +01:00
worktycho
2b51958c85 Merge pull request #2167 from SafwatHalaby/diags 
PF - Fixed diagonal cutting
 2015-05-30 10:28:37 +01:00
linnemannr
ee34e7131a Fix FreeBSD/clang errors caused by -Werror 
With FreeBSD/clang, -Werror combined with the configured warning flags yields
some fatal errors, specifically related to signed conversion, 64 to 32 bit
conversion, and tautological compares.

CONTRIBUTORS

	Add myself to the contributor list

src/Generating/FinishGen.cpp

	In cFinishGenPassiveMobs::GetRandomMob(), change the type of RandMob
	from size_t to the difference_type of the ListOfSpawnables iterator
	MobIter. Using size_t triggers a 64 bit to 32 bit conversion if the
	difference_type of the iterator class is 64 bit

	Also explicitly cast the noise expression to unsigned long so we don't
	get a signed conversion warning from the modulo against
	ListOfSpawnables.size()

src/OSSupport/StackTrace.cpp

	FreeBSD 10 and above includes a non glibc implementation of benchmark()
	for which size_t, not int, is the return type. To account for this and
	prevent a signed conversion warning, abstract the type for numItems with
	a macro btsize

src/StringUtils.h

	In StringToInteger(), correct a tautological compare warning for
	unsigned types with the template. If T is unsigned, comparing
	std::numeric_limits<T>::min() to the unsigned result is always
	false. That control can enter this branch in an evaluated template with
	an unsigned type T may also permit a signed number to be parsed and
	erroneously stripped of its signedness at runtime. To guard against this
	and avoid the warning in the case that the number parsed from the string
	is non-positive, return false and don't try to parse if T is unsigned
	and control enters the non-positive branch
 2015-05-30 02:23:57 -06:00
SafwatHalaby
d9f5d3c858 PF - Fixed diagonal cutting 2015-05-30 10:50:04 +03:00
Safwat Halaby
054d2cd451 Merge pull request #2166 from SafwatHalaby/squid 
Disabled squid and Guardian Pathfinding
 2015-05-30 10:31:26 +03:00
SafwatHalaby
a0f4e182b1 Disabled squid and Guardian Pathfinding 2015-05-30 10:04:27 +03:00
SafwatHalaby
9c6c6af75a Fixed creeper explosions 2015-05-30 09:54:32 +03:00
Tiger Wang
291370e367 Fix Destroy() calling behaviour 
* Fixes Core/#142
 2015-05-30 00:23:34 +01:00
tycho
4feccaa64a Clean up Spawn Prepare 
Made cSpawnPrepare execute on the same thread since it is a syncronous operation, and most of the code happens on the lighting thread.
Also moved cSpawnPrepare into its own file
 2015-05-30 00:19:20 +01:00
Lane Kolbly
1dfc7bbce2 Fixed reversed logic in StringToDimension. 2015-05-30 00:02:43 +01:00
Julian Laubstein
1e6f02437e Merge pull request #2070 from mc-server/PreventNewWarnings 
Fixed a lot of warnings
 2015-05-29 11:08:32 +02:00
b33duck
022348645e Fix for the way connecting clients receive player lists and broadcast chat 2015-05-28 19:43:16 -07:00
tycho
4956e8700d Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Entities/ArrowEntity.cpp
 2015-05-29 00:12:56 +01:00
SafwatHalaby
f1540173da AI - Sane Skeleton 2015-05-28 19:19:56 +03:00
Tiger Wang
20b7152572 Potential crash fixes 
* Potentially addresses my comment in #1969
* Probably fixes #2145
 2015-05-28 13:03:28 +01:00
tycho
b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho
e19693e529 Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Inventory.cpp
 2015-05-28 11:05:41 +01:00
SafwatHalaby
b936781f93 AI - Tweaked wolf speed and teleport threshold 2015-05-28 08:31:17 +03:00
worktycho
7c028b87bc Merge pull request #2148 from SafwatHalaby/easy 
AI - Saner Livestock
 2015-05-27 17:46:11 +01:00
SafwatHalaby
52fcbb5c65 AI - Saner Livestock 2015-05-27 19:26:08 +03:00
Alexander Harkness
da4a76bb50 Merge pull request #2061 from mc-server/fixes 
Fixes
 2015-05-27 12:21:17 +01:00
tycho
31b95afd79 Fixed ClientHandle not getting properly removed from the world 
when socket is closed whilst the client is being added to the world
Fixes #1969
 2015-05-26 10:34:14 +01:00
Mattes D
c3c30a78e1 Merge pull request #1848 from scottwillmoore/ImplementTitleCommand 
Implement backend for /title command
 2015-05-26 08:46:16 +02:00
Mattes D
35c40bd9eb Merge pull request #2138 from Seadragon91/server_uptime 
Added method to get the uptime of the server in seconds.
 2015-05-26 07:59:10 +02:00
Lukas Pioch
c3b872ad93 Added method to get the uptime of the server in seconds. Implements #1650. 2015-05-26 05:36:46 +02:00
worktycho
6735b0d534 Only add default plugins if there are not any plugins 
Fixes #2082
 2015-05-25 18:43:18 +01:00
Alexander Harkness
150024265e Merge pull request #2135 from linnemannr/master 
Support building on FreeBSD
 2015-05-25 07:07:18 +01:00
linnemannr
5049fd0fbf Support building on FreeBSD 
SetFlags.cmake

	Add -lexecinfo to linker flags for FreeBSD to resolve backtrace()

lib/sqlite/CMakeLists.txt

	Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for
	POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define
	controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined
	to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE
	and __POSIX_VISIBLE to the 199506 for POSIX.1c

lib/tolua++/CMakeLists.txt
src/CMakeLists.txt

	Add /usr/local/lib to the library search path for FreeBSD builds

src/OSSupport/Errors.cpp

	Correct the strerror_r() implementation determination to check whether
	_GNU_SOURCE is defined, not what it evaluates to
 2015-05-24 20:07:31 -06:00
tycho
d1c9122340 Fix warnings in cPath 2015-05-24 17:47:15 +01:00
tycho
a6ccee5948 Merge branch 'master' into PreventNewWarnings 2015-05-24 17:27:05 +01:00
tycho
5ab650e4bb Fix bearbins comments 2015-05-24 15:25:52 +01:00
tycho
76a3165f09 Fix comments 2015-05-24 14:58:24 +01:00
tycho
95b81b3ef1 Disable -Werror for warnings in tests. 2015-05-24 14:16:05 +01:00
worktycho
bd95d7bf7b Merge pull request #2091 from Rakete1111/master 
Placing buckets up to 25 blocks away #2059
 2015-05-24 13:44:34 +01:00
Tiger Wang
10c9e66aad Fixes #2041 2015-05-24 13:37:36 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
worktycho
d86e8fae79 Merge pull request #2122 from SafwatHalaby/bounding 
Pathfinder - Bounding boxes and some tweaks
 2015-05-24 12:51:15 +01:00
Safwat Halaby
79c3e11a31 Merge pull request #2118 from mc-server/login-gamemode 
Fix gamemode not changing properly.
 2015-05-24 09:52:45 +03:00
Alexander Harkness
45012b72e7 Wolves don't spawn in rivers. 2015-05-24 07:28:17 +01:00
HaoTNN
2578afb244 Merge remote-tracking branch 'upstream/master' 2015-05-23 14:06:37 -07:00
SafwatHalaby
7021547e99 Pathfinder - Bounding boxes and some tweaks 2015-05-23 22:16:19 +03:00
Safwat Halaby
042c08d7e3 Merge pull request #2107 from mc-server/cow-waterspawn 
Cows no longer spawn over water.
 2015-05-23 22:11:34 +03:00
Alexander Harkness
febc8529b1 Fix gamemode not changing properly. 
Should fix #604
 2015-05-23 19:31:33 +01:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
worktycho
7e0dc0f9bc Merge pull request #2117 from Seadragon91/clang_errors 
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
 2015-05-23 15:31:49 +01:00
Lukas Pioch
e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho
b29ae54d91 Merge branch 'master' into PreventNewWarnings 2015-05-23 06:50:28 -07:00
tycho
a5624debcb Fix tests 2015-05-23 13:21:02 +01:00
Mattes D
dbf5fed2bc Merge pull request #2065 from mc-server/OldArgs 
Move some of the old arguments over to TCLAP
 2015-05-23 13:05:16 +02:00
Alexander Harkness
3a27fabbab Merge pull request #2103 from beeduck/Issue1980 
Fixed players head visible when in spectator mode
 2015-05-23 11:56:39 +01:00
tycho
1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
worktycho
26c9c34780 Fixed wrong copy/paste 
Fixes CID 110962
 2015-05-23 11:30:15 +01:00
Alexander Harkness
abf6ac3148 Cows and rabbits no longer spawn over water. 
Fixes #2080
 2015-05-23 10:38:57 +01:00
Alexander Harkness
de5e056a88 TryGetHeight returns a bool 
should fix #2099
 2015-05-23 10:37:50 +01:00
Alexander Harkness
e0fd3ce95b Merge pull request #2101 from mc-server/EquifaxCerts 
Close Ssl Socket on destroy
 2015-05-23 07:28:36 +01:00
Alexander Harkness
31f66fd812 Merge pull request #2104 from beeduck/Issue2053 
Fix for players falling through world when loading in as spectator
 2015-05-23 07:27:04 +01:00
SafwatHalaby
f983bb6234 Fixed creeper not exploding when 1 block higher than player 2015-05-23 09:06:00 +03:00
b33duck
afb96c5bd6 Added a fix for players falling through the world when connecting in spectator mode 2015-05-22 16:33:11 -07:00
Tiger Wang
8f6788b2ef Close Ssl Socket on destroy 
* Fixes #2072
 2015-05-22 23:54:32 +01:00
b33duck
906288c6eb Fixed players head visible when in spectator mode 2015-05-22 12:25:16 -07:00
Blitz Rakete
e512b7bf8e Fixes #2059 2015-05-21 19:03:51 +02:00
Mattes D
6bafff0560 Merge pull request #2086 from Seadragon91/master 
Renamed hook HOOK_ENTITY_CHANGE_WORLD
 2015-05-21 12:57:25 +02:00
Lukas Pioch
bc838e5bd2 Renamed hook HOOK_ENTITY_CHANGE_WORLD 2015-05-21 12:27:54 +02:00
Mattes D
90ab8a338b Added Equifax root CA. 
Fixes #2076.
Closes #2081.
Ref.: #2072.
 2015-05-21 10:26:45 +02:00
worktycho
c0d7b4d569 Merge pull request #2030 from beeduck/master 
Issue #1868 and Issue #1984
 2015-05-21 07:50:30 +01:00
Alexander Harkness
6202fdafe7 Merge pull request #2084 from mc-server/patch-2050 
Added missing fencetypes to torchhandler
 2015-05-21 07:02:10 +01:00
b33duck
ed3c0b771f Added open/close and sound effects for all door types 2015-05-20 16:24:16 -07:00
b33duck
a511db78ca Added thunder sound effect to CastThunderbolt() 2015-05-20 16:23:56 -07:00
Julian Laubstein
48b7874099 Added missing fencetypes to torchhandler 2015-05-20 23:18:21 +02:00
SafwatHalaby
8436e5d8bd Path recalculation improvements 2015-05-20 20:42:35 +03:00
worktycho
eaedd5f19d Merge pull request #2074 from SafwatHalaby/rmUnique 
Removed UniquePTR from PathFinder
 2015-05-20 13:06:51 +01:00
tycho
d9d4adc2a5 Moved no buffering command line argument to tclap 2015-05-20 01:50:04 +01:00
tycho
7c196ffde6 Move commlog arguments over to TCLAP 2015-05-20 01:50:04 +01:00
HaoTNN
ac1bfd9671 Merge remote-tracking branch 'upstream/master' 2015-05-19 14:22:27 -07:00
worktycho
8026133078 Don't verify certificate 
Temporary Hot-fix for #2072
 2015-05-19 21:25:38 +01:00
SafwatHalaby
395f3d9c4c newlines 2015-05-19 22:47:48 +03:00
tycho
813c95d4b0 Merge branch 'master' into PreventNewWarnings 2015-05-19 19:40:39 +01:00
tycho
77f1f58c0a Make -Werror disabling file only 
Ad fix a load of warnings
 2015-05-19 19:32:10 +01:00
SafwatHalaby
0741ad3526 Removed UniquePTR from PathFinder 2015-05-19 21:07:05 +03:00
Alexander Harkness
0c06ec6abd Merge pull request #2057 from Seadragon91/master 
Fix the health of animals
 2015-05-19 18:02:43 +01:00
tycho
480052c058 Added LuaState support for all integral types 
All so added error handling for out of range values
 2015-05-19 17:09:05 +01:00
tycho
2bb25b8afa Fixed some more warnings 2015-05-19 15:21:29 +01:00
tycho
050a014106 Finish fixing windows 2015-05-19 14:02:02 +01:00
tycho
03c75943ea More fixed warnings 2015-05-19 13:34:52 +01:00
tycho
6cccd2aabb Properly fix cFile Warnings 2015-05-19 13:33:34 +01:00
tycho
fa4fb75e03 Fixed compile and a few more warnings 2015-05-19 12:28:31 +01:00
tycho
95e06ab93f Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Blocks/BlockLeaves.h
 2015-05-19 11:55:23 +01:00
tycho
f2689c4887 Fixed a lot of warnings 2015-05-19 11:50:59 +01:00
Alexander Harkness
fff5efedc3 Merge pull request #2019 from mc-server/OverrideArgs 
Initial Implementation of command line arguments
 2015-05-19 10:53:44 +01:00
Alexander Harkness
2c0a11a8af Merge pull request #2060 from mc-server/more-leafimprove 
Improved leaves a bit more.
 2015-05-19 09:32:14 +01:00
Alexander Harkness
d852209f8d Manual merge of #2066 2015-05-19 09:29:27 +01:00
Alexander Harkness
b50135e78f Merge pull request #2064 from Seadragon91/hook_entity_change_world 
Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD
 2015-05-19 09:24:50 +01:00
haotnn
6128e3f7cd Fixes lit furnace issue in #2051 2015-05-18 23:19:03 -07:00
Lukas Pioch
4d4d1e9c69 Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD 
Fixes #1435.
 2015-05-18 22:29:39 +02:00
tycho
2e98bfc4e9 Add support for setting ports through command line 2015-05-18 17:26:12 +01:00
tycho
c2303ac4cf Fix max slots logic to only override if acctually present. 2015-05-18 15:43:26 +01:00
Tiger Wang
1632d5f8f1 Fixes #2003 2015-05-18 15:43:24 +01:00
Tiger Wang
0dbba305b6 Fixes #2052 2015-05-18 14:30:16 +01:00
Alexander Harkness
aedf9d05cb Improved leaves a bit more. 
Should fix #2058.
 2015-05-18 13:43:00 +01:00
STRWarrior
007bac638b Merge branch 'master' of https://github.com/mc-server/MCServer 2015-05-18 09:30:43 +02:00
Safwat Halaby
75d2f1a61b Merge pull request #2049 from mc-server/sapling-probability 
Fix sapling probability.
 2015-05-18 08:20:00 +03:00
Lukas Pioch
a75106aea7 Fix the health of animals 2015-05-18 06:36:52 +02:00
Safwat Halaby
b7b088494c Merge pull request #2037 from SafwatHalaby/aprox 
Pathfinder - approximated paths when original destination unreachable
 2015-05-17 23:21:52 +03:00
STRWarrior
b9481dafeb Updated the defaults for the overworld world generator 2015-05-17 19:36:18 +02:00
SafwatHalaby
29e31c5be9 Pathfinder - approximated paths when original destination unreachable 2015-05-17 19:36:52 +03:00
Alexander Harkness
1049d5b706 properly this time? 2015-05-17 16:30:13 +01:00
Alexander Harkness
adecdc2f07 Fixed typo. 2015-05-17 16:10:55 +01:00
Alexander Harkness
d48825fa81 Fix sapling probability. 
Probability is 5% of leaves drop a sapling.

This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability.
 2015-05-17 14:23:16 +01:00
worktycho
c94134ec5e Fix FastRandom seeding 
Fixes #1815
Fixes #2021
 2015-05-17 13:16:18 +01:00
Mattes D
f3d6da29f7 Fixed inventory handling. 
Fixes #2035.
 2015-05-16 23:22:50 +02:00
Safwat Halaby
4ace226dcd Merge pull request #2033 from mc-server/BreakIntoDebugger 
Lua: Break into ZBS debugger on API errors.
 2015-05-16 22:59:42 +03:00
Alexander Harkness
c9880b9cb5 Fixed bad logic. 2015-05-16 16:58:43 +01:00
Alexander Harkness
bda9b3e342 Should Fix sign flipping. 
Fixes #1118
 2015-05-16 16:49:47 +01:00
Mattes D
1240c76cb4 Lua: Break into ZBS debugger on API errors. 2015-05-16 16:19:18 +02:00
Mattes D
0b536701b4 Merge pull request #2029 from mc-server/bedPatch 
Bed uses bottom two bits for direction not three
 2015-05-16 14:11:56 +02:00
tycho
36fe8ee5f5 Added deoxy comments 2015-05-16 12:46:43 +01:00
worktycho
6350e4f279 Bed uses bottom two bits for direction not three 2015-05-16 12:07:38 +01:00
worktycho
0da8c7392e Fix service Main 2015-05-16 10:47:04 +01:00
tycho
c96849f431 Move make_unique into a namespace to avoid ADL issues 
this prevents VS finding std::make_unique for constructors that take types from std
 2015-05-16 10:47:04 +01:00
tycho
b9efa02c80 Initial implementation of IniFile overloading 2015-05-16 10:46:51 +01:00
SafwatHalaby
4ffc6621a9 PathFinder uses UniquePtr for cell map. 2015-05-16 10:38:58 +02:00
worktycho
5c3a85fba1 Revert "PathFinder - smart pointers" 2015-05-15 18:54:45 +01:00
SafwatHalaby
a8878dd2b6 uniquePTR 2015-05-15 20:25:44 +03:00
Mattes D
163aebf8ca Fixed cPluginManager:ForEachCommand() and ForEachConsoleCommand() 
The functions would leak one value on the Lua stack for each enumerated command.
Fixes #2017.
 2015-05-14 19:46:18 +02:00
Mattes D
c3804f08c8 Merge pull request #2018 from mc-server/ProbDif 
Fixed possible crash in cProbabDistrib
 2015-05-14 17:23:23 +02:00
STRWarrior
67b6b71a5b Fixed possible crash in cProbabDistrib 
It could divide through 0 which causes a crash
 2015-05-14 16:49:13 +02:00
Mattes D
80f2e1eb66 Merge pull request #2010 from TwiddleStick/patch-2 
Update World.cpp
 2015-05-14 13:41:22 +02:00
Mattes D
43fecf48e3 Merge pull request #2006 from mc-server/ManualBindingsWorld 
Moved cWorld manual bindings out into a separate file.
 2015-05-14 08:15:40 +02:00
Martin Fahy
8f0f421ae4 Update World.cpp 
Fixed minor typos in comments, simply trying to understand the code base to fix issue regarding no sound when lighting is produced, no change to actual code.
 2015-05-13 23:05:44 -04:00
Mattes D
2cdc2a16e4 Fixed chat message manipulation by plugins. 
Plugins, in their OnChat hook, can change the chat message sent by a player.
 2015-05-13 18:45:29 +02:00
Mattes D
f36b00f4d4 All in-game commands go through the OnExecuteCommand hook. 
Everything that has a slash at the beginning, doesn't matter if it is a registered command or not.
 2015-05-13 18:31:01 +02:00
Mattes D
15771e4759 Moved cWorld manual bindings out into a separate file. 2015-05-13 11:30:57 +02:00
Mattes D
0686b55901 Merge pull request #2001 from mc-server/BindingsCleanup 
Bindings cleanup
 2015-05-12 10:29:55 +02:00
Mattes D
4b97569b3a ToLua now generates cLuaState::Push() and GetStackValue() 
For classes exported through ToLua it generates the cLuaState::Push() and cLuaState::GetStackValue() functions, as well as the supporting forward declarations and typedefs.
Renamed virtual_method_hooks.lua to BindingsProcessor.lua since it no longer provides virtual method hooks and instead does additional processing when generating the bindings.
 2015-05-12 09:20:54 +02:00
Tiger Wang
c10e83c02d Fixed creative click-outside 
* Fixes #1995
 2015-05-11 23:21:46 +01:00
Tiger Wang
30b17bcb97 Improved hoppers 
* Fixes #1994
 2015-05-11 22:58:27 +01:00
Mattes D
4083bc7005 AllToLua: Removed unneeded virtual method hooks. 2015-05-11 16:11:53 +02:00
Mattes D
dd10ffb63a OnExecuteCommand hook can override the command result (crXXX). 2015-05-10 23:11:30 +02:00
Mattes D
693ffb689c Exported cPluginManager:ExecuteConsoleCommand() to Lua API. 
Fixes #1999.
 2015-05-10 22:51:16 +02:00
Mattes D
6c53abed23 Call HOOK_EXECUTE_COMMAND even for unknown console commands. 
This allows plugins such as Aliases to intercept even unknown commands.
 2015-05-10 21:46:25 +02:00
Mattes D
b356419a07 StringUtils: Fixed StringSplitWithQuotes(). 
The function would crash when given a string that started with the delimiter.
 2015-05-10 21:39:14 +02:00
Mattes D
cbb1eff17a Added the EntireCommand parameter to HOOK_EXECUTE_COMMAND. 
Fixes #1996.
 2015-05-10 21:37:46 +02:00
Tiger Wang
9c490293b8 Merge remote-tracking branch 'origin/master' into warnings 
Conflicts:
	src/Mobs/Monster.cpp
	src/Vector3.h
 2015-05-10 12:16:20 +01:00
Tiger Wang
11ef1fd24a Fixed some warnings and logic errors in Monster.cpp 2015-05-10 12:14:55 +01:00
wiseoldman95
8a576a0a35 PF - Less calcs per tick 2015-05-10 09:08:42 +03:00
Mattes D
756d310318 Added check against "Type const &" and "Type const *". 2015-05-09 12:58:56 +02: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
jammet
61300ab9ef Rabbit and cooked rabbit now stackable 
And corrected the alphabetical ordering.
 2015-05-09 12:56:23 +02:00
Mattes D
92b8cd2f2a Merge pull request #1956 from Tri125/master 
Fixed Magma cube sound and spawn size
 2015-05-09 12:44:57 +02:00
worktycho
e2e206d81b Fixed remaing pragmas 2015-05-09 10:59:08 +01:00
worktycho
4dcd9a9924 clang diagnostic not diagnostics 
fixed clang pragmas
 2015-05-09 10:55:40 +01:00
Alexander Harkness
049ff67416 Merge pull request #1973 from Tri125/QuartzStack 
Fixed #1893 : Quartz can now stack
 2015-05-09 06:58:29 +01:00
Tristan
4642a50d62 GetSizeName of cSlime and cMagmaCube is now static 2015-05-08 20:50:05 -04:00
worktycho
523db778d9 Merge pull request #1972 from Woazboat/CodeCleanup_refactored 
Fixed compiler warning overrides in Vector3.h
 2015-05-09 00:25:38 +01:00
Woazboat
eaba777a0e Fixed compiler warning overrides in Vector3.h 2015-05-09 01:15:45 +02:00
Tiger Wang
218010cd96 Fixed some Visual Studio warnings 2015-05-08 23:32:02 +01:00
worktycho
1cef39cb73 Move chunk position accesses after the chunk validity checks 2015-05-08 23:20:22 +01:00
Mattes D
9329c2c2cb Merge pull request #1945 from Woazboat/CodeCleanup_refactored 
Small code cleanup - clean version
 2015-05-08 21:52:41 +02:00
wiseoldman95
290bc2e377 Spaces in cPath 2015-05-08 17:08:15 +03:00
Woazboat
eb84ffe5a6 Added float comparison warning overrides to Vector3::hasNonZeroLength 2015-05-08 15:12:33 +02:00
Woazboat
ed404bc2f6 Ignoring Clang warnings for strict float comparison in Vector::Equals() 2015-05-08 15:12:33 +02:00
Woazboat
689fe6041c Changed Vector3 Equals function to avoid using memcmp 2015-05-08 15:12:33 +02:00
Woazboat
8a50918d2a Tracer::signum function now returns int 
convert c style casts to c++ static casts

Changed fabs() to std::abs()
 2015-05-08 15:12:32 +02:00
Woazboat
c74bfc35d6 Check for zero length vector in Trace 
Added hasNonZeroLength member function to Vector3
 2015-05-08 15:12:32 +02:00
Woazboat
0d003a2d2a Changed Tracer::m_NormalTable to static array 
Was previously instantiated for every trace
 2015-05-08 15:12:32 +02:00
Mattes D
fee690a3d1 Fixed inter-plugin calls. 
When an inter-plugin call failed due to function not found, the server would maul the LuaState and "yield".
Fixes #1959.
 2015-05-07 23:03:04 +02:00
worktycho
011126293b Merge pull request #1949 from SafwatHalaby/burn 
AI - Better shade cover
 2015-05-07 21:58:02 +01:00
Tri125
429e545167 Fixed #1893 
Quartz ore now stack properly
 2015-05-07 11:49:11 -04:00
Mattes D
4888f671d1 Merge pull request #1951 from mc-server/BroadcastRefactor 
Added support for sending additional data in the ParticleEffect packet
 2015-05-07 16:14:56 +02:00
Tri125
9f6192687f Big Magma Cube can now spawn 
Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4.
 2015-05-06 23:56:08 -04:00
Tri125
63af47832d Fixed the sound issue with the MagmaCube 
-Name of the sound is correctly capitalized

-Get the appropriate sound depending on its size
 2015-05-06 23:12:17 -04:00
tycho
448df85e56 Added support for additional data in the ParticleEffect Packet 
Also started refactoring how broadcasts are handled
 2015-05-07 03:47:46 +01:00
wiseoldman95
40af96b100 AI - Safer WouldBurnAt() 2015-05-06 20:01:06 +03:00
wiseoldman95
753dfb950a AI - Better shade cover 2015-05-06 20:01:06 +03:00
worktycho
7771091099 Actually empty the open list 2015-05-06 17:26:59 +01:00
wiseoldman95
b8aa38b18d (duplicate) AI - Livestock escape fixed, water jumping fixed 2015-05-06 17:23:07 +03:00
wiseoldman95
c6dd455d72 PF - Swimming bugfix 2015-05-06 09:27:47 +03:00
wiseoldman95
020e928685 PF - Fixed mobs not reaching leaning player 2015-05-06 07:31:02 +03:00
worktycho
f71d693302 Merge pull request #1939 from SafwatHalaby/Polising 
AI - More conservative use of ResetPathFinding, some polishing
 2015-05-05 14:09:16 +01:00
wiseoldman95
304bc4eca4 AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug 2015-05-05 12:51:58 +03:00
wiseoldman95
94f882b144 Chmod +x CheckBasicStyle.lua 2015-05-05 12:49:07 +03:00
Mattes D
9ba7823252 Merge pull request #1938 from jan64/master 
Change visual protocol name to include MCServer
 2015-05-04 23:28:49 +02:00
Alexander Harkness
adba982257 Merge pull request #1935 from mc-server/fixes 
Entity improvements
 2015-05-04 19:31:53 +01:00
jan64
b1efaa55cd Change visual protocol name to include MCServer 2015-05-04 17:52:46 +02:00
worktycho
6df0e877e8 Print Build info as part of the crash information 2015-05-04 09:07:03 +01:00
Tiger Wang
a509cf00ef Entity improvements 
•Pathfinder improvements
•Fixes #1217
•Fixes #1933

Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
 2015-05-03 23:58:12 +01:00
Tiger Wang
335879e224 Merge pull request #1934 from SafwatHalaby/p_IsSolidChunks 
PathFinder - Fixed nullptr chunk bug
 2015-05-03 18:53:37 +01:00
wiseoldman95
33ffa420a6 PathFinder - Fixed nullptr chunk bug 2015-05-03 19:43:11 +03:00
Tiger Wang
f96f9dae66 Merge pull request #1930 from SafwatHalaby/AI_Jump 
AI - Improved Mob Jumping
 2015-05-03 13:23:04 +01:00
wiseoldman95
d68b75a679 AI - Improved Mob Jumping 2015-05-03 14:24:24 +03:00
Mattes D
d757d75b6c Merge pull request #1932 from SafwatHalaby/F_AssertFix 
PathFinder - Fixed Howaner's bug
 2015-05-03 11:51:09 +02:00
wiseoldman95
599ad97b65 PathFinder - Crash fix, chunks in parameters are now references 2015-05-03 10:49:06 +03:00
Mattes D
e6eeee84e0 Merge pull request #1880 from mc-server/submodules 
Update submodules
 2015-05-03 00:03:07 +02:00
Tiger Wang
9226bdbd4c Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze 
Pathfinder optimization
 2015-05-02 16:50:42 +01:00
Tiger Wang
114962943b Merge pull request #1927 from SafwatHalaby/AI_BetterDayLightHandling 
AI - Much better burning/daylight behavior
 2015-05-02 16:50:08 +01:00
Tiger Wang
e4eb039704 Merge pull request #1919 from mathias-github/patch-1 
Added Guardian and Rabbit to DefaultMonsters in Overworld
 2015-05-02 16:10:51 +01:00
Tiger Wang
2919d08883 Update submodules 2015-05-02 15:57:49 +01:00
wiseoldman95
3586f25853 AI - Better daylight handling 2015-05-02 14:32:33 +03:00