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
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
Mattes D
a0f6149d05
Merge pull request #948 from jfhumann/staticFixes
...
Fixes motivated by Coverity #1
2014-04-27 17:00:37 +02: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
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
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
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