flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
2,588 Commits 1 Branch 0 Tags
Commit Graph

1867 Commits

Author SHA1 Message Date
Tiger Wang
77468f87b7 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	source/Piston.cpp

Merge conflict?
 2013-08-14 12:03:13 +01:00
Tiger Wang
4ae1750da2 Alpha sorted PistonBreakable list 2013-08-14 11:50:21 +01:00
madmaxoft
b1a892bd9a Partially fixed tonibm19's mess. 2013-08-14 12:45:39 +02:00
Tiger Wang
303b1a9c45 Buncha bugfixes [SEE DESC] 
Fixed generation values not being written
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
Removed problematic piston code
 2013-08-14 11:44:02 +01:00
Tiger Wang
7803bde6b6 Merge pull request #85 from tigerw/master 
Fixed #57
 2013-08-14 03:36:16 -07:00
madmaxoft
c0629a9a6e Fixed player swimstate crash. 
The check for swimming / submersion checks the Y coord first. Fixes #63.
 2013-08-14 10:33:26 +02:00
madmaxoft
8c3837987b Player counts are now properly handled. 
Fixes #80
 2013-08-14 10:24:34 +02:00
madmaxoft
b65a91dde3 Exported cWorld:BroadcastChat() to the Lua API; used in the Core. 2013-08-13 23:10:59 +02:00
madmaxoft
af645c62c9 Merge branch 'master' into PerWorldThreads. 
Also fixed the AllToLua script not resolving conflicts.
 2013-08-13 23:02:22 +02:00
madmaxoft
9020dc9932 Clients are now ticked in cServer first, then in cWorld once they get assigned a world. 2013-08-13 22:45:29 +02:00
Tiger Wang
020ff36af2 YET ANOTHER ERROR >:( 2013-08-13 17:45:40 +01:00
Tiger Wang
27b400adf8 Credits 2013-08-13 17:44:01 +01:00
Tiger Wang
dd6450c2a9 Attempt three 
This is extremely embarrassing...
 2013-08-13 17:41:50 +01:00
Tiger Wang
a322bb275f Attempt two 2013-08-13 16:47:44 +01:00
Tiger Wang
2b0541ab39 Attempt at fixing sleep issue 2013-08-13 16:42:02 +01:00
Tiger Wang
23a5fb1450 Removed more comments 2013-08-13 16:36:19 +01:00
Tiger Wang
9ec248eaa0 Fixes #57 2013-08-13 16:34:26 +01:00
madmaxoft
27d0c9aef2 Fixed logging into debug console. 
Was missing the LF at the end.
 2013-08-12 14:47:08 +02:00
STRWarrior
9ad3c52593 Keep players from taking damage when teleporting. 2013-08-12 02:52:32 -07:00
STRWarrior
83d3635e0b Added quartz stairs. 2013-08-12 02:31:02 -07:00
madmaxoft
90ef9cfe97 Fixed logging into debug console. 
Was missing the LF at the end.
 2013-08-12 08:42:18 +02:00
madmaxoft
c628ab03e9 Removed cServer::BroadcastChat() and cServer::SendMessage(). 
These two functions make it difficult to move to the new ticking system, and they aren't used anyway. If so required, they can be emulated by ForEachWorld / ForEachPlayer calls.
 2013-08-12 08:35:13 +02:00
madmaxoft
6914bf4c65 Removed unused cServer::IsConnected() function. 2013-08-12 07:55:53 +02:00
madmaxoft
79ece8eb0d Merge branch 'master' into PerWorldThreads 2013-08-12 07:46:41 +02:00
Tiger Wang
d23b8e0c7c Merge pull request #77 from tonibm19/patch-1 
Now Endermans spawn in The End
 2013-08-11 14:38:31 -07:00
Tiger Wang
b48651a034 Really removed comments this time 2013-08-11 21:08:20 +01:00
tonibm19
67351d7d7b Now Endermans spawn in The End 2013-08-11 21:54:39 +02:00
Tiger Wang
1599d607d1 Merge pull request #74 from tigerw/master 
Further attempt at fixing torch placements
 2013-08-11 12:44:54 -07:00
madmaxoft
829cc866cd Added cWorld:QueueSaveAllChunks() function for saving chunks asynchronously. 
The cWorld:SaveAllChunks() is therefore deprecated in the API and will be removed soon, use QueueSaveAllChunks() instead.
 2013-08-11 21:05:44 +02:00
madmaxoft
ac9224da91 cIsThread threads get a window identification on Win. 
This enables tools such as TaskInfo to report the thread name directly.
 2013-08-11 20:22:42 +02:00
madmaxoft
4c5590636c Each world now ticks in a separate thread. 2013-08-11 20:16:41 +02:00
madmaxoft
c59d80a2af Removed cServer::m_pState, dissolved into direct member variables. 
The server tick thread is now in the cServer::cTickThread object.
 2013-08-11 19:46:27 +02:00
madmaxoft
2baa6634ec cIsThread: Added the Stop() method and debugging output in Wait() 2013-08-11 19:40:15 +02:00
madmaxoft
eb9d45e906 Moved MaxPlayers and Description from cWorld to cServer. 
Also started creating a new cWorld::cTickThread class, but not used yet.
 2013-08-11 19:18:06 +02:00
madmaxoft
b58ca60815 Added doxyComments for cIsThread. 2013-08-11 18:46:49 +02:00
Tiger Wang
93f5a4388c Removed unneeded case clause 2013-08-11 15:21:31 +01:00
madmaxoft
dd60f55bcc Added the OnHopperPullingItem and OnHopperPushingItem hooks. 
Requested in FS 412, slightly modified the params.
 2013-08-11 14:57:07 +02:00
madmaxoft
d97b4463c6 Added an AllowEmptyStacks param to cItemGrid::HowManyCanFit(). 2013-08-11 14:54:45 +02:00
Tiger Wang
e7ecd78312 Tried adding bracket 2013-08-11 12:08:09 +01:00
Tiger Wang
baae26ab22 Further attempt at fixing torch placements 
Also fixed block on flower placement. #71
 2013-08-11 11:58:57 +01:00
madmaxoft
deeb3a15dc Added OnPlayerAnimation() hook. 
Initial patch by @STR_Warrior, updated to account for different animation packets.
 2013-08-11 12:29:05 +02:00
Tiger Wang
7e288850b1 Attempt at fixing torch placement 
Attempt at fixing #71 and placement of torches.
 2013-08-10 21:32:50 +01:00
Alexander Harkness
7d6bde3d93 Added back the required extra line in player.cpp 2013-08-10 17:40:52 +01:00
Tiger Wang
b999b27e05 Removed extra disconnect message 
There seems to be already one in the HandleDisconnect hook function.
 2013-08-10 17:09:14 +01:00
Tiger Wang
7035dbd7f1 Deleting cPlayer now does LOGD instead of LOG 
Hopefully only prints in debug the debug message!
 2013-08-10 16:59:48 +01:00
Alexander Harkness
e508e09753 Merge pull request #56 from mc-server/LinuxColorConsole 
Linux color console
 2013-08-10 04:40:38 -07:00
madmaxoft
15f80e0811 Linux color redirection fixed. 
Outputting to stdin, yeah, right, that's gonna work :P
 2013-08-10 13:07:49 +02:00
madmaxoft
19781ecad5 Coloring is reset before the LF. 2013-08-10 13:03:05 +02:00
madmaxoft
9794496571 Another Linux compilation fix. 2013-08-10 12:51:57 +02:00
madmaxoft
211a8395d4 Fixed Linux build. 2013-08-10 12:50:23 +02:00