flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,482 Commits 1 Branch 0 Tags
5249f574bd077158836455fa66218e5fea6dcafe
Commit Graph
6482 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
worktycho a303adca8b Update CoverityModel.cpp 2014-04-27 13:03:34 -07:00
worktycho e069948bef Create CoverityModel.cpp 2014-04-27 20:57:47 +01: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
Tycho 1d3ad6faa2 Added Testing capability 2014-04-27 12:25:03 -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