flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,956 Commits 1 Branch 0 Tags 92 MiB
d3662e6589
Commit Graph

4500 Commits

Author SHA1 Message Date
Mattes D
b97f41b8c6 ItemHandler type fixes. 2015-04-20 09:17:26 +02:00
Mattes D
c0bd482448 Protocol 1.8: Limit the amount of displayed data on NBT parse failure. 2015-04-20 08:35:32 +02:00
Mattes D
c9fbcea66d ItemHandler: Using automatic array bounds. 2015-04-20 08:34:44 +02:00
Mattes D
c5ad058424 HangingEntity: Fixed a needless clang warning. 2015-04-19 21:34:56 +02:00
STRWarrior
423bbbdbe1 Fixed typo in NetherForts initialization 
The S in NetherForts was missing
 2015-04-19 20:53:25 +02:00
NiLSPACE
3056e6d324 Merge pull request #1877 from mc-server/GlowStone 
Added GlowStone finisher
 2015-04-19 20:23:15 +02:00
STRWarrior
f17f0fa3bd GlowStone: Changed order of initialization of member variables 2015-04-19 20:08:51 +02:00
STRWarrior
f1558c6015 Fixed style 2015-04-19 19:59:27 +02:00
Mattes D
ba6f5aea4c Merge pull request #1875 from mc-server/PluginFolders 
Split the plugin names and plugin folders to avoid confusing them.
 2015-04-19 19:53:14 +02:00
STRWarrior
e7542f676d Added GlowStone finisher 2015-04-19 19:45:18 +02:00
Mattes D
fd497b8269 ClientHandle: Fixed re-sending refused right-clicks. 
The coords weren't checked against Y boundary and -1 coords weren't sent.
This fixes mc-server/Gallery#45.
 2015-04-19 17:33:58 +02:00
Mattes D
d40078d163 HTTP: Error message is sent as the payload as well. 
This shows the error message in the browsers. Before, the browsers would display just a blank page.
 2015-04-19 17:32:44 +02:00
Mattes D
be40ea323a Refresh plugin list before trying to load. 2015-04-19 17:25:48 +02:00
Mattes D
4a946aa8c4 Added cPluginManager:IsPluginLoaded() API, better load error msgs. 2015-04-19 17:20:15 +02:00
Mattes D
3b49a1d250 Merge pull request #1864 from mc-server/StrictRecipeMatching 
Recipes match zero DamageValue strictly.
 2015-04-19 14:41:35 +02:00
Mattes D
288d2280fa Refactored cWebPlugin for C++11 style and proper WebTab clearing. 2015-04-19 14:35:04 +02:00
Mattes D
a9b5a6c3a6 Split the plugin names and plugin folders to avoid confusing them. 
Ref.: http://forum.mc-server.org/showthread.php?tid=1877
 2015-04-19 10:57:41 +02:00
mathias-gh
9cbd7f64c1 Update IronGolem.cpp 2015-04-17 21:18:34 +03:00
mathias-gh
f370443b9b Added MobTypeName for Giant 2015-04-17 19:33:34 +03:00
Tiger Wang
15afff1eab Fixed arm swing animation 
* Fixes #1861
 2015-04-17 15:33:40 +01:00
Mattes D
0b3fd73f90 Recipes match zero DamageValue strictly. 
To match any DamageValue for the ingredient, an explicit "-1" as the DamageValue must be specified.
Fixes #1859.
 2015-04-16 21:33:42 +02:00
Mattes D
ffe7dae4fc Fixed PolishedGranite et al crafting recipes. 
Fixes #1774. Ref.: #1859
 2015-04-16 20:59:57 +02:00
Mattes D
1d8a22cb7b Merge pull request #1858 from mc-server/BucketPluginCalls 
Bucket plugin calls
 2015-04-15 11:07:03 +02:00
Mattes D
54289aeccb Merge pull request #1844 from DevToaster/master 
Modified physics for more vanilla-like behavior
 2015-04-14 22:31:09 +02:00
Mattes D
d421befece Scooping up fluid calls the player placement hooks. 
Ref.: #1857.
 2015-04-14 10:55:48 +02:00
Mattes D
de8e5ea8e4 Placing a fluid from bucket calls plugin hooks. 
Ref.: #1857.
 2015-04-14 10:49:01 +02:00
Mattes D
29af16143e Removed HOOK_MAX and HOOK_NUM_HOOKS from Lua API. 2015-04-13 12:33:25 +02:00
Scott Moore
8c144207dc Implement backend for /title command 2015-04-13 16:22:51 +10:00
Mattes D
9367d44cb4 Merge pull request #1854 from mc-server/FileOps 
File ops
 2015-04-12 10:54:05 +02:00
Mattes D
79e8f8fb20 cFile:ChangeFileExt now accepts extensions with leading dot, too. 2015-04-11 17:42:32 +02:00
Mattes D
c4842cb9aa Added more cFile API functions. 
GetLastModificationTime, GetPathSeparator() and GetExecutableExt()
 2015-04-11 10:06:08 +02:00
Mattes D
38d666432d Fixed plugin hook calls when unloading plugins. 
If a plugin installs any hooks in its Initialize method and then causes the Lua runtime to abort, the server asserted because the hooks were called while the plugin was being unloaded.
 2015-04-10 22:31:23 +02:00
Mattes D
65a1158e40 Added proper implementation of cFile::ChangeFileExt(). 2015-04-10 21:40:45 +02:00
STRWarrior
13b96a40ea Added extra divide operator to Vector3. 
The multiply operator had one for both a different vector and a number, but the divide operator didn't.
 2015-04-07 13:25:55 +02:00
Mattes D
4836d07bfa Fixed MSVC warnings, improved comments. 2015-04-06 22:01:25 +02:00
Mattes D
6952f2295a Added cFile:ChangeFileExt() function. 2015-04-06 22:00:54 +02:00
Mattes D
31953b19b8 Fixed crash on exit introduced with Windows Service capability. 
Ref.: #1845
 2015-04-05 17:07:29 +02:00
Mattes D
e42e46d5f9 Merge pull request #1846 from mc-server/WorldChanging 
Fixed player switching world bug
 2015-04-04 11:32:17 +02:00
STRWarrior
399392195f Fixed players not appearing/disappearing when traveling to a new world. 2015-04-03 18:40:20 +02:00
STRWarrior
e6819c4c65 Fixed the nether and end getting snow if they were generated in the overworld. 2015-04-03 16:32:31 +02:00
Mattes D
afdd751fe3 Merge pull request #1799 from SnappingTurtles/BlockButton 
Buttons can be placed on the top and on the bottom face of a block
 2015-04-03 15:41:39 +02:00
Anthony Birkett
51891b766c Working as a Windows service. Starts and stops correctly. 
Added "/service" switch, to prompt the binary to attempt starting as a service.
Added service* methods, to control service startup.
Split up main() into universalMain(), which contains the startup code for both service and normal start.
Added cRoot::m_RunningAsService bool,
Added cRoot::SetStopping(bool) to allow a stop request to be sent by the service controller.
Added cBlockIDMap::init() to avoid loading items.ini before the working directory has been set.
 2015-04-01 00:03:37 +01:00
DevToaster
a9583149b4 Changed air drag for pickups 2015-03-31 11:40:31 -04:00
DevToaster
45c84ea933 Changed air drag units to 'interpolated ticks' per second 2015-03-31 11:03:35 -04:00
DevToaster
d315534b76 Adjusted projectile physics 2015-03-30 20:07:19 -04:00
DevToaster
c743c7fd0c Modified physics for more vanilla-like behavior 2015-03-30 19:42:32 -04:00
Mattes D
53f5cc209f Fixed placing bottom half-slabs by clicking a top half-slab. 
Ref.: #1837
 2015-03-28 10:44:42 +01:00
Alexandre Guertin
97daf810ff Removed 0x6, 0x7 from BlockButton. 2015-03-25 16:12:02 -04:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer 
Unify packetizer
 2015-03-24 13:09:41 +01:00
Mattes D
f1ef7f57ff Merge pull request #1775 from tommysanterre/terrainheightfix 
Correct all world height validations.
 2015-03-23 12:25:22 +01:00
Mattes D
b913c5da69 Added VarInt64, normalized cPacketizer datatype names. 2015-03-22 23:09:23 +01:00
Mattes D
c626848393 Unified cPacketizer across all protocols. 2015-03-22 19:46:08 +01:00
Mattes D
8df9f1685a ProtoProxy: Fixed connection and logging. 2015-03-22 15:00:51 +01:00
worktycho
d02c908670 Merge pull request #1786 from mc-server/pipelineSyntax 
Added pipelining syntax for generators
 2015-03-21 21:08:33 +00:00
worktycho
7089b68030 Style fixes 2015-03-21 19:45:01 +00:00
worktycho
d966200a6c Fixed alignment 2015-03-21 19:35:25 +00:00
Mattes D
c3c29577a5 Fixed signedness warnings in Protocol. 2015-03-21 16:11:57 +01:00
Mattes D
b698286e86 Creeper: Fixed skeleton check. 2015-03-21 15:52:49 +01:00
Mattes D
3923e3e37a Fixed signedness issues in protocols. 2015-03-21 15:40:56 +01:00
Mattes D
e9b8be25f9 Changed linked world name variables and setters / getters. 
Ref.: #1792
Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
 2015-03-21 15:20:31 +01:00
Mattes D
cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Mattes D
7e7527cc43 Fixed trailing whitespace. 2015-03-21 14:07:16 +01:00
Mattes D
b1d4b3bb96 Unified cByteBuffer types. 
cByteBuffer now reads and writes any of the [U]Int<N> types.
 2015-03-21 13:00:20 +01:00
Tiger Wang
60a52288d8 Improved arrow in-flight and block-hit appearance 
* Fixes #1495
 2015-03-20 22:32:32 +00:00
Mattes D
0f45d1fbe2 cPluginLua:cResettable no longer shares CS with plugin. 
This fixes locking the resettable while the plugin is already gone. Hopefully no deadlocks.
 2015-03-20 16:51:49 +01:00
Mattes D
8a43da0723 Merge pull request #1822 from mc-server/ResettableLuaCallback 
Added cPluginLua::cResettable interface, used for scheduled tasks.
 2015-03-20 16:11:50 +01:00
Mattes D
781c8683f7 Added cPluginLua::cResettable interface, used for scheduled tasks. 
This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data.
Fixes #1556.
 2015-03-20 15:13:33 +01:00
Mattes D
967ece1684 Merge pull request #1821 from bibo38/bugfix1765 
Removed Metavalue from Piston drops.
 2015-03-20 12:13:21 +01:00
bibo38
3058c4c010 Removed Metavalue from Piston drops. Bugfix #1765 2015-03-20 11:14:42 +01:00
Tommy Santerre
3f6d823aa4 Correct world height validations. 
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
 2015-03-19 20:32:17 -04:00
Mattes D
2d1d4ae3e3 Removed unwanted base classes from Lua API. 2015-03-19 21:26:38 +01:00
Mattes D
93031dffd8 AllToLua: Fixed cMonster inheritance. 2015-03-19 21:06:28 +01:00
Mattes D
2fed8c3227 Improved DoWithID bindings. 2015-03-19 16:24:32 +01:00
bibo38
54d97f8c17 Removed wrong else clause, which caused that the following if-Statement got only executed in rare cases. This has blocked the creation of new Fluid-Sources. Bugfix #1783 2015-03-19 13:23:03 +01:00
Mattes D
f3046417ec Fixed a clang warning, improved comments. 2015-03-19 12:46:37 +01:00
Mattes D
9eb9541060 AllToLua: Removed an unneeded class declaration. 
It's perfectly possible to declare a class in ManualBindings without the need for declaration in AllToLua.pkg.
 2015-03-19 12:34:16 +01:00
Mattes D
09da6e7a6e AllToLua: Fixed the parse order for bindings generation. 
Fixes #1789.
 2015-03-19 12:19:04 +01:00
Mattes D
5f660f7677 Added cNetwork initialization to program start. 
Otherwise the server could crash because MSVC doesn't implement magic statics yet.
 2015-03-18 22:07:57 +01:00
Mattes D
49e59ee06b World:DoWithEntityByID() checks the entities-to-add as well. 
This allows plugins to create entities and immediately act on them using that call. This will most likely need to be added to most of the DoWith<> and ForEach<> calls.
 2015-03-18 15:35:19 +01:00
Mattes D
0aff42a4bc Network: Close the UDP endpoint in destructor. 2015-03-18 13:50:43 +01:00
bibo38
7b025d6605 Changed Variable types of Endianness.h to uniform UInt* types from Globals.h 2015-03-17 20:00:21 +01:00
bibo38
9ac094e95a Fixed double underscore identifiers in the Endianess.h file, which are reserved for implementation use. Bug #1715 2015-03-17 18:22:27 +01:00
Mattes D
0add3d4617 Merge pull request #1810 from mc-server/paintings 
Paintings
 2015-03-15 14:30:23 +01:00
worktycho
83531707f3 Merge pull request #1811 from mc-server/grass 
Fixed grass spread, closes #1743
 2015-03-15 12:16:37 +00:00
Tiger Wang
a8a2d3d504 Use thread_local in cFastRandom 2015-03-14 21:52:13 +00:00
Mattes D
65d2ef32e9 Merge pull request #1734 from mc-server/pistons 
Handle client 'leave bed' request
 2015-03-14 22:44:04 +01:00
Mattes D
ebf0126dc9 Merge pull request #1808 from tumultenrx/master 
Monsters will now attack. Additional checks have been added when generating spawn.
 2015-03-14 22:32:23 +01:00
tumultenrx
5c45c8897c Fixed a small bug 2015-03-14 20:45:16 +01:00
Tiger Wang
e94886c140 Fixed grass spread, closes #1743 
- Removed the salt parameter in cFastRandom functions, it wasn't doing
what we thought it was following the move to C++11
 2015-03-14 00:59:53 +00:00
Tiger Wang
cb8ea41c90 Fixed style violations 2015-03-13 23:22:09 +00:00
Tiger Wang
3d398baf35 cPainting saving implemented 
Additionally, it now inherits from cHangingEntity.
 2015-03-13 23:05:06 +00:00
Tiger Wang
e15e30a030 Fixed confusion over Item Frame directions 2015-03-13 22:29:27 +00:00
NiLSPACE
57d2a09c8c Merge pull request #1809 from flx5/master 
Performance improvements for #1807
 2015-03-13 08:55:48 +01:00
tumultenrx
a215070cf2 Monsters will now attack. Additional checks have been added when generating spawn. 
Monsters will now attack. Additional checks have been added when generating spawn.
 2015-03-13 00:02:36 +01:00
flx5
936d56a711 Performance improvements for #1807 2015-03-12 20:16:12 +01:00
Mattes D
f9991c9f92 Merge pull request #1761 from mc-server/NetworkIPEnum 
cNetwork: Added EnumLocalIPAddresses() function.
 2015-03-12 13:35:45 +01:00
Mattes D
439eb8d6cb Merge pull request #1807 from flx5/master 
Fixes #493 and #490
 2015-03-11 22:43:52 +01:00
flx5
f6912bd01c Fixed coding conventions for Pull Request #1807 2015-03-11 20:02:11 +01:00
flx5
d8ab99e944 Fixed issue with quotes not appearing in pairs 2015-03-11 19:52:49 +01:00
Mattes D
1b60fe12a8 Merge pull request #1665 from mc-server/Inventory 
Own classes for all windows and implemented vanilla-like shift click.
 2015-03-11 14:26:04 +01:00
tycho
430cbb8c83 Changed pipeline character from >> to | 2015-03-11 10:42:45 +00:00
tycho
8646e95b6f Fixed style and removed false positives 
Relaxed the rules for < followed by an && and removed rule for < following an &&
 2015-03-11 10:39:49 +00:00
flx5
76012ee090 Fixed some markup issues 2015-03-11 04:38:15 +01:00
flx5
451ab6860f Fixed some markup issues 2015-03-11 04:33:17 +01:00
flx5
d130696e95 Fixes #493 and #490 2015-03-11 04:14:17 +01:00
Tiger Wang
4ffaace384 Use std::memcpy to fix alignment 
As suggested by @madmaxoft
 2015-03-10 22:25:53 +00:00
Tycho
ff785188f9 Fixed Sequence Generator for IntGen 2015-03-10 22:19:03 +00:00
worktycho
45fa2d98db Fixed Bug in cChunkData. 
FIxed a bug where if the index was not aligned with the sections empty sections would not be set in the correct location.
 2015-03-10 20:32:01 +00:00
Howaner
685f6e3713 Moved window code into cpp files 2015-03-10 19:40:53 +01:00
Alexandre Guertin
adf5edc913 Buttons can be placed on the top and on the bottom face of a block 2015-03-09 18:13:55 -04:00
Howaner
a96c21fc0d Merge branch 'master' into Inventory 2015-03-09 22:39:11 +01:00
Howaner
ce6219530a Fixed client kick/crash if many block changes happend 2015-03-09 22:32:12 +01:00
Tiger Wang
20da3d34a5 Potential Linux implementation 2015-03-08 16:54:44 +00:00
STRWarrior
d19f2a472b Added parenthesis around the comparisons 2015-03-08 15:22:01 +01:00
STRWarrior
2bbfd0341f Added proper trees to Mesa biomes 
Mesa only has small apple trees.
 2015-03-08 13:30:21 +01:00
STRWarrior
134246fb15 Added grass/course dirt layer on MesaPlateauF(M) 2015-03-08 13:29:49 +01:00
Tiger Wang
3d81b0093e Merge pull request #1784 from mc-server/SteppyHeiGen 
Added Steppy height generator.
 2015-03-06 11:53:12 +00:00
Tiger Wang
f3da0cf1ae Reverted non-functional changes 2015-03-05 21:21:39 +00:00
Alexander Harkness
7348bf3853 Grass checks for sufficient light before spreading 2015-03-05 19:30:00 +00:00
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
Mattes D
9429cdcb53 Fixed warnings in StringUtils. 2015-01-21 20:39:34 +01:00
Matyas Dolak
adf3b3a569 ByteBuffer: Added support for reading unsigned shorts and ints. 2015-01-21 12:12:22 +01:00
Mattes D
2df8e4863f Fixed warnings in FastNBT.cpp. 2015-01-20 23:52:53 +01:00
Mattes D
5ac3a23586 Fixed warnings in 1.7 protocol. 2015-01-18 22:43:35 +01:00
Mattes D
45b1d5ff78 Fixed various warnings. 2015-01-18 18:01:24 +01:00
Mattes D
b1c58b7b52 cWorld: Fixed a type warning. 2015-01-18 15:10:05 +01:00
Mattes D
83ed6a2c1b Fixed type conversion warnings. 2015-01-18 11:25:16 +01:00
Mattes D
e38f41d32f Merge pull request #1702 from mc-server/chrono 
Started to convert more of MCServer to std::chrono
 2015-01-18 11:21:36 +01:00
Mattes D
e211aafaa4 Fixed type-conversion warnings. 2015-01-18 11:02:17 +01:00
worktycho
6758c1d2a1 correct comment to say milliseconds 2015-01-17 22:24:25 +00:00
Kirill Kirilenko
41f30edcf7 Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types. 2015-01-17 16:00:12 +03:00
Kirill Kirilenko
3dc994f9dc Fixed CppCheck: (performance) Possible inefficient checking for emptiness. 2015-01-17 15:20:03 +03:00
Kirill Kirilenko
2ce2741968 Fixed CppCheck: (performance) Function parameter should be passed by reference. 2015-01-17 15:19:23 +03:00
Tycho
bfe1960191 Converted Monster to std::chrono 2015-01-16 14:38:21 +00:00
Tycho
05c40db060 Converted cPickupEntity to std::chrono 2015-01-16 13:56:18 +00:00
Tycho
8dc9cf0c76 Converted MinecartEntity to std::chrono 2015-01-16 13:42:44 +00:00
Tycho
7562a381c0 Converted cExpOrbEntity to std::chrono 2015-01-16 13:27:10 +00:00
Tycho
d6f042da4a Converted ArrowEntityTiers to std::chrono 2015-01-16 13:13:23 +00:00
Tycho
acc2dcbbc3 Fix trailing whitespace 2015-01-11 21:53:20 +00:00
Tycho
2a9664d6ca Initial convertion of a_Dt to std::chrono 
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
 2015-01-11 21:12:26 +00:00
Tycho
4f75b94c99 Created new type cTickTime and rewrote cWorld::TickThread to use it 2015-01-11 01:54:18 +00:00
Mattes D
7d13a2a77a Fixed Linux compilation. 2015-01-03 22:39:55 +01:00
Mattes D
06c2669cf6 Protocols: Ignore garbage data at the end of PluginMessage packets. 
Fixes #1692.
 2015-01-03 22:24:15 +01:00
Mattes D
35a3a1b9f4 cByteBuffer: Improved SingleThreadAccessChecker performance. 
But it's still poor and unusable for regular testing.
 2015-01-03 22:24:12 +01:00
Mattes D
19ff14752e MobHead: Fixed wither spawning. 2014-12-25 20:41:27 +01:00
Mattes D
eddbce64be MobHeads: fixed regular head placement. 2014-12-25 20:41:12 +01:00
Mattes D
9e478c6f29 Fixed door placement. 2014-12-25 01:00:51 +01:00
Mattes D
1af6210466 Fixed forgotten big flower handler. 2014-12-25 00:51:24 +01:00
Mattes D
3da6e4374e Fixed basic style. 2014-12-25 00:44:09 +01:00
Mattes D
081e7ddd02 cIsThread: Fixed a race condition on thread start. 2014-12-25 00:34:54 +01:00
Mattes D
1d593134da Merge pull request #1686 from mc-server/PlaceBlockRefactor 
Place block refactor
 2014-12-25 00:31:56 +01:00
Mattes D
5609d76ed7 APIDump: Updated the player block placement documentation. 
The hooks now have fewer parameters but are called on all player-placed blocks (#1618).
 2014-12-24 20:02:51 +01:00
Mattes D
f07784b92f Fixed redstone dust placement on upside-down slabs. 2014-12-24 19:44:15 +01:00
Mattes D
e09348c05d ByteBuffer: SingleThreadAccessChecker is request-only. 
It slows the server down way too much, so it can't be turned on by default.
 2014-12-24 09:13:58 +01:00
Mattes D
63de5f8a55 Replaced a std::hash specialization with explicit type. 
std::hash is problematic in gcc / clang, one has a class, the other a struct.
 2014-12-24 08:38:37 +01:00
Mattes D
9c5463be1e gcc compilation fix. 2014-12-24 07:32:31 +01:00
Mattes D
ccdf03daaf Refactored all player block placing to go through hooks. 
Fixes #1618.
 2014-12-24 07:20:17 +01:00
Mattes D
075b19c7cb Added Vector3::TurnCW() and Vector3::TurnCCW() 2014-12-24 06:43:28 +01:00
worktycho
9fde173142 Init Mojang API pointer 
Fixes CID 90583
 2014-12-23 00:41:46 +00:00
Jonathan Fabian
fbd0cf74bd Fix compile error on OS X introduced by commit ecf778bbec 
The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`.    Reversing the order of initialization fixes this.
 2014-12-21 23:02:02 -05:00
Jonathan Fabian
ae8c871565 Added Depth Strider enchantment 2014-12-21 22:25:27 -05:00
Mattes D
f232704203 WSSAnvil: Added clamping to entity coords. 
Fixes CID 72854.
 2014-12-21 22:37:48 +01:00
Mattes D
e192da5316 FastNBT: Added a sanity check for number of list items. 
Fixes CID 55812.
 2014-12-21 22:25:01 +01:00
Mattes D
afdd53729c cChunk: Fixed missing initialization. 
Fixes CID 72670.
 2014-12-21 22:19:53 +01:00
Mattes D
ecf778bbec cWorld: Moved initialization into constructor. 
Fixes CID 71781.
 2014-12-21 22:19:22 +01:00
Mattes D
fe00c99c95 cEndGen: Fixed unitialized member variables. 
Fixes CID 43671.
 2014-12-21 21:59:44 +01:00
Mattes D
c9697083e5 cNoise3DComposable: Fixed unitialized member variables. 
Fixes CID 43665.
 2014-12-21 21:56:34 +01:00
Mattes D
d4c3821eca Fixed coverity issues in protocols. 
Fixes CID 73099, CID 66411.
 2014-12-21 20:01:42 +01:00
Mattes D
9e9459a367 Fixed a possible division by zero. 2014-12-21 19:48:29 +01:00
Tiger Wang
0d6672bf5d Fixed crash on restart 2014-12-21 14:31:20 +00:00
Mattes D
d4c9daddb8 Merge pull request #1682 from Masy98/entities 
Added Rabbits
 2014-12-21 15:18:42 +01:00
Tiger Wang
9755c5ba69 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-12-21 11:57:01 +00:00
Masy98
5695649bb9 Fixed damn empty line with no use 2014-12-20 13:04:42 +01:00
Masy98
7903ee485e Added Rabbit.h and Rabbit.cpp to the CMakeList 2014-12-20 11:41:23 +01:00
Masy98
3d2b1875a1 Fixed Rabbit size 2014-12-20 10:38:56 +01:00
Masy98
6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98
5cfb6063c3 Fixed Guardians size and health 2014-12-19 16:06:43 +01:00
Masy98
f09c6701eb Guardian can now spawn if wanted!? 2014-12-18 20:44:39 +01:00
Masy98
706b9181e6 Merge branch 'master' into entities 2014-12-18 19:32:48 +01:00
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Tiger Wang
dd1df3b6f7 Fix repeater unpowering 2014-12-18 00:22:46 +00:00
Howaner
c2926f8de1 derp 2014-12-17 20:08:55 +01:00
Howaner
fff108f20a Added comment. 2014-12-17 19:16:35 +01:00
Howaner
8277e1ec4e C++11 and function rename. 2014-12-17 19:14:01 +01:00
Howaner
6ee7fd3c67 Merge branch 'master' into Inventory 2014-12-17 17:33:30 +01:00
Howaner
5c99f3fada Fixed eMonsterType lua bugs. 2014-12-17 17:28:24 +01:00
Mattes D
a7e115ee3e Merge pull request #1674 from gushromp/master 
Fix for water spreading on bottom of the world
 2014-12-17 14:53:41 +01:00
Ivan Đorđević
99055f644b Removed unneeded newlines 2014-12-17 11:25:59 +01:00
Mattes D
4947880a5d Merge pull request #1581 from mc-server/redstone 
Resplit redstone .inc file and provided improvements
 2014-12-17 08:38:23 +01:00
Tiger Wang
8d9049603b NULL -> nullptr 2014-12-16 23:18:59 +00:00
gushromp
c2d32ce31b Merge branch 'master' of https://github.com/gushromp/MCServer 
Conflicts:
	src/Simulator/FloodyFluidSimulator.cpp
 2014-12-16 22:58:23 +01:00
gushromp
fd325e3990 Fixed water from spreading on bottom of world 2014-12-16 22:54:39 +01:00
gushromp
6cf3aa70f1 Fixed water from spreading on bottom of world 2014-12-16 22:38:57 +01:00
gushromp
b9977a39c3 Added braces to 'if' according to the code guidelines 2014-12-15 18:41:47 +01:00
blashyrk
4e5d2c36e9 Updated cPlayer::DoMoveToWorld to send target world's weather info to Player 2014-12-15 17:45:42 +01:00
Howaner
b3e5872c22 Fixed mob invisibility 2014-12-14 17:48:30 +01:00
Howaner
6436fe73ca Merge branch 'master' into Cocoa 2014-12-14 13:14:58 +01:00
Howaner
bed456033f "& 0x0f" isn't needed 2014-12-14 13:14:48 +01:00
Howaner
2a8c234f46 Fixes 2014-12-13 20:31:37 +01:00
Howaner
a595a4a842 Merge branch 'master' into Cocoa 2014-12-13 20:10:23 +01:00
Howaner
8591935a4b Implemented vanilla-like shift click. 
This fixes many visual bugs.
 2014-12-13 18:49:11 +01:00
STRWarrior
00bee25b4b WormNestCaves occasionally generates sandstone around the cave 
Only when the block around the cave is sand.
 2014-12-13 15:38:37 +01:00
Howaner
b6fd400276 Own classes for all windows. 2014-12-13 15:06:55 +01:00
Tiger Wang
4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
Mattes D
b8072cbd62 Merge pull request #1660 from Seadragon91/master 
Fixed print of milliseconds from chrono
 2014-12-12 21:00:06 +01:00
Lukas Pioch
ece8b8ac96 Fixed print of milliseconds from chrono 2014-12-12 15:10:29 +01:00
Mattes D
c8a49a6189 LightingThread: Fixed a memory leak. 2014-12-12 14:27:19 +01:00
Mattes D
6cd7e52eb7 Exported cWorld:PrepareChunk to Lua API, test in Debuggers. 2014-12-12 13:32:52 +01:00
Mattes D
781b3303a5 Merge pull request #1657 from mc-server/PrepareChunk 
Prepare chunk
 2014-12-11 17:06:18 +01:00
Mattes D
33c6ff872e Cosmetic touchups. 
Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
 2014-12-11 14:34:09 +01:00
Mattes D
1b1f971752 Merge remote-tracking branch 'planetx/master' 2014-12-11 11:17:54 +01:00
Mattes D
09453619e6 Fixed DungeonRooms edges not generating sometimes. 2014-12-11 11:16:11 +01:00
Mattes D
fcd3d1bfed Added a cWorld:PrepareChunk function. 
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
 2014-12-10 22:35:16 +01:00
Mattes D
563f41af65 Lighting thread: skip chunks that are already lit. 2014-12-10 22:27:48 +01:00
Mattes D
fbf98b8488 Merge pull request #1655 from tonibm19/patch-2 
Added NetherOreNests to default nether generator.
 2014-12-10 17:44:53 +01:00
tonibm19
7ceeefb26f Moved NetherOreNests 2014-12-10 17:13:20 +01:00
Mattes D
32bce44f1f Merge pull request #1623 from p-mcgowan/issue_1253 
Prevent multiple logins with same username, unless allowed in settings
 2014-12-10 11:17:11 +01:00
Vincent
9bba8e4c7d Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin() 
Compiles correctly.
 2014-12-10 00:45:24 -08:00
Vincent
3a2759fdc1 Fixed return value in CheckMultiLogin() 2014-12-09 14:23:44 -08:00
Howaner
e21159d4a8 Fixed compiling. 2014-12-09 13:29:22 +01:00
Vincent
4b08ca261b Fixed indent problems and added return definitions to CheckMultiLogin(). 
Changed from IsAllowMultiLogin() to DoesAllowMultiLogin().
Fixed CheckMultiLogin() to not run to the end without returning a value.
 2014-12-09 03:06:25 -08:00
Mattes D
2ab8d2bd98 Added a RemoveIf() function to cQueue 2014-12-09 10:43:40 +01:00
Vincent
e9a27db028 Changed DoWithPlayer to auto instead of using iterator. 2014-12-08 15:58:46 -08:00
Vincent
12c012fa01 Changed CheckMultiLogin() to not have main body wrapped in an if statement. 
Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin().
Added doxy-comment for DoWithPlayer().
Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments.
 2014-12-08 14:33:59 -08:00
Mattes D
209de0268a Moved NaturalPatches in front of PreSimulator and Animals. 2014-12-08 21:28:14 +01:00
planetx
ce3adf89fa Check to see if header write out is required 2014-12-08 11:23:19 -08:00
tonibm19
74ef586400 Added NetherOreNests to nether default generator. 
Now there's quartz in the nether
 2014-12-08 19:37:42 +01:00
tonibm19
98bd724294 Added NaturalPatches to finishers 2014-12-08 19:08:46 +01:00
planetx
1674f505f8 Added timestamp to merged files WSSAnvil 2014-12-08 08:28:44 -08:00
planetx
65c1d4f7b6 Added timestamp to merged files WSSAnvil 2014-12-08 08:26:37 -08:00
planetx
a1da0e7205 Added timestamp to new files WSSAnvil 2014-12-08 08:22:40 -08:00
Vincent
e28cc876c4 created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World. 2014-12-08 00:57:46 -08:00
Vincent
6de07d4a39 Fixed compile errors 2014-12-08 00:45:29 -08:00
Vincent
656964dc38 removed last space in handlehandshake 2014-12-08 00:19:33 -08:00
Vincent
ed09e76023 Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player. 2014-12-08 00:16:09 -08:00
Vincent
d8d3b9aec5 Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added. 2014-12-08 00:12:48 -08:00
planetx
8f5e861674 Added Timestamp info to chunks in WSSAnvil 2014-12-07 14:44:08 -08:00
Vincent
83c728fce4 Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253 2014-12-07 12:45:39 -08:00
Vincent
8edfd78295 changed from using iterator to auto for server and clienthandle 2014-12-07 12:41:42 -08:00
Mattes D
2bd03ee1f9 cMojangAPI: Fixed a possible problem with thread termination order. 2014-12-07 21:38:28 +01:00
Mattes D
c65bb6341d Fixed integer overflow problems. 
The event would overflow when requesting a 60 minute timeout.
 2014-12-07 21:37:47 +01:00
Mattes D
8ad1afcc1b Merge remote-tracking branch 'origin/master' into c++11Events 2014-12-07 18:15:23 +01:00
Mattes D
77cf657790 Fixed format warning. 2014-12-07 17:29:39 +01:00
Mattes D
e08331a24b Fixed crash on server stop. 
The entity destructors called through chunkmap destructor and chunk destructor were accessing the world which was in an already invalid state (half-destroyed).
Fixed by destroying chunkmap explicitly and providing a nullptr check in the HasEntity() function.
 2014-12-07 16:14:27 +01:00
Mattes D
3c3cb198f3 Fixed c++11 branch issues. 2014-12-07 15:46:27 +01:00
Mattes D
d00ebd7ee7 Merge pull request #1555 from mc-server/c++11 
C++11
 2014-12-07 15:01:36 +01:00
STRWarrior
ba99107591 Reduced river height 
Rivers would exceed the water height quite often
 2014-12-07 12:03:52 +01:00
STRWarrior
95c83abcdb Fixed error message in cFinishGenPassiveMobs 
It would send an error message when trying to spawn mobs in a desert
 2014-12-07 12:00:36 +01:00
Mattes D
263fabc816 Replaced most auto_ptr with unique_ptr. 2014-12-06 23:03:17 +01:00
Tiger Wang
3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/OSSupport/Thread.cpp
 2014-12-06 17:41:48 +00:00
Mattes D
3f23813412 Merge pull request #1647 from mc-server/SocketThreadsFix 
Fixes socket leak in HTTP server.
 2014-12-06 16:08:08 +01:00