1
0
Commit Graph

1879 Commits

Author SHA1 Message Date
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
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
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
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
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
madmaxoft
772b57ca04 Anvil saver pads data to 4K boundaries.
Fixes #524.
2014-05-01 18:00:10 +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