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
