flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,466 Commits 1 Branch 0 Tags 92 MiB
6aa7df367f
Commit Graph

1930 Commits

Author SHA1 Message Date
Mattes D
a936736acd Removed unused constants from MineShafts and Ravines. 2014-05-09 20:13:20 +02:00
Mattes D
294b7ca24a Even more size_t fixes. 2014-05-09 20:05:00 +02:00
Mattes D
d67ea97a26 More size_t fixes. 2014-05-09 19:57:59 +02:00
Mattes D
0fc60edaeb Removed an unused NetherFortGen variable. 2014-05-09 19:53:57 +02:00
Mattes D
b997fbaf45 Removed an unused macro. 2014-05-09 19:35:35 +02:00
Mattes D
5b54dc3eac Build fixes after the last size_t batch. 2014-05-09 19:33:22 +02:00
worktycho
c4cd201f18 Range Check on schematic size 
Fixes CID 55830
 2014-05-09 17:39:13 +01:00
Mattes D
dd350bc1f3 World pre-generation distance is settable in world.ini. 2014-05-09 18:32:04 +02:00
Mattes D
56ad2c2124 Lighting thread disabled its chunkstays before deleting them. 2014-05-09 18:32:03 +02:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
worktycho
99af4453ef Check the height and width values read. 
Fixes CID 55831
 2014-05-09 17:30:47 +01:00
Mattes D
ea593dcaad Ravines rewritten using cGridStructGen. 
Ref.: #987.
 2014-05-09 18:30:39 +02:00
worktycho
17c7c31130 Initialise m_HasTeleported in both constructors 2014-05-09 16:56:29 +01:00
Mattes D
95ead1128f cWormNestCaves rewritten using cGridStructGen. 
Ref.: #987.
 2014-05-09 11:16:13 +02:00
Mattes D
14543aa3fc Mineshafts generator rewritten to use GridStructGen. 2014-05-09 10:59:33 +02:00
Mattes D
ee680990ba Fixed cGridStructGen. 
Now cNetherFortGen works with the new architecture.
 2014-05-08 21:10:55 +02:00
Mattes D
ccf44f18d1 Merge branch 'master' into GridStructGen 2014-05-08 20:17:31 +02:00
Mattes D
c4ea25e136 Fixed MSVC 64-bit build warnings. 2014-05-08 20:16:35 +02:00
madmaxoft
564261cfd9 cNetherFortGen uses cGridStructGen. 
WIP, this doesn't work properly yet.
 2014-05-07 22:34:06 +02:00
Mattes D
d1b719885d Merge pull request #989 from Howaner/Anvil 
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
 2014-05-07 22:18:53 +02:00
Mattes D
d9cdd4441e Merge pull request #853 from Howaner/Slabs 
Grass now grows under up-side-down slabs
 2014-05-07 22:18:23 +02:00
Howaner
c96a27f4ae Superfluous method override. 2014-05-07 21:36:26 +02:00
Howaner
df71cc931b Missing comma 2014-05-07 21:32:52 +02:00
Howaner
10e3c262db Send item back to the client when the item get damage. 2014-05-07 21:00:21 +02:00
Howaner
fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner
bc4a51781e Add lava and water check to block handlers. 2014-05-07 20:37:36 +02:00
Howaner
36a2aa2f21 Rename CanChangeDirtToGrass to CanDirtGrowGrass 2014-05-07 12:59:48 +02:00
Howaner
f5fe368220 Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
Howaner
e86bf64867 Where is the problem with clang? 2014-05-07 12:45:20 +02:00
Howaner
80bcc43c7b Fix MagmaCube save. 2014-05-07 12:43:21 +02:00
Howaner
d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
madmaxoft
da5db2ddf9 Initial cPrefabPiecePool refactoring. 
Ref.: #986.
 2014-05-07 11:01:30 +02:00
Tiger Wang
e5b42b9f16 Fixed wires powering wires diagonally below them 2014-05-06 23:05:14 +01:00
Mattes D
66c5c81e02 Merge pull request #985 from Howaner/Anvil 
Add anvil inventory.
 2014-05-06 21:46:50 +02:00
Mattes D
e400b1acd8 Merge pull request #927 from mc-server/fixes 
Small fixes
 2014-05-06 21:44:55 +02:00
madmaxoft
ac1c3ba5d9 Fixed an extra space. 2014-05-06 21:43:31 +02:00
Tiger Wang
696a7bc52e Merge branch 'master' into fixes 
Conflicts:
	src/Vector3.h
 2014-05-06 20:15:19 +01:00
Tiger Wang
cca8376a01 Suggestions'd #2 2014-05-06 19:38:01 +01:00
Howaner
954b59d6f4 Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() 2014-05-06 19:38:09 +02:00
Howaner
27f95454a9 Simplified the HandleAnvilItemName() code. 2014-05-06 17:31:02 +02:00
madmaxoft
8f262d8a9d Initial cGridStructGen refactoring. 
Ref.: #987.
 2014-05-06 16:41:55 +02:00
Tiger Wang
1df7dbe7c9 Suggestions'd 2014-05-05 23:45:35 +01:00
madmaxoft
9542b0b875 Changed cPieceGenerator to support pairings. 
Fixes #982.
 2014-05-05 23:05:30 +02:00
madmaxoft
e4af9a21af Prefabs can specify that they don't want flooring. 
Previously the flag was ignored.
 2014-05-05 22:28:54 +02:00
Howaner
dca3af1f0f Change int to size_t return. 2014-05-05 22:11:48 +02:00
madmaxoft
b69a0c914e Fixed a flipped condition in cBlockArea::Merge(). 2014-05-05 20:33:50 +02:00
Howaner
a138671e0e Fix SetRepairedItemName() in SlotArea.cpp 2014-05-05 17:36:22 +02:00
Howaner
f2617d0683 Add comments to CanTakeResultItem() 2014-05-05 17:34:44 +02:00
Howaner
c162d69e7b Add doxycomments to cSlotAreaAnvil functions. 2014-05-05 17:34:41 +02:00
Howaner
8a6119437d Changed HandleAnvilItemName() length to size_t in ClientHandle.h 2014-05-05 17:34:38 +02:00
Howaner
ecc62dbb9c Add anvil shift click. 2014-05-05 17:34:35 +02:00
Howaner
ca3c9ce84d This isn't a enchantment table :D 2014-05-05 17:34:32 +02:00
Howaner
7fe6e40bf7 Add clicks, exp subtraction, item check, ... 2014-05-05 17:34:29 +02:00
Howaner
6ac332cd06 Add MC|ItemName plugin message. 2014-05-05 17:34:24 +02:00
Howaner
3c102870f6 Add anvil window and slot area. 2014-05-05 17:34:17 +02:00
Mattes D
3c40544336 Merge pull request #978 from mc-server/VectorAssignmentOperator 
Vector3 warning fixes
 2014-05-05 17:19:55 +02:00
worktycho
ef85bef978 Fixed crash on creating a world during plugin initialisation 2014-05-05 16:06:45 +01:00
Tiger Wang
bde40af406 Fixed formatting 2014-05-05 15:43:45 +01:00
Tiger Wang
a94546a047 Fixed 027efe09ea 2014-05-04 14:42:12 +01:00
Tiger Wang
0d1804e439 Merge branch 'master' into redstoneimprovements 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/FallingBlock.cpp
	src/Mobs/AggressiveMonster.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-05-04 14:15:10 +01:00
Tiger Wang
027efe09ea Fixed lever and button powering direction 2014-05-04 14:00:59 +01:00
madmaxoft
136aeb1f64 Removed convert-assign operator. 
We want all conversions to be explicit, not hidden.
 2014-05-04 13:29:32 +02:00
Tiger Wang
bcd8f727b4 Fixed pressure plate oversights 
* Fixed stone pressure plates not checking for the correct distance for
players
* Fixed pressure plates in general not link powering the blocks beneath
them
 2014-05-04 00:39:03 +01:00
Tiger Wang
41f6643fd2 Fixed portal Z direction loop coding failure 
* Fixed portals created in the ZP/ZM direction eating its frame
* Changed return type of a function
 2014-05-04 00:38:06 +01:00
madmaxoft
383fe0cc1e Hotfixed Chunked transfer encoding in Yggdrasil. 
By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed.
 2014-05-03 23:59:45 +02:00
madmaxoft
eaf3dcb9f7 Fixed connection encryption. 
Fixes #975.
 2014-05-03 23:46:04 +02:00
madmaxoft
b4496278a5 Removed the controversial Vector3::operator <. 
It hasn't been used in any C++ code and Lua doesn't need it.
 2014-05-03 20:17:47 +02:00
madmaxoft
d4ae00434c Fixed float comparison warnings in Vector3. 
There's a bitwise comparison (Equals), and there's Eps-based comparison (EqualsEps).
 2014-05-03 19:57:34 +02:00
madmaxoft
ee79bd10c2 Implemented a true assignment operator for Vector3. 2014-05-03 19:34:46 +02:00
madmaxoft
4377a5c31e Fixed vanilla fluid simulator. 
Fixes #919.
 2014-05-03 19:23:59 +02:00
madmaxoft
cbf4a17e05 Attempted fix for CLang warnings in Vector3.h. 
C++11 seems to have deprecated classes that have custom copy-constructor but not a custom assignment operator.
 2014-05-02 23:50:22 +02:00
madmaxoft
3942ebdcb6 WebAdmin outputs a log message about HTTP / HTTPS status. 2014-05-02 23:46:32 +02:00
madmaxoft
58224863c0 Fixed vanilla fluid simulator. 
Fixes #919.
 2014-05-02 22:07:30 +02:00
madmaxoft
8ff7cf9262 Fixed a buffer overflow in cChunk:SetLight(). 
There are only half as many bytes for light than there are blocktypes.
 2014-05-02 20:56:42 +02:00
madmaxoft
92c022c140 Open files in shared mode on windows, so that other tools may read them. 
This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode.
 2014-05-02 20:55:50 +02:00
madmaxoft
5082d55e85 A bit of reformatting. 2014-05-02 19:40:12 +02:00
madmaxoft
839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +02:00
madmaxoft
202ce3e737 Fixed MagmaCube spawning. 
Fixes #928.
 2014-05-02 19:17:22 +02:00
madmaxoft
5c7876c2dd Added a sanitizer for Spawn egg damage value. 
This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928.
 2014-05-02 19:13:57 +02:00
madmaxoft
4d704255de HOOK_DISCONNECT has cClientHandle as its first parameter. 
Ref.: #655.
 2014-05-02 12:35:34 +02:00
madmaxoft
06da2c86b4 Fixed warnings in ManualBindings. 2014-05-01 23:43:11 +02:00
madmaxoft
d950c8346f Fixed warnings in Lua helpers. 2014-05-01 23:38:35 +02:00
madmaxoft
6bdd3ee35e Merged branch 'master' into SslWebAdmin. 2014-05-01 23:20:00 +02:00
madmaxoft
cb07541029 Fixed a warning in Noise. 2014-05-01 23:10:37 +02:00
madmaxoft
e24bdc9328 More ClientHandle fixes. 2014-05-01 23:03:23 +02:00
madmaxoft
ed75d3a836 Fixed warnings in ClientHandle. 2014-05-01 22:58:58 +02:00
madmaxoft
fb173a756c Fixed warnings in cByteBuffer. 2014-05-01 22:54:22 +02:00
madmaxoft
a4d8c6d656 Fixed warning in BlockID. 2014-05-01 22:47:02 +02:00
madmaxoft
a91129af4a Fixed warnings in cBlockArea. 2014-05-01 22:44:52 +02:00
madmaxoft
b6b86b7270 Fixed warnings in FastNBT. 2014-05-01 22:43:37 +02:00
madmaxoft
a6eba4ff8b Fixed warning in cCallbackSslContext::cDataCallbacks. 2014-05-01 22:41:41 +02:00
madmaxoft
e175ae551c Fixed warning in cBlockArea. 2014-05-01 22:41:18 +02:00
madmaxoft
4a95271790 Merge branch 'master' into SslWebAdmin 2014-05-01 22:16:29 +02:00
madmaxoft
30e81156eb Added a missing return statement. 2014-05-01 22:02:45 +02:00
madmaxoft
b0056cdcf8 Removed the explicit copy constructor for cItem. 
The compiler generates an implicit one with the same contents and warns about it. The function left in for ToLua to generate the binding for it.
 2014-05-01 22:02:25 +02:00
madmaxoft
9221b45898 cSslContext has virtual destructor now. 2014-05-01 21:23:37 +02:00
Mattes D
a2cffb0363 Fixed MSVC2013 compilation. 2014-05-01 20:22:23 +02:00
Mattes D
d9e5dbf165 Renamed PublicKey to CryptoKey in CMakeLists.txt 2014-05-01 18:06:23 +02:00
madmaxoft
772b57ca04 Anvil saver pads data to 4K boundaries. 
Fixes #524.
 2014-05-01 18:00:10 +02:00
madmaxoft
1587b21edd Renamed cPublicKey to cCryptoKey. 
The class can hold both the private key and the public key, bad naming on PolarSSL's part.
Also somewhat fixed the cert and key loading in cHTTPServer.
 2014-05-01 15:21:41 +02:00