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

2100 Commits

Author SHA1 Message Date
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
Tycho
ec407dd27d Merge branch 'master' into chunksparsing/structs 
Conflicts:
	src/Chunk.cpp
 2014-05-03 06:07:56 -07:00
Tycho
616ddf5ca5 cCHunkBuffer that compiles with TestGlobals.h 2014-05-03 06:02:51 -07: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
Tycho
8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07: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
madmaxoft
60850fe3e8 Fixed crashes in the SSL HTTP connection. 2014-05-01 15:08:15 +02:00
madmaxoft
272c232efb Implemented SSL connection for WebAdmin. 
Fixes FS-319.
 2014-05-01 11:48:03 +02:00
madmaxoft
a04cb6d146 Fixed HTTP message parsing, prepared for SSL. 2014-05-01 11:34:15 +02:00
madmaxoft
e1b6a16945 Added a (disabled) test of low-security ciphersuites. 
Enabling this allows the connection to be sniffed and decoded using Wireshark, when given the SSL private key.
 2014-05-01 11:33:29 +02:00
madmaxoft
e2bf3783e8 Fixed BufferedSslContext's buffer reading and writing. 2014-05-01 11:32:25 +02:00
madmaxoft
47feb91e57 cSslContext supports setting own cert / privkey. 2014-05-01 00:28:27 +02:00
madmaxoft
e6786074d5 Added cBufferedSslContext implementation. 2014-05-01 00:27:42 +02:00
madmaxoft
ab2dfb44fa If webadmin.ini doesn't exist, example one is written immediately. 2014-04-30 17:37:25 +02:00
madmaxoft
f2b5790776 Fixed a warning when an empty item is being created. 2014-04-30 17:36:51 +02:00
madmaxoft
ae2d18daee Ladders set as transparent. 2014-04-30 17:13:56 +02:00
madmaxoft
58929a9948 Removed the unused cBlockingTCPLink class. 2014-04-30 17:06:46 +02:00
Mattes D
014fab58e6 Merge pull request #965 from mc-server/SslWrappers 
Ssl wrappers
 2014-04-30 17:05:13 +02:00
madmaxoft
1dbdb8ed91 Delayed sending the KeepAlive packet for 3 seconds after login. 
This should alleviate #889.
 2014-04-29 23:10:50 +02:00
madmaxoft
c045bb3f4c Removed unneeded #includes. 2014-04-29 17:45:20 +02:00
madmaxoft
6cb2d2461f Moved the rest of the Crypto objects into their own respective files. 2014-04-29 17:37:15 +02:00
madmaxoft
d9f7ae6a4d Moved cPublicKey to its separate file in PolarSSL++. 2014-04-29 17:13:08 +02:00
madmaxoft
7e972f6a5d Merge branch 'master' into SslWrappers 2014-04-29 15:41:24 +02:00
madmaxoft
015bf244b5 Added BiomeToString() API function. 2014-04-29 15:36:29 +02:00
madmaxoft
5d33ce226f Added BiomeToString() API function. 2014-04-29 15:36:05 +02:00
madmaxoft
79ec770d77 Added missing initialization. 2014-04-29 11:17:47 +02:00
madmaxoft
ec33bbe294 Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. 2014-04-29 11:04:54 +02:00
madmaxoft
709ae320e0 Disabled MSVC warnings about constant bool expressions. 2014-04-28 22:30:07 +02:00
madmaxoft
55a7f392cc Hopefully fixed repeated clang warnings. 2014-04-28 22:22:07 +02:00
madmaxoft
dffd38e53b Fixed a MSVC warning. 2014-04-28 22:21:49 +02:00
madmaxoft
0b16e6821f Merged branch 'master' into SslWrappers. 2014-04-28 22:05:02 +02:00
madmaxoft
bab3a3cd31 Added the G1 root cert. 
Now the authenticator finally works.
 2014-04-28 21:16:52 +02:00
madmaxoft
16b3eae862 Added a debug cert printing function. 2014-04-28 21:16:32 +02:00
Mattes D
709015369d Merge pull request #940 from Howaner/GlobalFixes 
Add entity invulnerable
 2014-04-28 20:58:15 +02:00
madmaxoft
8ab8fb344f Fixed braces. 2014-04-28 20:37:22 +02:00
madmaxoft
f04957321d Fixed missing return value warning in MSVC. 2014-04-28 20:37:12 +02:00
madmaxoft
8ae472df86 Merge remote-tracking branch 'worktycho/master' 2014-04-28 20:16:37 +02:00
Tycho
ad5cdf9f2d Removed static from combinators. 
THis allows us to use the functions in template params at the cost of polluting the global namespace.
 2014-04-28 11:07:06 -07:00
Tycho
6d520e398b Fixed unbraced ifs 2014-04-28 11:00:43 -07:00
Tycho
05fe6d6c58 Removed inlines from combinators 
gcc requires external linkage for functions provided to template parameters
 2014-04-28 10:52:48 -07:00
Tycho
a42480cf82 Template Magic 
Removed need to allocate a fake meta block by using templates to provide a version
of the code that does not use metas. Also changed the function to a template
argument to make sure that the compilier is able to inline it.
 2014-04-28 10:31:07 -07:00
Howaner
acd2804f31 Revert "Withers now use the new invulnerable." 
This reverts commit 619592b5a0.
 2014-04-28 13:51:40 +02:00
Howaner
26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new." 
This reverts commit d50f8f6f11.
 2014-04-28 13:51:22 +02:00
Mattes D
c063051645 Merge pull request #954 from mc-server/projectiles-split 
Totally refactored ProjectileEntity.h, splitting up into several files.
 2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
madmaxoft
ef57133f9b Reordered constructors. 2014-04-27 23:35:17 +02:00
madmaxoft
bb73af6843 Fixed a late-night typo. 2014-04-27 23:31:26 +02:00
madmaxoft
9dc9713a9c Fixed warnings. 2014-04-27 23:12:52 +02:00
madmaxoft
4c165f8a6d Fixed player spawning #953. 2014-04-27 23:11:36 +02:00
Tycho
744e00c904 Worked around const pointer 2014-04-27 13:43:59 -07:00
Mattes D
051bb8cfbd Merge pull request #958 from worktycho/bugfix 
Bugfix
 2014-04-27 22:42:22 +02:00
madmaxoft
dd52719c2d Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes. 2014-04-27 22:28:14 +02:00
madmaxoft
0bdc49221b PolarSSL wrappers for the SSL context. 2014-04-27 22:27:53 +02:00
worktycho
c7260b2f63 Merge pull request #959 from mc-server/fixes-2 
Coverity fixes
 2014-04-27 13:24:51 -07:00
madmaxoft
f301d052cf cSocket creates the socket in Connect if no socket is present yet. 2014-04-27 22:20:49 +02:00
Tycho
077179277c Fixes to uninitallsed array access in Noise.cpp 
CID 43634, 43634
 2014-04-27 13:20:00 -07:00
Tycho
71c51783f3 Initalize counter in fastrandom 
Fixes CID 43622
 2014-04-27 13:15:19 -07:00
Tycho
a2b1fa6520 Initialised MetaArrays in BlockArea 
Fixes CID 43621
 2014-04-27 13:12:36 -07:00
Tycho
25d933883a Removed unneeded assert 
Fixed CID 43610
 2014-04-27 13:07:21 -07:00
Tycho
35dc88e4ff Removed Old Asserts 
Removed asserts about non-negative numbers on what are now unsigned types
Fixes CID 43608
 2014-04-27 12:42:29 -07:00
Tycho
d15743df1c Removed old unused code 2014-04-27 12:41:22 -07:00
Tycho
ee354a405b Fixed OnPluginMessage hook not exiting early. 
OnPluginMessage hook would call all plugins even after one returned true.
Fixes CID 43512
 2014-04-27 12:37:08 -07:00
Mattes D
5c46f9dd39 Merge pull request #864 from mc-server/Stat 
Statistic/Achievement defs
 2014-04-27 19:37:45 +02:00
andrew
bef3c6d47d Added some comments 2014-04-27 20:26:50 +03:00
archshift
cd38e792b7 Revert "Creative players cannot throw ender pearls." 
This reverts commit 75bb36574b.
 2014-04-27 10:24:39 -07:00
archshift
75bb36574b Creative players cannot throw ender pearls. 2014-04-27 10:01:50 -07:00
archshift
15324f3bbd Fixed ToLua errors, added newlines 2014-04-27 09:42:31 -07:00
Tiger Wang
bbc5faa723 Redstone simulator now directly accesses cChunk 
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
 2014-04-27 17:35:41 +01:00
madmaxoft
fdac27c63d Another attempt at #889. 
The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
 2014-04-27 17:31:58 +02:00
Tycho
6f1fea759e Fixed bad comment 2014-04-27 08:14:56 -07:00
Tycho
d412630904 Fixed a couple of segfaults and made Free a seperate function 2014-04-27 08:11:56 -07:00
Mattes D
a0f6149d05 Merge pull request #948 from jfhumann/staticFixes 
Fixes motivated by Coverity #1
 2014-04-27 17:00:37 +02:00
Tycho
48a2488477 Added other half of implementation 2014-04-27 07:38:16 -07:00
Tycho
2730a41946 Fixed issues with gcc 2014-04-27 07:10:30 -07:00
Tycho
e3bdc81ca0 Fixed MobProximity Counter to remove chunk copys 2014-04-27 06:46:13 -07:00
Tycho
dcb2a590e3 Fixed bad merge 2014-04-27 06:45:33 -07:00
Tycho
57b8ee9163 Merge branch 'master' into chunksparsing/structs 
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
 2014-04-27 06:35:27 -07:00
archshift
cc39d314ae Fixed ToLua issues 2014-04-26 17:58:06 -07:00
archshift
e3c3795aa4 Moved cFireworkEntity out of ProjectileEntity.h 2014-04-26 17:50:05 -07:00
archshift
cb93a57963 Moved cGhastFireballEntity out of ProjectileEntity.h 2014-04-26 17:41:07 -07:00
archshift
de7eaa5735 Moved cFireChargeEntity out of ProjectileEntity.h 2014-04-26 17:35:31 -07:00
archshift
08b77f4880 Moved cThrownSnowballEntity out of ProjectileEntity.h 2014-04-26 17:24:44 -07:00
archshift
2f9580ad65 Moved cExpBottleEntity out of ProjectileEntity.h 2014-04-26 17:19:45 -07:00
archshift
bc5c28a0be Moved cThrownEnderPearl out of ProjectileEntity.h 2014-04-26 17:08:39 -07:00
archshift
de23a115a5 Moved cThrownEggEntity out of ProjectileEntity.h 2014-04-26 17:02:47 -07:00
archshift
477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Tiger Wang
15767badac A tiny speed improvement in ApplyFoodExhaustion() 2014-04-26 23:52:18 +01:00
Tiger Wang
b4b3b5ce64 More comments! 
* Also fixed a potential issue with position sending - if someone moved
slowly enough, their position would never be updated.
 2014-04-26 23:50:24 +01:00
archshift
e2194e6e90 Added static const, initialized fields. 2014-04-26 15:32:14 -07:00
Mattes D
da931da603 Merge pull request #941 from archshift/master 
Fixed lots of warnings, and other small changes.
 2014-04-26 23:26:59 +02:00
archshift
7841bad27a More small fixes. 2014-04-26 14:05:00 -07:00
archshift
5a0625eccc Moar alignment. 2014-04-26 11:00:59 -07:00
Tycho
e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
archshift
aef2c8ec62 Further refactored, Reverted Minecart change 
Other small changes.
 2014-04-26 09:25:30 -07:00
Howaner
d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00
Howaner
619592b5a0 Withers now use the new invulnerable. 2014-04-26 17:37:35 +02:00
Howaner
49f6819829 Fixes 2014-04-26 16:44:15 +02:00
Mattes D
1139b117c4 Merge pull request #863 from mc-server/chunkysparsing 
Chunky sparsing
 2014-04-26 15:12:10 +02:00
jfhumann
a1765a2896 Fixed unitialized member in gZipFile (CID 43673) 2014-04-26 14:23:53 +02:00
archshift
80b97fd9dd Fixed mobs that don't naturally spawn. 2014-04-25 20:49:55 -07:00
archshift
acff6148b6 Moved switch{} out of GetArmorCoverAgainst(). 2014-04-25 19:49:08 -07:00
archshift
b2f40a7a11 Removed unused assignments. 2014-04-25 18:18:46 -07:00
archshift
73edd2b961 Fixed a couple more warnings. 2014-04-25 17:15:12 -07:00
archshift
2c0bb7b717 Moved the weather picker out of TickWeather(), squashing a warning and improving readability. 2014-04-25 16:55:38 -07:00
jfhumann
26568a852e Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618) 2014-04-26 01:35:25 +02:00
archshift
c124fc39d4 Removed impossible default case. 
Squashed a warning.
 2014-04-25 16:32:34 -07:00
archshift
083cec5a09 Removed extraneous switch{} in Start() 
Squashed a warning.
 2014-04-25 16:27:15 -07:00
jfhumann
f2b7cb138f Fixes resource leaks in the yggdrasil authenticator. (CID 43617) 2014-04-26 01:21:06 +02:00
archshift
5ffdaa8142 Moved huge conditional out of InStateChasing(), improving readability 
Squashed a warning.
 2014-04-25 15:49:11 -07:00
jfhumann
c8d5fcfffa Fix for minor resource leak (CID 43616) 2014-04-26 00:43:01 +02:00
Howaner
e5683ede63 Change m_InvulnerableTicks description again again :D 2014-04-26 00:41:00 +02:00
Howaner
ed1aa02d0c Change m_InvulnerableTicks description again. 2014-04-26 00:37:40 +02:00
Howaner
ad1410f46e Change m_InvulnerableTicks description 2014-04-26 00:37:09 +02:00
Howaner
7fd9fe9d5f Merge branch 'master' into GlobalFixes 2014-04-26 00:34:42 +02:00
Howaner
7e76f030aa Add entity invulnerable 2014-04-26 00:32:30 +02:00
Mattes D
a4f21908b2 Merge pull request #920 from axisd/master 
Mobs shouldn't burn when it's Raining
 2014-04-25 23:48:00 +02:00
Mattes D
43cca14763 Merge pull request #935 from archshift/projectile-fixes 
Chicken eggs and ender pearls can hit entities.
 2014-04-25 23:41:04 +02:00
jfhumann
03402efc49 Should fix CIDs 43631, 43632 and 43633 2014-04-25 23:39:10 +02:00
Tiger Wang
05f52192c9 Implemented comments 2014-04-25 21:22:43 +01:00
archshift
0e0c9d8248 Missed these CMakeLists. 2014-04-25 12:24:09 -07:00
archshift
d64e46186f Merge remote-tracking branch 'upstream/master' 2014-04-25 10:50:10 -07:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
madmaxoft
6d167b370e Fixed C++11 check for SharedPtr. 2014-04-25 16:05:24 +02:00
archshift
8aa82d048d Creator not user. 2014-04-25 06:26:08 -07:00
archshift
256691461b Comments for TrySpawnChicken() and TeleportUser(). 2014-04-25 05:49:18 -07:00
archshift
cb7f1ee4bb Rename spawn chicken method, Initialize m_HasTeleported. 2014-04-25 05:39:35 -07:00
r.ramazanov
4cd2d57c64 Fix formatting 2014-04-25 12:06:22 +04:00
madmaxoft
f3dfc0349d Added shared_ptr handling for C++03 mode. 2014-04-25 09:48:52 +02:00
r.ramazanov
827c3760db Fix for clang 2014-04-25 10:58:48 +04:00
Mattes D
a40108da90 Merge pull request #932 from Howaner/Inventory 
Fix armor in survival mode.
 2014-04-25 08:11:49 +02:00
r.ramazanov
a72744f5c3 Mobs shouldn't burn when it's Raining & Mob Knockback is far too much 2014-04-25 10:08:36 +04:00
r.ramazanov
1c26eb715b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-25 10:06:12 +04:00
archshift
62e5234535 Small changes; warning fixing. 2014-04-24 20:25:03 -07:00
archshift
ec9787bae2 Chicken eggs and ender pearls can hit entities. 
Fixed warning by adding dedicated m_HasTeleported for fired arrows.
 2014-04-24 19:16:16 -07:00
archshift
0f7bd9fc77 Oops, fixed that. 2014-04-24 19:14:00 -07:00
archshift
624deea6c4 Giants! 
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
 2014-04-24 18:11:11 -07:00
archshift
b008ba5d98 Refactored SendChat(), placing the message-type formatting into its own function. 
Removed default case warning in the process.
 2014-04-24 18:03:49 -07:00
Howaner
ccd9023202 Add commit what the code is doing. 2014-04-25 00:10:52 +02:00
Howaner
cee70390fa Add unkown armor warning and fix armor stacks. 2014-04-25 00:09:22 +02:00
Tiger Wang
3397f9faec Fixed indent 2014-04-24 22:07:20 +01:00
Tiger Wang
c949c1e755 Implemented suggestions 2014-04-24 22:03:47 +01:00
Howaner
376dc880b3 Add armor to switch() in ItemHandler.cpp 2014-04-24 23:03:04 +02:00
Tiger Wang
acbd4e6503 Another small speed improvement? 2014-04-24 21:52:01 +01:00
Tiger Wang
ffce8d6907 Implemented suggestions 2014-04-24 21:49:56 +01:00
madmaxoft
4f49c978cf Replaced MSVC-specific decorators with our universal ones. 2014-04-24 22:43:20 +02:00
madmaxoft
616fb15508 cByteBuffer uses void * instead of char * in data interface. 
This makes it compatible with any pointer type.
 2014-04-24 22:42:33 +02:00
madmaxoft
a02e8e8021 Declared a SharedPtr that hopefully resolves on all platforms. 
MSVC2008 has it in std::tr1, all the others in std.
 2014-04-24 22:30:19 +02:00
madmaxoft
c7694687f5 Fixed filename case. 2014-04-24 22:15:21 +02:00
Mattes D
85e0b0eae9 Merge pull request #929 from archshift/master 
Renamed mob source files to better fit the CamelCase naming style.
 2014-04-24 22:12:28 +02:00
madmaxoft
e33573ab59 Attempted CMake inclusion for PolarSSL++. 2014-04-24 21:53:42 +02:00
madmaxoft
c4b4447a3a Authenticator uses some C++ SSL objects. 2014-04-24 21:53:41 +02:00
madmaxoft
c701adbd24 Initial C++ SSL classes. 2014-04-24 21:53:41 +02:00
madmaxoft
449cf77420 Changed cByteBuffer constructor to take a size_t instead of int. 2014-04-24 21:52:24 +02:00
archshift
8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07:00
Howaner
9cbb3a339f Fix armor in survival mode. 2014-04-24 20:41:25 +02:00
Tiger Wang
48904ae201 Merge branch 'master' into fixes 
Conflicts:
	src/World.h
 2014-04-24 18:57:25 +01:00
r.ramazanov
d126adc124 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-24 10:32:26 +04:00
archshift
06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
archshift
c2f2ef7cb4 Rename mob source files to fit CamelCase. 
Rename Cavespider.cpp to CaveSpider.cpp

Rename Cavespider.h to CaveSpider.h

Rename Magmacube.cpp to MagmaCube.cpp

Rename Magmacube.h to MagmaCube.h

Rename Zombiepigman.cpp to ZombiePigman.cpp

Rename Zombiepigman.h to ZombiePigman.h
 2014-04-23 15:22:49 -07:00
madmaxoft
695baed226 Updated docs for StringToEnchantmentID. 
Ref.: mc-server/Core#67
 2014-04-23 23:06:29 +02:00
madmaxoft
6d7da6b15d Updated NetherFort prefabs to latest Gallery content. 2014-04-23 23:03:09 +02:00
Tiger Wang
7f5cf417de Some change to Entity.cpp 
* Added comments to BroadcastMovementUpdate() and the collision tracer
 2014-04-23 21:06:46 +01:00
Tiger Wang
f763242e5c Small changes 2014-04-23 21:06:07 +01:00
STRWarrior
9660c4816f The new leaves don't decay anymore. 
Fixes #792
 2014-04-23 16:57:32 +02:00
r.ramazanov
103c867f1f Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-23 18:15:28 +04:00
r.ramazanov
5deb35c5cf Mobs shouldn't burn when it's Raining #906 
Mob Knockback is far too much #776
 2014-04-23 18:15:04 +04:00
Mattes D
0d0e0af2d8 Merge pull request #925 from archshift/master 
Added monsters.ini rule for fireproof mobs.
 2014-04-23 09:46:06 +02:00
archshift
8768669428 Renamed getter and setter for IsFireproof. 2014-04-23 00:12:37 -07:00
archshift
e1476ebb26 Added IsFireproof hook for monsters.ini 2014-04-22 13:17:42 -10:00
archshift
a37b36adab Fireproof status getter and setter. 2014-04-22 12:59:31 -10:00
madmaxoft
2533842ca4 Updated NetherFort prefabs from the Gallery server. 2014-04-22 22:26:01 +02:00
Mattes D
b3a9b73278 Merge pull request #923 from archshift/master 
Added flag for fireproof entities.
 2014-04-22 15:04:04 +02:00
archshift
06f41699af Fixed indentation and changed m_Fireproof to m_IsFireproof. 2014-04-22 02:36:39 -10:00
archshift
bca7f29490 Lay foundation for fireproof entities. 
Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
 2014-04-22 01:59:34 -10:00
Mattes D
6492aa000b Merge pull request #909 from jfhumann/fixes 
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
 2014-04-22 13:34:32 +02:00
jfhumann
865e8e22e5 reverted the revert of the minecart collision detection fix. 2014-04-21 14:04:36 +02:00
r.ramazanov
a967313839 Mobs shouldn't burn when it's Raining #906 2014-04-21 13:13:25 +04:00
madmaxoft
e3ec857264 Added prefab hitboxes. 
The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish.
 2014-04-21 10:31:30 +02:00
madmaxoft
7c6ef26be9 Added enchantment combining into cEnchantments. 2014-04-21 10:31:30 +02:00
madmaxoft
bdd8b43b3e Replaced X.size() with X.empty(), where applicable. 2014-04-21 10:31:29 +02:00
Mattes D
4c7621ed16 Fixed a warning in CraftingRecipes. 2014-04-21 09:21:31 +02:00
Mattes D
9f58046b5b Allow 1.6.4 Forge clients to log in. 
Fixes #913.
 2014-04-21 08:22:25 +02:00
Mattes D
d7f88396e0 Fixed enchanting return values. 
Items are enchanted in those cases, so return true.
Ref.: #914.
 2014-04-21 06:41:11 +02:00
madmaxoft
7b246d9a8d Fixed MSVC compilation. 2014-04-20 13:50:37 +02:00
daniel0916
098be1c7fc Fixed Code 2014-04-19 22:37:29 +02:00
daniel0916
cb90029f72 Merge branch 'master' into Enchanting 2014-04-19 20:56:29 +02:00
jfhumann
f48d43f050 Fixed Flint and Steel, reverted Minecart change, renamed a parameter name 2014-04-19 20:51:52 +02:00
jfhumann
4dd7610381 Declared one mutex as mutable in order to allow for const correct get accessors. 2014-04-19 17:53:02 +02:00
daniel0916
11ff36c683 Fixed Code (2) 2014-04-19 16:10:05 +02:00
daniel0916
a6de7bf1cd Fixed Code 2014-04-19 15:10:50 +02:00
madmaxoft
6eac586794 Fixed formatting, made function static. 2014-04-19 13:05:58 +02:00
madmaxoft
5f3df1445f Merge remote-tracking branch 'origin/Beacons' 2014-04-19 13:01:28 +02:00
jfhumann
5bed1c09bc Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does. 2014-04-18 22:47:59 +02:00
jfhumann
fde1555352 Small style changes 2014-04-18 22:20:24 +02:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes 
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
 2014-04-18 21:44:58 +02:00
Tiger Wang
19358fc7d5 Compilation fix 2014-04-18 20:20:00 +01:00
Tiger Wang
598719d7ab Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-18 20:17:52 +01:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
daniel0916
b239de66db Merge branch 'master' into Enchanting 2014-04-18 15:04:32 +02:00
madmaxoft
6d3bde5221 Added performance test of the nether fort generator. 2014-04-18 14:35:33 +02:00
daniel0916
56613d2b22 Fixed Errors 2014-04-18 14:34:29 +02:00
daniel0916
3efd232829 Removed old include 2014-04-18 14:10:31 +02:00
Tiger Wang
6cb63a768d Fixed #906 2014-04-18 12:59:14 +01:00
Tiger Wang
200ea6254c Fixed #904 2014-04-18 12:54:17 +01:00
madmaxoft
193dcca1e3 Removed unsupported C++11 features. 2014-04-18 09:36:11 +02:00
Mattes D
b7e074b10b Merge pull request #891 from mc-server/fixes 
Fixes to redstone & general
 2014-04-17 22:37:00 +02:00
madmaxoft
6779010242 Added area flooring. 
Fixes #743.
 2014-04-17 22:03:30 +02:00
Tiger Wang
bdea8706d8 Added new AI rules 
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
 2014-04-17 18:50:25 +01:00
daniel0916
0086fcfef1 Fixed some Errors (not all) 2014-04-17 19:31:43 +02:00
madmaxoft
afb20132fe Added Prefab initializers to SELFTEST code. 2014-04-17 17:50:52 +02:00
madmaxoft
be091800f8 Prefabs can have per-piece per-placement weights. 
Fixes #753.
Also upgraded NetherFortPrefabs to lates Gallery contents.
 2014-04-17 17:32:08 +02:00
Tiger Wang
18c3b18a3f Compile fix? 2014-04-17 13:02:20 +01:00
daniel0916
f9343a8490 Modified many things 2014-04-17 13:15:35 +02:00
Tiger Wang
2151ee997c Implemented weighted pressure plates 2014-04-17 12:11:31 +01:00
Mattes D
35e847d2f5 Merge pull request #896 from axisd/master 
Mobs rotation
 2014-04-17 08:45:14 +02:00
r.ramazanov
7bcc920662 Mobs rotation 2014-04-17 09:35:26 +04:00
madmaxoft
09866bb382 Added asserts for proper game state. 
This is to help hunt #889.
 2014-04-16 18:10:48 +02:00
daniel0916
a0725747af Fixed conflicting enchantments checking 2014-04-16 14:52:09 +02:00
daniel0916
a12a9117c2 Added deletions from merge conflict 2014-04-16 14:33:03 +02:00
daniel0916
5a9acb7eb6 Merge branch 'master' into Enchanting 2014-04-16 14:31:02 +02:00
daniel0916
8d67562238 Fixed merge conflict 2014-04-16 14:30:55 +02:00
daniel0916
8c33b3c415 Fixed double enchanting items 2014-04-16 13:31:37 +02:00
madmaxoft
99e4225269 Attempted fix for the client crash with the new protocols. 2014-04-15 23:40:06 +02:00
daniel0916
2cb8538e2e Code Optimization 2014-04-15 22:03:15 +02:00
daniel0916
36f747d674 Added Book Enchanting 2014-04-15 21:43:52 +02:00
Howaner
e81fc2779e Add more checks to cSlotAreaEnchanting 2014-04-15 21:12:59 +02:00
daniel0916
fb3c755c0a Modified names 2014-04-15 20:55:37 +02:00
Howaner
8df922e3e0 Add linux compatibility 2014-04-15 20:42:39 +02:00
Tiger Wang
82b3d543e7 Rewrote redstone powering to use power levels 2014-04-15 13:15:56 +01:00
madmaxoft
b5ea5fbf90 Added support for per-piece per-placement weights in cPieceGenerator. 
Ref.: #753.
 2014-04-15 12:57:52 +02:00
madmaxoft
146824cb68 NetherFortPrefabs: Fixed a connector in MidStaircase. 2014-04-15 12:57:52 +02:00
madmaxoft
d12d7b6715 Implemented the 1.7.6 protocol and authenticator. 
Server works both in online and offline modes with 1.7.9.
 2014-04-14 22:52:59 +02:00
daniel0916
b5401ec03a Added ItemPlaceCount in SlotArea 
Thanks to Howaner for helping
 2014-04-14 22:05:04 +02:00
madmaxoft
d505ffc704 A client UUID is generated when the server is in offline mode. 
1.7.9 client works with these changes in offline mode.
 2014-04-14 20:21:00 +02:00
madmaxoft
ffe65b6a18 Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176 2014-04-14 18:53:56 +02:00
madmaxoft
0f55dcf036 Initial 1.7.6 protocol support. 
Doesn't work yet because of missing UUIDs.
 2014-04-14 18:52:21 +02:00
daniel0916
55224d25ef Removed Debug Message 2014-04-14 16:48:14 +02:00
daniel0916
0ba0e39db4 Added/Modified last things for Enchanting System 2014-04-14 16:46:59 +02:00
daniel0916
a51a099c81 Blocked enchanting a item twice 2014-04-14 13:39:44 +02:00
daniel0916
fb26d2ba87 Fixed Bookshelf Checking 
Code by LO1ZB
 2014-04-14 11:56:50 +02:00
daniel0916
856e900bf8 Bug fixes 2014-04-14 11:48:12 +02:00
daniel0916
fce9ea65c3 Fixed invisibility enchantments 2014-04-13 22:15:10 +02:00
daniel0916
2618569e01 Fixed mistake 2014-04-13 17:09:18 +02:00
daniel0916
d258be678a Fixed Error? 2014-04-13 16:15:57 +02:00
daniel0916
3733ee2c0e Code Update 2014-04-13 15:32:15 +02:00
daniel0916
9dc4617e8d Fixed mistake 2014-04-13 13:53:10 +02:00
daniel0916
c88464e62a Fixed Server Crash 2014-04-13 13:36:03 +02:00