1
0
Commit Graph

4131 Commits

Author SHA1 Message Date
joshi07
f71b1fe799 Added OnTeleportEntity hook for plugins.
Plugins may or may not allow teleport to the new position.
Updated the HookNotify plugin with it.
2015-03-05 11:52:42 +01:00
Mattes D
d4b505db02 Lua API: Fixed md5 and sha1 hex formatting.
std::setw() is only valid for one output operation and needs to be set again in each loop repetition.
2015-03-03 01:28:58 +01:00
Mattes D
7767af9493 Merge pull request #1781 from mc-server/Vines
Vines in caves
2015-03-01 22:52:40 +01:00
STRWarrior
db2a406c13 Removed trailing whitespace 2015-03-01 20:09:44 +01:00
STRWarrior
3d3735a378 Replaced IntNoiseXX with IntNoiseXXInt 2015-03-01 20:08:05 +01:00
STRWarrior
e63f9bdc1a Replaced cFinishGenPtr with std::make_shared 2015-03-01 20:06:44 +01:00
Tycho
bdea6c92b3 Fixed Style
Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates
2015-03-01 14:51:07 +00:00
Tycho
3f61255fe1 Added pipelining syntax for generators 2015-03-01 14:27:01 +00:00
Mattes D
d2e1ed3a3b Steppy HeiGen: Fixed Linux compilation. 2015-03-01 12:40:53 +01:00
Mattes D
a20c1c6d43 Merge pull request #1780 from DevToaster/master
Modified Player class to use int data type for experience
2015-03-01 12:16:06 +01:00
Mattes D
780a9ae9d1 Added Steppy height generator. 2015-03-01 12:13:39 +01:00
STRWarrior
0394acfc0c Made the minimum vine level configurable 2015-02-28 22:40:13 +01:00
STRWarrior
19d7ec51a0 Implemented a vines finisher that creates vines in jungle biomes 2015-02-28 22:37:33 +01:00
DevToaster
f5a216cabc Changed C-styled casts to static_cast and removed unneeded casts 2015-03-01 03:45:06 +10:30
NiLSPACE
24bb911c3c Merge pull request #1769 from mc-server/snowweather
Snow weather
2015-02-28 18:05:06 +01:00
DevToaster
e012c06281 Replaced short int with int for Player experience 2015-03-01 03:09:36 +10:30
DevToaster
b65a6ef210 modified: src/Entities/Player.cpp
modified:   src/Entities/Player.h
2015-03-01 03:03:41 +10:30
STRWarrior
224df08d30 GetSnowStartHeight returns an int 2015-02-28 17:27:28 +01:00
Mattes D
88fc70a06a Fixed door placement.
Doors now have hinges on the correct side, based on what the surroundings are when placing them.
2015-02-28 17:16:21 +01:00
STRWarrior
e63b4f4913 Added experience drops when mining ores 2015-02-28 16:34:17 +01:00
STRWarrior
81e8577cfd changed int to unsigned
And return 0 instead of -1
2015-02-26 20:26:45 +01:00
Raekye
378528136c use DoSetSpeed in AddSpeed* in Entity.cpp 2015-02-25 20:56:45 -05:00
STRWarrior
ac2c88b451 Ice finisher uses GetSnowStartHeight instead of specific biomes 2015-02-25 19:22:44 +01:00
STRWarrior
ba3eaf9223 Snow finisher uses GetSnowStartHeight instead of specific biomes 2015-02-25 19:12:53 +01:00
STRWarrior
b3f0751130 Weather: Snow starts forming when the top block is at the right height or higher 2015-02-25 19:02:08 +01:00
STRWarrior
f1f23b09ae Added GetSnowStartHeight
returns the height of a biome where it starts snowing
2015-02-25 19:00:52 +01:00
STRWarrior
a56b6906d6 Fixed flowing water turning into ice when snowing 2015-02-25 17:26:48 +01:00
Mattes D
81c49a0246 Merge pull request #1762 from mc-server/LuaStringCompress
Lua string compress
2015-02-25 10:18:39 +01:00
Mattes D
c286b186c4 1.8 Protocol: Fixed a possible race condition.
Fixes #1759.
2015-02-24 10:04:43 +01:00
STRWarrior
9e1db16ba4 Fixed operators 2015-02-23 16:09:35 +01:00
STRWarrior
d39d2ca5e9 Added forgotten indent 2015-02-23 15:40:31 +01:00
STRWarrior
8c8ec1094d Replaced lua_isXYZ with cLuaState::CheckParamXYZ 2015-02-23 15:29:07 +01:00
STRWarrior
54410bfe4d Exported all compression functions in a new class. 2015-02-23 12:53:02 +01:00
Mattes D
b474b9fb5d Fixed race condition for TCP link deleting.
This could have caused crashes when a client disconnected from the server.
2015-02-22 19:06:04 +01:00
Mattes D
1551e29f00 Network: Replaced magic number with named constant. 2015-02-22 18:52:49 +01:00
STRWarrior
13f81a051d Exported CompressString and UncompressString to Lua 2015-02-22 17:34:20 +01:00
Mattes D
c758482ece cNetwork: Added EnumLocalIPAddresses() function. 2015-02-22 10:51:16 +01:00
Mattes D
1bcc4abd68 Door handler: Removed needless check.
The Y coord has already been checked above.
2015-02-21 14:23:37 +01:00
Freddie Wang
b165ab6363 Fix door placement check 2015-02-21 14:22:05 +01:00
Mattes D
006b1afa9e Merge pull request #1758 from mc-server/CryptoHashAPI
Added cCryptoHash namespace to Lua API
2015-02-21 12:19:07 +01:00
Mattes D
9971670b40 Merge pull request #1755 from mc-server/NetworkUDP
cNetwork: Added UDP API.
2015-02-21 12:19:03 +01:00
Mattes D
b9e4fe0a3b Added cCryptoHash namespace to Lua API. 2015-02-21 09:41:14 +01:00
Mattes D
22d3a6a47f Fixed monster spawn randomness.
Fixes #1699.
2015-02-20 22:55:19 +01:00
Mattes D
e30ee8063d UDPEndpointImpl: Fixed clang warnings. 2015-02-20 16:05:53 +01:00
Mattes D
9c5162041e cNetwork: Added UDP API. 2015-02-20 14:28:05 +01:00
Matyas Dolak
5d4dd103a1 Fixed crash when logging nil values.
Ref.: http://forum.mc-server.org/showthread.php?tid=1798
2015-02-20 09:51:18 +01:00
Howaner
1a60785ca2 Flower pots: In 1.8 items are saved with the name and not the id. 2015-02-18 23:33:27 +01:00
Mattes D
70d54054e3 NetworkSingleton: LibEvent thread is joined properly on server exit. 2015-02-18 22:41:22 +01:00
Mattes D
612637ab2e Network: Fixed two-socket servers. 2015-02-18 09:35:14 +01:00
Mattes D
d336a3ea9e Fixed TCP link shutdown.
The shutdown is postponed until there's no more outgoing data in the LibEvent buffers.
2015-02-14 13:55:54 +01:00
Mattes D
1ca0a4915e SslContext: Turned debug messages off. 2015-02-14 13:31:31 +01:00
Mattes D
1f3d11de32 Fixed Linux compilation. 2015-02-14 09:17:26 +01:00
Mattes D
557adf3be9 Exported TLS server start on cTCPLink to Lua API. 2015-02-13 23:18:22 +01:00
Mattes D
b8bf795dd1 Exported cTCPLink:Close and :Shutdown() to Lua API. 2015-02-13 18:31:54 +01:00
Mattes D
bae8b2e1fa PolarSSL++: Fixed debugging output. 2015-02-12 20:23:04 +01:00
Mattes D
505dce1fc3 Fixed Linux compilation.
std::make_unique is not available in C++11.
2015-02-12 20:22:39 +01:00
Mattes D
16636ff6e2 LuaAPI: Added client TLS support for TCP links. 2015-02-12 20:05:55 +01:00
Tiger Wang
3869f76cc2 Handle client 'leave bed' request
* Fixes #1728
2015-02-08 21:21:48 +00:00
Mattes D
1ce9164694 Protocol 1.7: Fixed Coverity issues.
Fixes CID 66411, CID 103166 and CID 103167.
2015-02-08 14:49:46 +01:00
Mattes D
81d7329ad3 ServerHandle: Fixed socket reuse.
Fixes CID 104670, CID 104670 and CID 103724.
2015-02-08 14:41:24 +01:00
Mattes D
a939e2ded9 WSSAnvil: Fixed chunk data padding.
When the chunk data fit perfectly into the old space, an extra 4 KiB of padding zeroes were written, overwriting the next chunk.
Fixes #1730.
2015-02-08 12:24:15 +01:00
Mattes D
5ee5a691b7 Merge pull request #1729 from mc-server/ReuseFlag
Set reuse flag to sockets
2015-02-08 00:08:18 +01:00
Howaner
be528a9f52 Use evutil_make_listen_socket_reuseable 2015-02-07 18:39:24 +01:00
Mattes D
512b1a6b0e Merge pull request #1718 from mc-server/LuaNetworkAPI
Lua Network API
2015-02-07 17:46:16 +01:00
Howaner
d32831d7e8 Set reuse flag to sockets
Should fix #1726
2015-02-07 11:03:38 +01:00
Howaner
ca591c15a0 Spacing 2015-02-07 10:46:01 +01:00
Howaner
7813cd2022 cPlayer should override IsOnGround() 2015-02-07 10:46:01 +01:00
Howaner
9b9ce6fa3b Added IsOnGround() to cEntity 2015-02-07 10:45:45 +01:00
Howaner
7528230596 Readded old comment 2015-02-06 21:54:47 +01:00
Howaner
2c7925f0ad Merge branch 'master' into Inventory 2015-02-06 21:52:14 +01:00
Mattes D
adf0020cd4 APIDump: Added cNetwork documentation. 2015-02-06 18:44:05 +01:00
Mattes D
0e769f12ac LuaServerHandle: Removed debugging output. 2015-02-04 08:42:28 +01:00
Mattes D
014b96adb3 Exported cServerHandle and cNetwork:Listen to Lua.
Also added an example to the NetworkTest plugin.
2015-02-04 08:40:52 +01:00
Mattes D
17498a97a2 cNetwork: Exported lookup functions to Lua API.
Also added an example in the NetworkTest plugin.
2015-02-04 08:40:52 +01:00
Mattes D
e098728fa8 cTCPLink: Fixed missing addresses on link connection. 2015-02-04 08:40:51 +01:00
Mattes D
360c632e36 cNetwork: Exported the Connect() method and cTCPLink class to Lua. 2015-02-04 08:40:50 +01:00
tycho
e7424adbf4 Switched LuaState to use sizeof... 2015-01-31 15:44:14 +00:00
Mattes D
fd49e34e33 Merge pull request #1713 from mc-server/UseLibevent
Use libevent
2015-01-30 08:40:45 +01:00
Mattes D
64a16a7309 CheckBasicStyle: Fixed a forgotten file close. 2015-01-29 11:10:32 +01:00
Mattes D
076c87f797 Fixed missing LibEvent reference in OSSupport. 2015-01-29 07:40:01 +01:00
Mattes D
79dee9bb70 Fixed listening ports not closed on cServerHandle::Close. 2015-01-27 14:53:39 +01:00
Mattes D
de7f5fc794 Fixed server failure to open any port not aborting the server. 2015-01-27 14:53:38 +01:00
Mattes D
19d463ae1c Fixed a deadlock in cClientHandle network sending. 2015-01-27 14:53:38 +01:00
Mattes D
053362e604 Added network termination called at app exit.
This fixes a crash in MSVC runtime caused by joining a thread in a global var's destructor.
2015-01-27 14:53:37 +01:00
Mattes D
9a2200f8bb cTCPLinkImpl: Added the BEV_OPT_THREADSAFE flag. 2015-01-27 14:53:37 +01:00
Mattes D
2557f2867d ServerHandleImpl: Removed needless diagnostic output. 2015-01-27 14:53:36 +01:00
Mattes D
4eecf9363a Client: Only decode protocol when there's actual data incoming. 2015-01-27 14:53:36 +01:00
worktycho
96def00c7c Fix clang compile error 2015-01-27 14:53:35 +01:00
Mattes D
1b9c0f1030 Removed cFile::ReplaceFileNameInvalidChars().
Its only usage in cProtocol18 has been changed to a simple string replace - only the IPv6's colons were causing problems.
2015-01-27 14:53:34 +01:00
Mattes D
edce2cbdcf Fixed enchant packet handling. 2015-01-27 14:53:34 +01:00
Mattes D
13091e0fa0 RCONServer: Changed variables to UInt32. 2015-01-27 14:53:33 +01:00
Mattes D
6ec5e8caa7 Replaced atoi() with StringToInteger(). 2015-01-27 14:53:32 +01:00
Mattes D
f243aa387c Removed ListenThread and SocketThreads.
They have been replaced by the cNetwork API.
Socket.cpp is still used by RCONClient.
2015-01-27 14:53:32 +01:00
Mattes D
86f2f82d2a BlockingSslClientSocket: Migrated to cNetwork API. 2015-01-27 14:53:31 +01:00
Mattes D
7dfeb67f01 Converted cServer to use the cNetwork API. 2015-01-27 14:53:31 +01:00
Mattes D
1f2f8b553b cNetwork: Fixed IP address reading for incoming connections. 2015-01-27 14:53:30 +01:00
Mattes D
978fc6a988 Protocol18: Fixed failure with invalig logfile names. 2015-01-27 14:53:30 +01:00
Mattes D
f1f12495b2 cFile: Added ReplaceFileNameInvalidChars(). 2015-01-27 14:53:29 +01:00
Mattes D
7cff25f0ff StringUtils: Fixed bad predicate in MergeStringVectors().
Instead of preventing duplicates it was allowing only duplicates.
2015-01-27 14:53:29 +01:00
Mattes D
28ffc55d89 RCON server: fixed compilation. 2015-01-27 14:53:28 +01:00
Mattes D
9e61ad8c74 Migrated RCON server to cNetwork API. 2015-01-27 14:53:27 +01:00
Mattes D
059af2efdc Fixed a crash in RCON server. 2015-01-27 14:53:27 +01:00
Mattes D
80a386cbc4 Fixed missing LibEvent reference in OSSupport. 2015-01-27 14:53:26 +01:00
Mattes D
f477b524bb WebAdmin uses the new cNetwork API. 2015-01-27 14:53:26 +01:00
Mattes D
7990d223ea IniFile: Added common code to migrate ports.
Old settings have IPv4 and IPv6 ports as separate values, new settings have a single value for the ports.
2015-01-27 14:53:25 +01:00
Mattes D
40e231bc29 StringUtils: Added string vector manipulation. 2015-01-27 14:53:25 +01:00
Raekye
82a10116dd fix logic bug in cChunk::FastSetBlock filtering out leaves meta changes
- send update if it's not a leaves block and (the original checks)
2015-01-25 19:13:55 -05:00
Raekye
08d84080fa filter out leaves meta changes from being sent to the client 2015-01-25 18:33:08 -05:00
Howaner
1f94c318c5 Readded old DistributeStackToAreas() comment. 2015-01-25 00:40:59 +01:00
Howaner
1eedccc56a Merge branch 'master' into Inventory 2015-01-25 00:34:19 +01:00
Mattes D
f91de20ca1 Merge pull request #1701 from mc-server/libevent
LibEvent-based socket API
2015-01-24 09:27:55 +01:00
Mattes D
10cfa61fbc cNetwork: Added self pointers to keep objects alive for callbacks.
Ref.: http://forum.mc-server.org/showthread.php?tid=1700&pid=17947#pid17947
2015-01-23 23:01:18 +01:00
Kirill Kirilenko
5d257178a0 Fixed defect #43662 in Coverity list. 2015-01-23 19:56:17 +03:00
Kirill Kirilenko
ce2d3280ca Fixed defect #43665 in Coverity list. 2015-01-23 19:06:27 +03:00
Kirill Kirilenko
0288e90e0b Fixed defect #73101 in Coverity list. 2015-01-23 19:06:26 +03:00
Kirill Kirilenko
2557eab957 Fixed defect #43671 in Coverity list. 2015-01-23 19:06:25 +03:00
Kirill Kirilenko
14ea50cbe7 Fixed defect #43661 in Coverity list. 2015-01-23 19:06:23 +03:00
Kirill Kirilenko
a216413a33 Fixed defect #71781 in Coverity list. 2015-01-23 19:06:07 +03:00
Matyas Dolak
268ea71e4a Fixed negative return values in SchematicFileSerializer.
Fixes CID 103165.
2015-01-23 10:03:39 +01:00
Mattes D
9014bdfa32 cNetwork: Renamed callback to OnConnected() 2015-01-22 22:49:37 +01:00
Mattes D
dbf7f13bd4 cNetwork: Added link creation callback.
This allows the callback classes to store the link inside them and use it internally later on, mainly for sending data.
2015-01-22 20:13:06 +01:00
Mattes D
5b4c5cf2be cNetwork: Changed listening API.
The link-callbacks for each new accepted link are now received from the OnIncomingConnection listen-callback.
2015-01-22 20:13:05 +01:00
Mattes D
64855ed340 cNetwork: Added error message to error callbacks. 2015-01-22 20:13:04 +01:00
Mattes D
00253403b3 cTCPLinkImpl: Fixed type conversion warning. 2015-01-22 20:13:03 +01:00
Mattes D
d4682463a1 cNetwork: Fixed race conditions with lookups; proper shutdown. 2015-01-22 20:13:02 +01:00
Mattes D
c0cb787c10 cNetwork: Split the main cpp file into several files. 2015-01-22 20:13:02 +01:00
Mattes D
1e5aedacea cNetwork: Fixed WinXP dualstack listening. 2015-01-22 20:13:01 +01:00
Mattes D
d3076a3e16 cNetwork: Split cNetworkSingleton to a separate file. 2015-01-22 20:13:00 +01:00
Mattes D
ae29a82eba cNetwork: Fixed WSAStartup()-not-called error in Listen(). 2015-01-22 20:12:59 +01:00
Mattes D
60807adfb5 cNetwork: Handle WSA initialization failures. 2015-01-22 20:12:58 +01:00
Mattes D
7cddb62374 cNetwork: Added an OnError callback for listening servers.
The callback receives the error details.
2015-01-22 20:12:57 +01:00
Mattes D
646e636933 cNetwork: Rewritten server listen into a factory method. 2015-01-22 20:12:56 +01:00
Mattes D
4647e6ad71 cNetwork: Removed unneeded dependency. 2015-01-22 20:12:55 +01:00
Mattes D
728a624e48 cNetwork: Refactored cTCPLinkImpl::Connect into a factory. 2015-01-22 20:12:55 +01:00
Mattes D
6f29cfe084 cNetwork: Cosmetics. 2015-01-22 20:12:54 +01:00
Mattes D
b59206207c cNetwork: Fixed compilation. 2015-01-22 20:12:52 +01:00
worktycho
19121d2962 Wrap debug variable in ifdef
avoidss unused variable error in clang
2015-01-22 20:12:51 +01:00
Mattes D
235b8f1f6b cNetwork: Added error logging to server socket creation.
This is mainly for WinXP and RasPi testing.
2015-01-22 20:12:50 +01:00
Mattes D
ddb1818dd5 cNetwork: Added multithreading protection. 2015-01-22 20:12:50 +01:00
Mattes D
d8ac99a037 cNetwork: Implemented connection shutdown and close. 2015-01-22 20:12:49 +01:00
Mattes D
9ffca12709 cNetwork: Fixed Linux compilation. 2015-01-22 20:12:48 +01:00
Mattes D
a2aa37bdc5 cNetwork: Implemented link address getting. 2015-01-22 20:12:47 +01:00
Mattes D
28e97d5468 cNetwork: Implemented basic server functionality. 2015-01-22 20:12:46 +01:00
Mattes D
251c96952b cNetwork: Implemented IP-to-hostname lookup. 2015-01-22 20:12:45 +01:00
Mattes D
fde44cba08 cNetwork: Implemented HostnameToIP lookups. 2015-01-22 20:12:45 +01:00
Mattes D
bef957ef14 Added newline to logged messages in the tests. 2015-01-22 20:12:43 +01:00
Tycho
a9b8a530b1 Extracted Google connection test 2015-01-22 20:12:42 +01:00
Mattes D
b8b3409b74 cNetwork: Linux compilation fix. 2015-01-22 20:12:41 +01:00
Mattes D
6f5e267d58 Implemented LibEvent-based client connections. 2015-01-22 20:12:40 +01:00
Mattes D
a8a7488b54 Added the libevent library. 2015-01-22 20:12:39 +01:00