1
0
Fork 0
Commit Graph

174 Commits

Author SHA1 Message Date
STRWarrior 9678341a11 Made the cWorld::SpawnMobFinalize function more readable. 2014-07-24 12:15:48 +02:00
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft 6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
madmaxoft 00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
archshift 11f8198a80 World.cpp: fixed not all enum fields being used in m_Dimension switch 2014-07-19 02:56:46 -07:00
madmaxoft 2423fbf2ef Normalized comments.
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft 7fff12bfac Fixed spaces around single-line comments.
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
madmaxoft 993fd14ddf Fixed basic whitespace problems.
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
Mattes D e444106d09 Merge pull request #1192 from mc-server/skinuuid
Skins
2014-07-16 13:30:57 +02:00
Tycho 57f4e871bb Fixed FindClosestPlayer 2014-07-15 12:52:02 +01:00
Tiger Wang 4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
worktycho 4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
madmaxoft 9e22f46b15 Implemented support for forced chunk ticking.
Fixes #1160.
2014-07-10 18:18:32 +02:00
Tiger Wang 74b6b398e7 Fixed arrow collection animation
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01:00
Tiger Wang 9e44b0aae1 Implemented trapped chests & others
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
madmaxoft 632e8680b1 Removed world-saving log messages.
Ref.: http://forum.mc-server.org/showthread.php?tid=1518
2014-07-04 11:50:50 +02:00
Mattes D 9926abd4f5 Added generic entity-collecting.
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
2014-06-27 20:56:44 +02:00
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
madmaxoft 366ecf9dfd Fixed a race condition when adding a player to a world. 2014-06-10 18:25:53 +02:00
Mattes D af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
Mattes D b904223b9d Added queue for adding entities to cWorld.
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
Tiger Wang 365c6f50bd Changed block send queue to use vectors
As suggested by @worktycho.
2014-05-29 11:57:06 +01:00
Tiger Wang ee929793f0 Hopefully fixed piston duplication issues
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Mattes D dd350bc1f3 World pre-generation distance is settable in world.ini. 2014-05-09 18:32:04 +02:00
Mattes D fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
archshift 2c0bb7b717 Moved the weather picker out of TickWeather(), squashing a warning and improving readability. 2014-04-25 16:55:38 -07: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
archshift 62e5234535 Small changes; warning fixing. 2014-04-24 20:25:03 -07: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 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
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tiger Wang 200ea6254c Fixed #904 2014-04-18 12:54:17 +01:00
Tiger Wang 82b3d543e7 Rewrote redstone powering to use power levels 2014-04-15 13:15:56 +01:00
Tiger Wang b3f6afefe9 Simplified pickup speed randomisation 2014-04-12 13:14:35 +01:00
madmaxoft 22794e7208 Fixed double projectile spawning.
Two spawn packets were sent per projectile.
2014-04-05 22:26:10 +02:00
madmaxoft 9032ff96c7 Removed unused constants.
DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
2014-03-25 23:35:50 +01:00
madmaxoft b1ad3322e5 Fixed code style after recent merge. 2014-03-20 09:28:29 +01:00
Tiger Wang 3e49cada80 Added braces 2014-03-19 23:07:58 +00:00
Tiger Wang 0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
Tiger Wang b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang 23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
Tycho 8b83c1a653 Merge branch 'master' into warnings 2014-03-14 06:46:20 -07:00
madmaxoft 35fe96b07d Fixed a warning. 2014-03-14 14:36:44 +01:00
Tycho 862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho d904e89712 Merge branch 'Werror' into warnings
Conflicts:
	src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho 7e6ee7ef81 Fixed more Format issues 2014-03-11 14:43:14 -07:00
andrew b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00