flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
4,001 Commits 1 Branch 0 Tags 92 MiB
8180b643ff
Commit Graph

765 Commits

Author SHA1 Message Date
Tiger Wang
161a1c7274 Fixed mobs too close to player not ticking 
A condition would never be fulfilled. A number squared was compared to
-1, but there is nothing that, multiplied by itself, gives -1.
 2014-01-24 19:54:13 +00:00
Tiger Wang
3e675f8c38 Implemented creeper abilities 
* Creepers now explode with a sound effect
* Creepers drop a music disc on the unlikely event of being killed by a
skeleton's arrow

Inspired by @maniak89's PR #132.
 2014-01-24 19:52:52 +00:00
Tiger Wang
2ce26574ef Removed unused ReferenceManager 2014-01-24 19:46:45 +00:00
Tiger Wang
f39daabf7e Added more minecart powered rail directions 2014-01-24 19:39:39 +00:00
madmaxoft
e75f979e01 Fixed Win nightbuilds not producing PDBs. 2014-01-24 10:24:24 +01:00
madmaxoft
0369c585fb Fixed a few compile-time and runtime warnings in ScoreboardSerializer. 2014-01-24 09:58:40 +01:00
madmaxoft
b02940209d Fixed crash with failed entity-loading. 
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
 2014-01-24 09:57:12 +01:00
madmaxoft
8a254faaf7 Merge remote-tracking branch 'MikeHunsinger/master' 2014-01-24 08:55:41 +01:00
madmaxoft
22d101034f Fixed flint&steel failure on the Y world edges. 2014-01-24 08:53:49 +01:00
Mike Hunsinger
7c12247263 Fixed indentation once and for all. 2014-01-23 20:11:10 -07:00
Mike Hunsinger
9926ea58e8 Fixed indentation and doxygen comments... For real this time. 2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b Fixed spacing and doxycomments. 2014-01-23 19:54:00 -07:00
madmaxoft
98976de071 Merge branch 'master' into ChangeToPolarSSL. 2014-01-23 23:46:51 +01:00
madmaxoft
e251e52673 Fixed a warning in ScoreboardSerializer. 2014-01-23 23:45:28 +01:00
madmaxoft
5f34c78091 PolarSSL is fully used for 1.3.2 protocol encryption. 2014-01-23 23:35:23 +01:00
Mattes D
0e10120fc7 Merge pull request #580 from xdot/master 
Fixed scoreboard serialization
 2014-01-23 13:37:20 -08:00
Tycho
b95e005d91 Make clean now effects Bindings 2014-01-23 11:06:42 -08:00
andrew
b21b682d85 Fixed 1.5.x scoreboard packet IDs 2014-01-23 21:06:05 +02:00
Tycho
ce2fb844aa Removed Bindings folder subcmake on *nix 2014-01-23 11:03:49 -08:00
Tycho
27d1d5d491 Bugfixes 2014-01-23 11:00:36 -08:00
Tycho
e0956be0a7 added dependecies for bindings regen 2014-01-23 10:41:08 -08:00
Tycho
7419579140 Switched cEvent to use strerror_r for error messages 2014-01-23 10:25:56 -08:00
madmaxoft
9774da8122 Fixed a bug in LeakFinder. 2014-01-23 17:54:38 +01:00
madmaxoft
435eae3858 Fixed crash while calling disabled plugins. 2014-01-23 16:14:00 +01:00
andrew
5c04e216eb Fixed scoreboard.dat structure 2014-01-23 16:42:01 +02:00
andrew
bafa0347a3 Fixed scoreboard serialization 2014-01-23 16:27:23 +02:00
Mattes D
9ae31d913c Improved code safety for the Compact world storage. 
That was a huge chunk of smelly code.
 2014-01-23 14:21:56 +01:00
Mattes D
97ee3340e3 Minor style improvements for the merged PR. 2014-01-23 14:14:33 +01:00
Mattes D
0526ed327c Merge remote-tracking branch 'xdot/master' 
* xdot/master:
  Command block fixes 2
 2014-01-23 14:06:05 +01:00
andrew
4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02:00
Mike Hunsinger
00d7317746 Removed extra line 2014-01-23 00:53:00 -07:00
Mike Hunsinger
41b05416c7 Split TossItem into three Toss functions (Held, Equipped and Pickup) 2014-01-23 00:27:39 -07:00
madmaxoft
eb9bebf755 Replacing CryptoPP with PolarSSL. 
This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet.
 2014-01-22 22:19:33 +01:00
madmaxoft
3b96fc1e54 Authenticator: Reduced logging levels. 2014-01-22 22:06:48 +01:00
Tycho
5ef0a00a6c Fixed spelling error 2014-01-22 10:39:09 -08:00
Tycho
571200019d Added manual bindings for moved functions 2014-01-22 10:35:36 -08:00
Tycho
1c320fa18c formatting changes 2014-01-22 10:13:41 -08:00
Tycho
c832fbeb8e Merge branch 'master' into GeneratingBenchmark 
Conflicts:
	src/World.h
 2014-01-22 09:13:12 -08:00
tonibm19
d59a0156ce Fixed compilation on VC2008 2014-01-22 16:58:25 +01:00
Mattes D
26586fdb92 Merge pull request #566 from xdot/master 
Scoreboard
 2014-01-22 06:05:17 -08:00
andrew
dd04f5a73c cWorld now saves/loads the scoreboard 2014-01-22 15:49:21 +02:00
madmaxoft
2a018cfa49 Implemented cPluginManager:CallPlugin() API. 
This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all.
 2014-01-21 23:00:35 +01:00
andrew
9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew
fa4750f015 Scoreboard SendTo() 2014-01-21 19:43:13 +02:00
andrew
aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
Alexander Harkness
9c93ab15ab Fix a crash but somewhere... 2014-01-20 19:02:37 +00:00
Tycho
ca3389231e Actually implemented interfaces 2014-01-20 10:15:19 -08:00
Tycho
4f09e8df6e Moved Schematic file methods to seperate class 2014-01-20 09:59:12 -08:00
Tycho
613f238ab6 Merge branch 'ForEachChunkProvider' into GeneratingBenchmark 
Conflicts:
	src/World.h
 2014-01-20 09:37:31 -08:00
Tycho
16375f6aad Merge branch 'master' into GeneratingBenchmark 
this merge is necessary,
 2014-01-20 09:21:47 -08:00
Tycho
9bb61e6e2e Seperated BlockArea From World 
If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
 2014-01-20 09:17:24 -08:00
andrew
ff2302ebd5 Scoreboard serialization 2014-01-20 16:45:40 +02:00
andrew
7728f4bcbe Scoreboard deserialization 2014-01-20 16:10:39 +02:00
madmaxoft
41618bf242 Changed the cWorld::ScheduleTask() signature. 
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
 2014-01-19 23:49:19 +01:00
madmaxoft
4a01879911 cLuaState can now check function params. 2014-01-19 23:45:26 +01:00
Mattes D
865016abe2 Merge pull request #569 from worktycho/EnchantmentsFix 
Enchantments fix
 2014-01-19 13:50:50 -08:00
Mattes D
fde8b0be60 Merge pull request #565 from mc-server/commandblockfixes 
Command block fixes
 2014-01-19 13:47:52 -08:00
Tycho
bd4278aca1 Added Inifile and OSSupport Linking 2014-01-19 12:51:23 -08:00
Tiger Wang
e4c3d799ff Removed unneeded paramters 2014-01-19 19:42:25 +00:00
Tiger Wang
83cbe8c139 Begin implementing ascending rails 2014-01-19 19:31:17 +00:00
Tiger Wang
3700ad8546 Added one more direction into collision checks 
* Added direction XM_XP
* Improved performance, thanks STR and xoft
 2014-01-19 18:42:05 +00:00
madmaxoft
3c0e8c8da0 Rewritten SocketThreads for proper shutdown scenario. 
This fixes #560 and #390.
 2014-01-19 19:31:43 +01:00
Tiger Wang
9a580146e4 Minecart improvements and fixes 
* Fixed curved rails
* Fixed detector rails in certain situations
* Fixed powered rails and others passing bad meta to SnapToRail()
 2014-01-19 18:27:06 +00:00
Tiger Wang
fc622ce194 Fixed weird meta with curved rails 2014-01-19 18:24:56 +00:00
Tycho
f13a14d2cf Switched EnchantmentSerilizer to namespace 2014-01-19 08:52:45 -08:00
Mattes D
6976735a53 Merge pull request #551 from worktycho/schedular 
Implemented xoft's suggestion for a saturating counter in the scheduler
 2014-01-19 07:46:34 -08:00
Tycho
e14ddff1c0 Spilt Writing of Enchantments to seperate class 
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
 2014-01-19 07:38:59 -08:00
madmaxoft
dc70d04cdd SocketThreads: Removed unused code. 2014-01-19 16:15:56 +01:00
Tiger Wang
8467f5dfae Added more rail functionality 2014-01-19 14:52:45 +00:00
andrew
f321b5d224 Scoreboard improvements 2014-01-19 16:02:37 +02:00
Tiger Wang
82b2290b74 Merge remote-tracking branch 'origin/master' into minecartimprovements 2014-01-19 13:55:22 +00:00
Tiger Wang
1af89a8b50 Changed SendBlockEntity format slightly 
* Writing NBT is now in Protocol, not BlockEntity files
* Fixed a last output bug
 2014-01-19 13:25:35 +00:00
andrew
2b94361059 Basic scoreboard implementation 2014-01-19 14:20:57 +02:00
Mattes D
972585363d Merge pull request #559 from mc-server/SpawnMobParticles 
Removed the particles when a mob spawns.
 2014-01-18 23:23:53 -08:00
Tiger Wang
a85b2897e0 Implemented MC|Brand response 2014-01-19 01:06:19 +00:00
Tiger Wang
f8c8dcc7f3 Improved command blocks 
* Their command and previous output are displayed on the client
* They have a BlockHandler implementation, so you can't place blocks on
them anymore
+ As a side effect, implemented UpdateBlockEntity
 2014-01-19 00:54:38 +00:00
STRWarrior
24df625fbd Exported cFloater to the Lua API. 2014-01-19 00:04:46 +01:00
STRWarrior
7153bc0578 Fixed compiler error. 2014-01-18 23:42:48 +01:00
Tiger Wang
ddd03a050b Minecart collision and general improvements 
+ Implemented collision on one type of rail
* Improved curved rails somewhat
* Fixed a crash bug
 2014-01-18 20:58:26 +00:00
Mattes D
36b9d42819 Merge pull request #557 from xdot/master 
Command blocks
 2014-01-18 11:39:42 -08:00
andrew
a037172465 Command block fixes 2014-01-18 21:27:54 +02:00
madmaxoft
fab726282c HTTP connections aren't kept alive unless explicitly enabled. 
Only the client can decide that the connection can be kept alive, we must close the socket if the client doesn't indicate keepalive support.
This will provide a fix for #390 when #560 is fixed; until then the issue remains, just it's no longer HTTPServer's fault.
 2014-01-18 20:20:56 +01:00
Tycho
d93a4362b4 Fixed iterators bug 2014-01-18 10:57:25 -08:00
STRWarrior
1cced1664f Removed the particles when a mob spawns. 2014-01-18 19:41:31 +01:00
andrew
992053b32a Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-18 20:38:02 +02:00
andrew
02c9aa2b1e Parse the MC|AdvCdm plugin message 2014-01-18 19:58:46 +02:00
madmaxoft
e68521deac Alpha-sorted the finishers. 2014-01-18 17:03:43 +01:00
madmaxoft
896f1a26ec Merged branch 'NetherFinish'. 2014-01-18 17:03:31 +01:00
andrew
1ad6469a18 Command blocks: Execute() 2014-01-18 16:59:33 +02:00
Tycho
160a27cced switched to using m_WorldAge rather than m_TickID 2014-01-18 06:15:33 -08:00
andrew
be5299350a Command block (de)serialization 2014-01-18 15:40:47 +02:00
STRWarrior
188cb1f6bc Fixed errors. 2014-01-18 14:17:26 +01:00
andrew
9a9b51a513 Basic command block implementation 2014-01-18 15:16:47 +02:00
STRWarrior
ca27f87272 Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's 2014-01-18 14:16:07 +01:00
STRWarrior
dd7c02bba9 Some tweaks. 
Everything generates more often.
Fire can only spawn on ForeverBurning blocks.
 2014-01-18 13:45:41 +01:00
STRWarrior
087d650aed Fixed bug where only brown mushrooms would spawn. 2014-01-18 00:37:21 +01:00
STRWarrior
9f17c9799b It now actualy works. 2014-01-18 00:27:13 +01:00
Mattes D
9aca5b4b99 Merge pull request #552 from worktycho/c++11 
Changed std to c++11 in clang to fix va_copy issues
 2014-01-17 13:59:58 -08:00
STRWarrior
7c787de261 First attempt at creating a clumb version NetherFinisher. 2014-01-17 22:58:01 +01:00
Tycho
a54cbba0fd Added user setting compression factor 2014-01-17 11:01:14 -08:00
Tycho
287144839e Increased tick count to long 2014-01-17 10:23:40 -08:00
Tycho
80f2f21f4c Changed std to c++11 in clang to fix va_copy issues 2014-01-17 10:10:31 -08:00
Tycho
ce030bc7c9 Implemented xsofts suggestion for a saturating counter in the scheduler 2014-01-17 10:07:33 -08:00
Mattes D
79c1f6f438 Merge pull request #534 from mc-server/SpawnMinecart 
Added cWorld::SpawnMinecart.
 2014-01-17 02:27:56 -08:00
madmaxoft
2354ac2783 Fixed SIGABRT_COMPAT on other architectures. 2014-01-17 11:13:35 +01:00
madmaxoft
aec5200893 Removed internal cEntity::GetRot() usage. 2014-01-17 11:11:17 +01:00
madmaxoft
ed1d336614 Merge remote-tracking branch 'origin/customnames' 2014-01-17 10:44:23 +01:00
madmaxoft
3a1c0f2aef Protocol 1.7: More output on unknown packets / protocol states. 2014-01-17 10:12:27 +01:00
Tiger Wang
7ecf50c309 Fixed block break packet number 2014-01-16 22:42:47 +00:00
Tiger Wang
d675173b80 Changed newline character because of issues 2014-01-16 22:30:57 +00:00
Tiger Wang
952c53eb4e Removed CustomCopy() 2014-01-16 21:41:55 +00:00
Tiger Wang
590a8c45c5 Really did what xoft wanted 2014-01-16 21:41:08 +00:00
Tiger Wang
d3bc92c65d Fixed #535 2014-01-16 21:51:30 +01:00
madmaxoft
4da8818291 Fixed SIGPIPE on cSocket::Send(). 2014-01-16 21:08:17 +01:00
Tiger Wang
7eb3cabd19 Fixed #535 2014-01-16 19:55:21 +00:00
madmaxoft
a085319455 Protocol 1.7: Unknown packets are dumped to log in Debug mode. 2014-01-16 20:39:59 +01:00
madmaxoft
de4ac55398 Disabled excessive entity-related logging in Debug mode. 2014-01-16 20:31:06 +01:00
madmaxoft
c44ce84497 Fixed whitespace in previous commit. 2014-01-16 20:30:25 +01:00
Tiger Wang
74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
madmaxoft
343136a2ae Finished exporting cWorld:ScheduleTask() to Lua API. 2014-01-16 19:56:08 +01:00
Tiger Wang
5d03e49c13 Possibly did what xoft wanted 2014-01-16 18:44:11 +00:00
Tiger Wang
3373daca26 Merge remote-tracking branch 'origin/master' into customnames 2014-01-16 18:37:46 +00:00
madmaxoft
dab37db562 CMake: Fixed output paths for all MSVC versions. 2014-01-16 18:33:28 +01:00
STRWarrior
ca835a0565 Changed GetContent function. 2014-01-16 16:54:22 +01:00
madmaxoft
e29749b35e Added packet diagnostics to 1.7 protocol. 
When the packet is mis-interpreted, a log message is output about the packet type and lengths.
 2014-01-16 15:26:58 +01:00
madmaxoft
6f739359e3 Yet another attempt at VarArgs. 2014-01-16 09:01:12 +01:00
madmaxoft
ba49a32c3a Another VarArgs fix. 
This time using va_copy() on platforms that have it and simple assignment on platforms that don't.
 2014-01-16 08:34:10 +01:00
Tiger Wang
f3baf31563 OBSOLETE'd obsolete functions 2014-01-15 22:38:15 +00:00
Tiger Wang
fcafd5a2e0 Implemented custom names and lore 
+ Added custom names and lore
+ Added saving and loading
+ Added writing and parsing of NBT
 2014-01-15 22:38:03 +00:00
Tiger Wang
3c31f2d8d8 Implemented Ctrl-Q drop stack 
Also fixed an issue with TossItems not respecting count.
 2014-01-15 22:36:19 +00:00
madmaxoft
dd6c5779ec Using a 2nd argument instead of va_copy(). 
This seems to be the only reasonable C++03-only solution.
 2014-01-15 18:28:51 +01:00
madmaxoft
3fd19df9fd Fixed varargs modification. 
Ref.: #541.
 2014-01-15 17:46:29 +01:00
STRWarrior
72dcd70f22 Furnace minecarts now stop being active after a while. 2014-01-15 14:38:54 +01:00
STRWarrior
bdfe31f917 First implementation for furnace minecarts. 2014-01-15 14:03:09 +01:00
Mattes D
eb89de4c88 Merge pull request #542 from worktycho/schedular 
added cWorld::ScheduleTask Function
 2014-01-15 02:45:25 -08:00
Mattes D
457e93f1ed Merge pull request #538 from mc-server/minecarts 
Minecarts
 2014-01-15 02:42:24 -08:00
Tycho
292ccdc09e added cWorld::ScheduleTask Function 
ScheduleTask schedules a SceduledTask object to be run x ticks in the future.
In is exported to lua, fixes #150
 2014-01-14 12:17:03 -08:00
Tiger Wang
e3b839b69f Yes newline at end of file :D 2014-01-14 18:16:13 +00:00
madmaxoft
b263d55a2d CMake: Added postfix for profiled exe 2014-01-14 09:32:43 +01:00
Tiger Wang
a66e154b90 Final improvements to Minecarts 
* Fixed curved rails being a little broken
+ Implemented detector rails
+ Implemented block collisions on rails
* Fixed snapping to rail
- Removed minecart physics conditions in Entity.cpp as minecarts use
their own simulator when on rails

Fixes #148 and #217; partially implemented #215.

This is Cave Johnson, and we're done here.
 2014-01-13 22:37:09 +00:00
madmaxoft
5407cec41c Removed shutdown() from socket closing. 
It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite.
Fixes #537.
 2014-01-13 20:54:58 +01:00
madmaxoft
ada54b79d7 Added handshake processing to protocol 1.7. 
This fixes #495
 2014-01-13 20:32:15 +01:00
madmaxoft
7e59296157 Generating the bindings outputs a message at the end. 2014-01-13 19:57:19 +01:00
madmaxoft
332c1c59eb cCreeper is no longer available in API. 
Has been replaced by cMonster.
 2014-01-13 17:25:16 +01:00
madmaxoft
0a3fae7c35 CMake: Removed leftover debugging output. 2014-01-13 17:22:01 +01:00
madmaxoft
89e641071e CMake: Added resources to windows projects. 2014-01-13 17:15:34 +01:00
madmaxoft
b9eb38a17f Added a generic .user file for MSVC. 
This brings in the default debugging settings for the MSVC project, when generated by CMake.
 2014-01-13 16:49:49 +01:00
Tiger Wang
edefa27a48 Detaching improvements 
* Players now search for an area around themselves to teleport to when
detaching from something
 2014-01-12 23:23:36 +00:00
Tiger Wang
1d81db6446 Fixed wire, rail, and pressure plate unpowering 2014-01-12 23:19:08 +00:00
STRWarrior
c7d556afaf Fixed server crash. 2014-01-12 18:15:54 +01:00