1
0
Commit Graph

217 Commits

Author SHA1 Message Date
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang
1156914dd6 Suggestions 2014-07-23 21:12:59 +01:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
Tiger Wang
6ab9afd0fd Bug and crash fixes
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
archshift
52add840cf Fixed attempts to call c_str on ChatColors 2014-07-19 11:15:21 -07:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578 Merge branch 'master' into portals
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
2014-07-18 20:10:51 +01:00
archshift
9529a42559 Fixed creative players not being able to drink
Fixes #1215
2014-07-18 01:56:26 -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
madmaxoft
e66b81b395 Merge remote-tracking branch 'origin/master' into potions 2014-07-17 10:06:13 +02:00
Mattes D
e444106d09 Merge pull request #1192 from mc-server/skinuuid
Skins
2014-07-16 13:30:57 +02:00
Tiger Wang
1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
e11f41d048 Revert failed fix for #31
This reverts commit 69dc9b4c9a.
2014-07-13 00:17:31 +01:00
archshift
e824cd09b3 Merge remote-tracking branch 'origin/master' into potions
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
Howaner
4ded58bfd1 Unnecessary return 2014-06-30 14:19:31 +02:00
Tiger Wang
b9d4431f6f Fixed respawning
* Fixes #1103
2014-06-29 22:44:16 +01:00
Mattes D
3c631fc0f9 Fixed offline UUID generator.
It generated invalid UUIDs, too many hex chars.
2014-06-29 18:27:41 +02:00
Howaner
50e112788b Send statistics to the player, when he logged in. 2014-06-29 01:40:15 +02:00
Mattes D
1b89b997ff Merge pull request #1132 from mc-server/RemoveMD5
Removed the md5 library, obsoleted by PolarSSL.
2014-06-29 00:46:11 +02:00
Tiger Wang
5e66d9aeab Fixed issue with breaking blocks at -1 coordinates 2014-06-28 20:45:05 +01: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
Mattes D
563f706422 Removed the md5 library, obsoleted by PolarSSL.
Fixes #1130.
2014-06-27 19:34:53 +02:00
Tiger Wang
bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
2014-06-21 22:14:23 +01:00
madmaxoft
08fed2a213 Added cClientHandle::IsUUIDOnline function.
Ref.: #771
2014-06-21 22:13:35 +02:00
archshift
3766ac96d7 ItemHandler: changed IsDrinkable() to take a short argument 2014-06-17 11:39:20 -07:00
archshift
2185c72c2c Implemented drinkable potions, noeffect entity effect,
Clears entity effects on death
2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee Implemented milk, added documentation to Pawn.h 2014-06-17 11:39:19 -07:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
7e985f3c7d Add more documentation. 2014-06-17 13:44:07 +02:00
Howaner
da88c98034 Add comment. 2014-06-17 13:25:36 +02:00
Howaner
1086b8ba05 Revert "Fix right click bugs."
This reverts commit 61b6fdde75.
2014-06-17 01:18:09 +02:00
Tiger Wang
29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Tiger Wang
bfa8aaf41b Merge branch 'master' into portals
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
madmaxoft
28b82d5bbb Proper fix for long interaction.
Fixes #1078 and #1038.
2014-06-08 11:32:52 +02:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
worktycho
ae37dfec8d Fixed bad coordinate 2014-06-04 11:29:08 +01:00
Tiger Wang
5fc7592cba Merge remote-tracking branch 'origin/pistonfixes'
Conflicts:
	src/Chunk.cpp
2014-06-02 19:49:14 +01:00
Tiger Wang
8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
Howaner
421588d25d Fix fire break. 2014-05-28 16:59:51 +02:00
Howaner
61b6fdde75 Fix right click bugs. 2014-05-28 16:07:51 +02:00
archshift
c204735f38 ClientHandle.cpp: Process look before pos 2014-05-27 00:28:46 -07:00