flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity
7,469 Commits 1 Branch 0 Tags 92 MiB
Commit Graph

7469 Commits

Author SHA1 Message Date
Mattes D bcb839d07b Merged branch 'master' of git://github.com/sriehl/MCServer 2014-10-21 18:12:40 +02:00
Tiger Wang bc97399b01 Updated ProtectionAreas 2014-10-21 13:44:33 +01:00
Mattes D dc4185fb86 cLuaState: cEntity is pushed with specific type. 2014-10-21 12:43:06 +02:00
Mattes D ac80f62650 Updated the Core. 2014-10-20 20:23:38 +02:00
Mattes D d79d5945e3 InfoDump: Do not crash if one plugin fails to load. 
If there's a syntax error in one plugin's Info.lua file, report the error and continue processing.
 2014-10-20 20:14:00 +02:00
Alexander Harkness b025bb63c2 Merge pull request #1554 from SphinxC0re/master 
Fixed #1550
 2014-10-20 18:49:16 +01:00
Julian Laubstein 48470c858b Fixed #1550 2014-10-20 19:36:16 +02:00
Mattes D b78078a3a6 Fixed a potential crash in cEntity bindings. 2014-10-20 17:32:09 +02:00
Alexander Harkness 1f301d7560 Merge pull request #1553 from SphinxC0re/work 
Fix for fix #1552
 2014-10-20 15:15:59 +01:00
Julian Laubstein 4a58ce1df6 Found it! 2014-10-20 16:00:33 +02:00
Julian Laubstein d2cc1e0cd3 Fix for fix #1552 2014-10-20 15:58:08 +02:00
Alexander Harkness bf8de85fd6 Merge pull request #1552 from SphinxC0re/master 
Added error handling to load <plugin> command
 2014-10-20 14:34:19 +01:00
Julian Laubstein c2560cc1be Added error message 2014-10-20 15:08:48 +02:00
Julian Laubstein 1a46feda43 Added error handling to load <plugin> command 2014-10-20 14:46:24 +02:00
Mattes D 8fbd65e775 Merge pull request #1549 from SphinxC0re/master 
Added mechanics placeable on halfslabs
 2014-10-19 19:13:48 +02:00
Mattes D ee23fd5b9e Removed obsolete tr1::shared_ptr. 2014-10-19 18:52:24 +02:00
Mattes D cf73fee7e3 Fixed minor style issues. 2014-10-19 18:45:42 +02:00
Mattes D 262e6d06aa TwoLevel BioGen: fixed swapped inside and outside biomes. 2014-10-19 16:07:29 +02:00
Julian Laubstein 3082f0d046 Fixed error with non-const function 2014-10-19 15:11:53 +02:00
Julian Laubstein 403f8581cf Added mechanics placeable on halfslabs 2014-10-19 15:01:01 +02:00
Mattes D 3ee47df118 Mountain height gen: Added ditches. 2014-10-19 14:35:49 +02:00
Mattes D e0cfbc4d85 Generator: Rewritten to use SharedPtrs. 2014-10-19 14:01:59 +02:00
Mattes D d50bbf3899 cLuaState: cMonster descendants don't push their specific type. 
The individual mob types aren't exported to Lua, so pushing them would crash the server.
 2014-10-19 12:49:54 +02:00
Mattes D b0a59927fb cLuaState: cBlockEntity descendants are pushed with proper class type. 2014-10-19 12:46:25 +02:00
Mattes D ebd31ff132 LuaState: Pushing a cEntity pushes the correct class name. 
This makes Lua scripts easier, as they don't need to cast values from cEntity to the specific descendant.
 2014-10-19 11:46:38 +02:00
Mattes D fe153cc763 Bindings: Removed obsolete codegen files. 
LuaState_Call.inc is no longer needed, it was replaced with variadic templates.
 2014-10-19 11:32:17 +02:00
Tiger Wang 2874bf73be Merge pull request #1502 from mc-server/furnaces 
Improved furnaces
 2014-10-18 21:33:55 +01:00
Tiger Wang eb821ff240 Fixed failure for cRankManager to restart 2014-10-18 19:55:01 +01:00
Tiger Wang 6a22b63473 Furnaces now update their block entity type 
Therefore improving cChunk's variable boundary checking.
 2014-10-18 19:54:34 +01:00
Mattes D 5d43dc0f45 InfoDump: Fixed trailing whitespace. 2014-10-18 20:53:58 +02:00
Mattes D e2c1b86839 InfoDump: Fixed GH permission export, moved output to plugins. 2014-10-18 20:51:28 +02:00
Alexander Harkness f280c36f9d Simpler code. 2014-10-18 16:12:12 +01:00
Mattes D 687752241f cMojangAPI: Don't update data if server is in offline mode. 2014-10-17 13:57:18 +02:00
Mattes D 803666d480 LuaChunkStay: Fixed a crash on unused callback. 2014-10-17 13:17:56 +02:00
Alexander Harkness 59902c28f2 Nullptr? 2014-10-16 20:21:33 +01:00
Mattes D 8c2a99711e Merged branch 'fix_chunks'. 2014-10-16 21:12:26 +02:00
Alexander Harkness 818c7948b7 Fixed a number of stylistic issues. 2014-10-16 19:08:22 +01:00
Mattes D 5b9ca4a7b4 Merge pull request #1541 from mc-server/VariadicTemplates 
cLuaState::Call() uses variadic templates
 2014-10-16 18:47:11 +02:00
worktycho 25ebedbe45 Use universal references 2014-10-16 15:11:35 +01:00
Mattes D 3d05b46c60 Merge pull request #1539 from mc-server/DungeonLoot 
Added loot to dungeons.
 2014-10-16 12:28:53 +02:00
STRWarrior 132a92226b Merge branch 'master' into DungeonLoot 
Conflicts:
	src/ItemGrid.cpp
 2014-10-16 11:43:59 +02:00
STRWarrior 07b5ce0c54 Changed i variable to j 
The server wasn't going over all the items before.
 2014-10-16 11:17:39 +02:00
Mattes D 799ae87d3f BioGen: Fixed a compiler warning. 2014-10-16 11:00:30 +02:00
STRWarrior 5ed6d280ce Reversed wrong fix for #1517. 2014-10-16 10:26:17 +02:00
Mattes D fdd20e2a99 Merge pull request #1537 from mc-server/GenerationCrash 
Fixed possible crash
 2014-10-16 10:17:57 +02:00
STRWarrior 3f0d4fe250 Reversed the order of the loot 
For some reason the rare items weren't generating at all.
Added forgotten Golden Apple
 2014-10-15 22:10:14 +02:00
STRWarrior 08676128b0 Added loot to dungeons. 2014-10-15 21:15:12 +02:00
STRWarrior 0bdd2768ff Fixed possible crash 
It could crash if MinAmount - MaxAmount was 0 because it would execute (Number % 0)
 2014-10-15 19:46:43 +02:00
Mattes D 06b466471f Merge pull request #1536 from mc-server/MineshaftBooks 
Mineshaft books
 2014-10-15 19:23:53 +02:00
Mattes D f58d44ea50 cLuaState::Call() uses variadic templates. 
(doesn't compile)
 2014-10-15 19:18:23 +02:00