Lukas Pioch
1395ff3ca4
Merge pull request #2761 from cuberite/fixed_warnings
...
Moved variables into scope, removed unused variables and fixed variables
2015-12-17 11:37:20 +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
worktycho
83418e1d7a
Merge pull request #2754 from Gargaj/horsefix
...
Allow horse control
2015-12-15 21:53:23 +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
Lukas Pioch
2a218b06c2
Merge pull request #2750 from cuberite/wrng
...
Fixed warning regarding an uninitialized value
2015-12-15 18:21:46 +01:00
Julian Laubstein
5af10b8cd3
Fixed warning regarding an uninitialized value
2015-12-15 17:20:34 +01:00
worktycho
5ca4c5272e
Merge pull request #2749 from cuberite/wrng
...
Fixed warning regarding an uninitialized value
2015-12-15 16:17:16 +00:00
Julian Laubstein
8d5f4f2160
Fixed warning regarding an uninitialized value
2015-12-15 17:06:32 +01:00
Safwat Halaby
a632f39546
Merge pull request #2748 from cuberite/fix_memory_leak
...
Changed raw cPath to an unique_ptr, fixes memory leak (Fixes #2745 )
2015-12-15 10:50:40 +02: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
worktycho
68105777fa
Merge pull request #2744 from cuberite/HopperMetaStrip
...
Strip meta from hopper on converting to pickup
2015-12-13 15:59:58 +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
fec522aa03
Merge pull request #2743 from SafwatHalaby/wart
...
Set overgrown wart age to 3
2015-12-13 16:12:39 +02:00
Safwat Halaby
1540867cb5
Set overgrown wart age to 3
2015-12-13 15:55:09 +02:00
Safwat Halaby
417a646d7d
Merge pull request #2708 from Gargaj/onuse
...
Allow use failures to propagate from the entity/block to the player
2015-12-13 14:43:53 +02:00
Gargaj
f9008a4860
allow use failures to propagate from the entity/block to the player
2015-12-13 13:27:38 +01:00
Safwat Halaby
e7fd308ffa
Merge pull request #2737 from Gargaj/snowgolem
...
Snow golems are supposed to be "neutral"
2015-12-13 14:27:02 +02:00
Gargaj
e31676fe50
snow golems are "neutral"
2015-12-13 13:13:37 +01:00
Safwat Halaby
4a212777cb
Merge pull request #2738 from Gargaj/mobinheritance
...
Sheep color inheritance
2015-12-13 14:12:25 +02:00
Gargaj
0eb519b35a
sheep color inheritance
2015-12-13 13:04:18 +01:00
Safwat Halaby
2214fdcede
Merge pull request #2741 from SafwatHalaby/mTarget2
...
Remove stray "return"
2015-12-13 08:30:18 +02:00
Safwat Halaby
4851f5e2c9
Remove stray "return"
2015-12-13 08:04:41 +02:00
Safwat Halaby
e4a237bad0
Merge pull request #2740 from SafwatHalaby/mTarget
...
Fixed mobs attacking Creative Mode players
2015-12-13 08:01:45 +02:00
Safwat Halaby
91aec448eb
Fixed mobs attacking Creative Mode players
2015-12-13 07:52:11 +02:00
Safwat Halaby
86b51083a1
Merge pull request #2668 from SafwatHalaby/decouple2
...
Decoupled cMonster and path recalc logic, re-implemented recalc.
2015-12-13 07:33:59 +02:00
Safwat Halaby
8a5df43e6c
Decoupled cMonster and path recalc logic, re-implemented recalc
2015-12-13 07:13:34 +02:00
Safwat Halaby
7501d44258
Merge pull request #2739 from Gargaj/patch-6
...
Stop pathfinding over cobble walls
2015-12-13 07:03: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
Safwat Halaby
6995af05fe
Merge pull request #2735 from SafwatHalaby/mathias2
...
Attempt 2 - Fixed a few crafting recipes
2015-12-12 18:58:07 +02:00
Mathias
671e81966b
Fixed a few crafting recipes
2015-12-12 18:39:01 +02:00
Safwat Halaby
1dd12c07a8
Merge pull request #2732 from Gargaj/patch-5
...
Nether wart only ages to 3
2015-12-12 11:13:17 +02:00
Gargaj
115865f845
Nether wart only ages to 3
...
See http://minecraft.gamepedia.com/Nether_Wart
2015-12-12 00:46:01 +01:00
worktycho
afb9ea126c
Merge pull request #2721 from bmintz/patch-1
...
Put the entire "automatic compile" script in a code block for security
2015-12-11 00:22:20 +00:00
Benjamin Mintz
2503691c8e
Merge branch 'master' into patch-1
2015-12-10 18:07:03 -06:00
Gargaj
56e7329f29
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 18:06:36 -06:00
Benjamin Mintz
65c89f052b
Put the entire compile.sh script in a code block for security
...
This makes sure that sh will error out if the connection is interrupted.
See here: https://www.seancassidy.me/dont-pipe-to-your-shell.html
2015-12-10 18:06:16 -06:00
Alexander Harkness
4b10146b2e
Merge pull request #2727 from Gargaj/patch-4
...
Test for correct coordinates when fishing
2015-12-10 21:04:45 +00: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
Julian Laubstein
2b2e0f3b2c
Merge pull request #2720 from cuberite/OreNestsFix
...
Fixed opposite condition in OreNests finisher.
2015-12-09 14:02:50 +01:00
Mattes D
b8fe09901b
Fixed opposite condition in OreNests finisher.
2015-12-09 08:03:33 +01:00
Mattes D
ac8504a6ef
Merge pull request #2706 from Gargaj/deadcreeper
...
Stop creepers from exploding even if they just died
2015-12-09 07:47:06 +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
Mattes D
68e575c917
Merge pull request #2713 from Gargaj/patch-2
...
Tilling dirt should send block update
2015-12-06 13:40:45 +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
