1
0
Commit Graph

4180 Commits

Author SHA1 Message Date
madmaxoft
ae897804a0 ProtoProxy: Added encryption support. 2014-01-28 23:53:54 +01:00
madmaxoft
bc6fc859f4 Protocol 1.7: Forced encryption on all connections.
This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
2014-01-28 23:53:54 +01:00
madmaxoft
9de52252ac Crypto: Added public key encryption / decryption. 2014-01-28 23:53:54 +01:00
madmaxoft
f7cbb07b54 Fixed an error in Crypto. 2014-01-28 23:53:53 +01:00
Mattes D
3390607ee5 Merge pull request #594 from mc-server/Villager_Update
Villager update
2014-01-28 07:32:01 -08:00
madmaxoft
76457d3673 Fixed timing on *nix. 2014-01-28 16:28:55 +01:00
STRWarrior
8ca98e0c0e Renamed Farmer functions and added doxycomments 2014-01-28 16:26:44 +01:00
STRWarrior
b2bacf3a25 Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. 2014-01-28 15:40:13 +01:00
madmaxoft
81837edb22 Fixed a slight bug in RSA encryption code. 2014-01-28 09:50:48 +01:00
Mattes D
5f9228bac8 Merge pull request #595 from mc-server/NonBlockingSockets
Non blocking sockets
2014-01-27 21:43:59 -08:00
STRWarrior
807a4dba98 Villager doesn't check the environment for crops if it doesn't need to. 2014-01-27 22:04:24 +01:00
STRWarrior
babc80ed77 The world can now be configured wether farmers should be able to harvest crops. 2014-01-27 22:02:19 +01:00
STRWarrior
8bf9043f98 Villager: Few more comments. 2014-01-27 21:39:00 +01:00
madmaxoft
a359275064 Squashed common code. 2014-01-27 21:34:54 +01:00
STRWarrior
33ad2761a0 Cleanup
Most code in Tick is now split up in different functions.
2014-01-27 21:34:22 +01:00
madmaxoft
4169af1ce1 Fixed Linux compilation. 2014-01-27 21:33:06 +01:00
madmaxoft
cc1284a753 Rewritten networking to use non-blocking sockets.
This fixes #592.
2014-01-27 21:27:13 +01:00
STRWarrior
723bb78dd1 Villagers: Harvesting is more rare. 2014-01-27 20:52:42 +01:00
STRWarrior
5b983b72fa Villager: Farmers can't place crops on blocks other then farmland. 2014-01-27 20:44:18 +01:00
Tiger Wang
f5589a1ec7 Updated polarssl 2014-01-27 19:34:18 +00:00
Tiger Wang
fc9e527830 SIGABRT exits with failure. 2014-01-27 18:57:26 +00:00
STRWarrior
9cf006ecea Fixed compiler error. 2014-01-27 19:06:50 +01:00
STRWarrior
3dbe6c6de9 Villager: Farmer: Crops finding is more random. 2014-01-27 18:58:09 +01:00
STRWarrior
9807056a9c Added GetCropsPos and DidFindCrops functions. 2014-01-27 18:33:57 +01:00
STRWarrior
06c3bc1ea5 Villagers: Farmers now replant the crops. 2014-01-27 18:27:57 +01:00
STRWarrior
2cdd8f1961 Villagers: Fixed only gettings the crops block when farming. 2014-01-27 17:30:18 +01:00
STRWarrior
ca12decaf6 Villagers don't look for new crops when they already found one.
Slight cleanup.
2014-01-27 17:20:39 +01:00
STRWarrior
89a620ca54 E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them. 2014-01-27 17:19:13 +01:00
STRWarrior
969bf05a26 Villagers: Farmers can also harvest carrots and potatoes. 2014-01-27 15:44:55 +01:00
STRWarrior
ed95f4d81b Makes farmers farm crops. 2014-01-27 14:40:31 +01:00
madmaxoft
30c431b479 Fixed client packet parsing.
When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541.
Also modified comm logging, now each direction can be turned on separately.
2014-01-26 17:56:12 +01:00
madmaxoft
ab4672be40 cByteBuffer has more self-tests. 2014-01-26 17:56:12 +01:00
madmaxoft
61848ff5a0 Item-loading now checks for weird bytes. 2014-01-26 17:56:11 +01:00
madmaxoft
a3ac1be7b7 Fixed Byte-order reading.
The functions would fail on bytes that were above 127.
2014-01-26 17:56:11 +01:00
Tiger Wang
ea9de4bbb7 Added SIGABRT to catchers list 2014-01-26 16:15:05 +00:00
Tycho
6952b24e88 Changed it so std was actually set to c++11 in clang not gcc on OS X 2014-01-26 07:20:24 -08:00
Tycho
6e6409b1a0 Removed cWorld Include 2014-01-26 07:10:29 -08:00
Tycho
a13d009a30 Refactored GetPlacementBlockTypeMeta 2014-01-26 07:06:25 -08:00
Tycho
bed2ee22e8 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/Blocks/BlockRail.h
	src/World.h
2014-01-26 06:28:51 -08:00
Tycho
14e48ccb4b Refactored cBlockHandler::OnUse and dependents 2014-01-26 06:20:39 -08:00
Mattes D
09ee8a1bb6 Merge pull request #589 from mc-server/minecartimprovements
Minecart improvements
2014-01-26 05:13:54 -08:00
Mattes D
1f4e12c50c Merge pull request #590 from mc-server/Wolf_Fix
Wolf: Small fix since the new AI and a new small feature.
2014-01-26 04:40:16 -08:00
STRWarrior
4c780e7b44 Fixed bug where wolfs would teleport while they were sitting. 2014-01-26 13:27:35 +01:00
STRWarrior
a533386144 Small fix since the new AI and a new small feature.
You get particles when trying to tame wolfs.
They don't walk anymore when they are sitting.
2014-01-26 13:07:21 +01:00
Tiger Wang
70113b5730 Fixed segmentation fault on villager damage
It occurred when attack was environmental.
2014-01-26 00:14:00 +00:00
Tiger Wang
52f7467fe1 Reduced unnecessary echoes (thanks xoft) 2014-01-25 23:48:48 +00:00
Tycho
a2d3eea80b Added support for overide in c++11 supporting varients of gcc/clang 2014-01-25 15:02:31 -08:00
Mattes D
f78a62a5e3 Merge pull request #575 from worktycho/GeneratingBenchmark
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
Mattes D
5749b40422 Merge pull request #588 from mc-server/Sheep_Eating
Implemented sheeps eating grass.
2014-01-25 13:36:47 -08:00
Mattes D
cdcad2237a Merge pull request #587 from mc-server/mobimprovements
Mob improvements & rudimentary artificial intelligence
2014-01-25 13:36:32 -08:00