1
0
Commit Graph

3570 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
STRWarrior
4038e1cb42 Using C++11 loops 2014-10-15 18:11:28 +02:00
STRWarrior
fa6f8fb38e The code now prevents conflicting enchantments. 2014-10-15 15:44:52 +02:00
STRWarrior
0cdd2b64ed IntNoise1DInt result gets devided by 7 first
suggestion by xoft
2014-10-15 15:42:45 +02:00
STRWarrior
57f8d2a55e Adding enchantments directly instead of first getting the name of it. 2014-10-15 15:31:06 +02:00
STRWarrior
e4ee71868e Renamed the counter to 'j' 2014-10-15 15:25:48 +02:00
STRWarrior
ff5f57514e Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to before
Added cEnchantment:GenerateEnchantmentFromVector that allows to get the same enchantments over and over.
2014-10-15 14:44:07 +02:00
STRWarrior
e3aa6e4857 Enchanted books generate in MineShafts chests 2014-10-15 14:08:45 +02:00
Mattes D
c6725f8d28 Usernames are lowercased before generating offline UUID.
This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization.
2014-10-15 13:41:23 +02:00
Mattes D
7f8118e0cb cWorld: Fixed scheduler.
Fixes #1534.
Added a test case into the Debuggers plugin.
2014-10-13 14:49:18 +02:00
Mattes D
1eae7d0ece Fixed style. 2014-10-13 10:34:33 +02:00
Mattes D
120b347fb5 CheckBasicStyle ignores the Bindings.h generated file. 2014-10-13 10:33:08 +02:00
Mattes D
53410a9271 Merge pull request #1529 from mc-server/unique_ptr
Moved a few objects to unique_ptr
2014-10-12 22:08:28 +02:00
worktycho
fff9e50109 Aligned simulators 2014-10-12 12:44:59 +01:00
worktycho
daadde2077 Fix style 2014-10-12 12:18:52 +01:00
worktycho
6a448be88c Fix spaces 2014-10-12 12:17:29 +01:00
worktycho
8dfeb6e324 Update World.cpp 2014-10-12 12:15:52 +01:00
Steven Riehl
4a25760363 fix std:min call, include algorithm and compare same type 2014-10-11 21:36:40 -06:00
Steven Riehl
dfd4e15ecb refactor an if block to std::min 2014-10-11 21:18:57 -06:00
Steven Riehl
856764dee8 convert old style casts to fix warnings 2014-10-11 20:39:55 -06:00
Alexander Harkness
6af9d5ba01 Fixed compilation. 2014-10-11 18:39:46 +01:00
Alexander Harkness
93833069a8 Merge branch 'master' into issue850
Conflicts:
	src/BlockID.h
2014-10-11 18:32:21 +01:00
Alexander Harkness
68762747e0 Fixed typo and removed useless right side up slab meta. 2014-10-11 16:59:13 +01:00
worktycho
1a07dc897d Fix lambda capture 2014-10-11 14:43:06 +01:00
tycho
473c0425d3 Moved a few objects to unique_ptr 2014-10-10 15:33:19 +01:00
Mattes D
a47d9e5334 Fixed MSVC compilation. 2014-10-10 09:58:54 +02:00
archshift
76b37acb42 Float/Ciel: If it's going to use C++11, it might as well take advantage of it 2014-10-09 14:57:57 -07:00
archshift
f8d1e96ae7 Use static casts instead of C casts, add floor-cast functions 2014-10-09 14:57:40 -07:00
Mattes D
f91aa6f1d3 DistortedHeightmap: Fixed crash on number rounding.
Fixes #1521.
2014-10-09 12:33:42 +02:00
STRWarrior
e95ee55974 Added comments to the GetAcaciaTreeImage function 2014-10-08 21:32:09 +02:00
STRWarrior
36fa1c5c73 Using array with possible directions. 2014-10-08 21:25:59 +02:00
STRWarrior
68a54c90c9 Added AcaciaTrees for the savanna biomes 2014-10-08 20:31:16 +02:00
Howaner
97623fc634 Added distance check. 2014-10-07 21:36:01 +02:00
Howaner
7631047bb7 Leaves are harvest-able. 2014-10-07 18:24:22 +02:00
Howaner
a5e09155c0 Corrected drops from dead bush, tall grass and cobweb. 2014-10-07 18:21:39 +02:00
Howaner
e8e428a806 Corrected IsBlockAttachable() in BlockVine.h 2014-10-07 16:48:37 +02:00
Howaner
fec509935d Removed BlockHaybale.h from CMakeLists.txt 2014-10-07 15:39:24 +02:00
Howaner
e3a69a527d Removed unused cBlockHayBaleHandler. 2014-10-07 15:02:51 +02:00
Mattes D
2a32dd2740 Merge pull request #1513 from mc-server/MojangAPIRefresh
cMojangAPI: Added periodical refreshes.
2014-10-07 11:23:49 +02:00
Howaner
b493beb3bb Stream 4 chunks per tick. Added priority. 2014-10-06 21:27:53 +02:00
Howaner
a59f2d15fb Merge branch 'master' into ChunkLoader 2014-10-06 17:38:42 +02:00
Howaner
5a6b86180e Better StreamNextChunk() method 2014-10-06 17:38:17 +02:00
madmaxoft
4e82a58060 Fixed crash in ForEachEntityInBox API.
Fixes #1511.
2014-10-06 13:48:44 +02:00
Mattes D
3d2d8a096b cMojangAPI: Added periodical refreshes. 2014-10-06 10:05:02 +02:00
Mattes D
89713e23e4 Merge pull request #1510 from mc-server/TimedEvent
Added a cEvent::Wait() with timeout.
2014-10-06 09:24:51 +02:00
worktycho
a20bd0dbbd Update CMakeLists.txt 2014-10-05 23:44:55 +01:00
madmaxoft
c94e82980e Fixed a missed value. 2014-10-05 22:56:56 +02:00
madmaxoft
112fac5798 Removed obsolete cMonster::eType.
Has been replaced with global eMonsterType.
2014-10-05 22:12:25 +02:00
madmaxoft
77c5b410e6 Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02:00
Mattes D
a8aeceab9d cClientHandle: Added protocol version knowledge. 2014-10-05 20:19:21 +02:00
Mattes D
ec71ffcc80 Added a cEvent::Wait() with timeout. 2014-10-05 19:04:30 +02:00
win32re
f8c1da4a71 Fixes #1503 - No gravel is being generated 2014-10-04 14:02:40 +02:00
Mattes D
db98820aa9 Merge pull request #1489 from mc-server/fixes
Improved torch handler
2014-10-04 10:02:10 +02:00
Tiger Wang
79e9de8d67 Comment suggestions 2014-10-03 21:38:23 +01:00
Tiger Wang
b5a2c6667a Improved furnaces
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
Howaner
382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
Alexander Harkness
2f945475f2 Fix spelling of PRISMRAINE
Fixes #1497
2014-10-02 07:22:12 +01:00
Masy98
3591edd47e Fixed sorting 2014-10-01 19:26:36 +02:00
Masy98
d37b047ebe Merge branch 'master' into blocks 2014-10-01 19:23:43 +02:00
Masy98
0d2a041a69 Fixed Red Sandstone and Prismarine drops 2014-10-01 19:13:59 +02:00
Mattes D
ecef85574d Merge pull request #1493 from Masy98/blocks
Added missing 1.8 blocks, E_METAs and sounds
2014-10-01 18:28:07 +02:00
Masy98
1d875d0bc8 Added Daylight Sensors to the "can't push" list 2014-10-01 18:08:31 +02:00
Masy98
0f0763303e Fixed ":" 2014-10-01 18:00:51 +02:00
Masy98
cc9e598803 Added missing 1.8 blocks, E_METAs and sounds 2014-10-01 17:57:53 +02:00
madmaxoft
4789db5c28 cRoot: Removed useless variable from Lua API. 2014-10-01 17:28:45 +02:00
madmaxoft
fd11b574bd cPlayer: Removed useless functions from the Lua API. 2014-10-01 17:24:02 +02:00
madmaxoft
886a7d7bbb Bindings: Fixed binding for cPlayer::PermissionMatches(). 2014-10-01 12:59:31 +02:00
madmaxoft
901bed3989 Unified cRoot broadcast chat documentation. 2014-10-01 12:44:28 +02:00
madmaxoft
e65e0f1795 cClientHandle: Alpha-sorted the sending functions. 2014-10-01 12:14:38 +02:00
Mattes D
3ccda572b3 Merge pull request #1490 from mc-server/removecompact
Removed WSSCompact
2014-10-01 07:47:17 +02:00
Tiger Wang
9e4a5f824a Removed WSSCompact 2014-09-30 22:20:21 +01:00
Tiger Wang
48c99dcd2e Improved torch handler 2014-09-30 22:00:33 +01:00
Mattes D
1d185fe207 Merge pull request #1487 from mc-server/BlockFixes
Block fixes
2014-09-30 22:53:32 +02:00
Howaner
7d3016c7ad Code improvements 2014-09-30 20:59:59 +02:00
Mattes D
5de27e7edf Merge pull request #1485 from mc-server/PluginMessages
Rewritten plugin messages, vanilla's are being parsed directly.
2014-09-30 20:48:40 +02:00
Howaner
425df6b694 Fixed 1.8 dirt types 2014-09-30 20:31:27 +02:00
madmaxoft
e74510bddf Fixed a missing semicolon. 2014-09-30 20:27:20 +02:00
Howaner
83973520c8 Fixed iron trapdoors 2014-09-30 20:04:49 +02:00
Howaner
5111628ba5 Fixed 1.8 doors. 2014-09-30 19:49:42 +02:00
Mattes D
1531511bbe Merge pull request #1427 from mc-server/chestcarts
Implemented Chest Minecarts
2014-09-30 17:16:15 +02:00
Julian Laubstein
b77480b4ef Indentation 2014-09-30 14:05:23 +02:00
madmaxoft
d7066f43d3 Rewritten plugin messages, vanilla are being parsed directly.
This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
2014-09-30 13:33:57 +02:00
Julian Laubstein
b2cf4004f8 Set right indentation 2014-09-30 12:45:44 +02:00
Julian Laubstein
d731ad37b1 actual solving of the halfslap+torch problem 2014-09-30 12:43:48 +02:00
madmaxoft
33dc66a4d2 RankMgr: GetAllPlayers() returns players sorted by name. 2014-09-29 22:00:14 +02:00
madmaxoft
aae90c2cf0 Style fixes. 2014-09-29 21:38:11 +02:00
madmaxoft
30b083ed63 World: Fixed chunk generation by plugins.
ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue.
2014-09-29 21:34:15 +02:00
Alexander Harkness
bdb8d916c0 Fixed codestyle again. 2014-09-29 19:45:12 +01:00
Mattes D
d3c2c02b6b Merge pull request #1472 from mc-server/Ranks
Added more cRankManager functions
2014-09-29 20:39:13 +02:00
w00tc0d3
9628733df2 BlockStone.h: fix the codestyle 2014-09-29 19:19:17 +02:00
w00tc0d3
d5ae659da3 Tabs -> spaces 2014-09-29 17:35:30 +02:00
netchip
6127c21af9 BlockStone: drop the right cobblestone on onBreak().
Signed-off-by: netchip <w00tc0d3@outlook.com>
2014-09-29 17:18:20 +02:00
Howaner
ff3a3b801d Renamed GetAllPlayers() to GetAllPlayerUUIDs() 2014-09-29 14:43:16 +02:00
Howaner
347402d20d Merge branch 'master' into Ranks 2014-09-29 14:37:01 +02:00
Julian Laubstein
f014d8764b Update BlockTorch.h 2014-09-29 13:17:24 +02:00
Julian Laubstein
0b438b5fe8 Added torches placeable on upside-down-halfslaps 2014-09-29 13:12:50 +02:00
Mattes D
666aa1df94 Merge pull request #1473 from mc-server/NewStoneGeneration
Added Granite, Diorite and Andesite to the NaturalPatches generator.
2014-09-29 09:33:13 +02:00
Mattes D
a245213d81 Merge pull request #1478 from doublej472/master
Make endermen take damage in water
2014-09-29 08:08:14 +02:00
Jonathan Frederick
c02711633d Derp 2014-09-28 19:27:53 -07:00
Jonathan Frederick
7a61e1e604 Fix comments 2014-09-28 19:24:47 -07:00
madmaxoft
280831df26 Plugin messages: Vanilla prefixes its payloads with VarInt lengths. 2014-09-28 23:03:44 +02:00
Jonathan Frederick
126b14aa09 Make endermen take damage in water 2014-09-28 13:56:41 -07:00
madmaxoft
488c6159df Revert "1.8: Fixed plugin messages."
This reverts commit 04ee8c43dd.
2014-09-28 22:27:23 +02:00
madmaxoft
f8c627141a Protocol 1.8: Fixed possible crash on malformed packet. 2014-09-28 22:25:48 +02:00
madmaxoft
5a44be13b7 Fixed trailing whitespace. 2014-09-28 22:17:29 +02:00
STRWarrior
7c18681e09 Fixed compilation 2014-09-28 22:10:03 +02:00
Mattes D
1422176d13 Merge pull request #1471 from mc-server/redstoneData
Use factory method to construct redstone simulator data
2014-09-28 22:05:05 +02:00
Mattes D
8d55cd409e Merge pull request #1466 from mc-server/endofsupport
Removed protocols 1.2 to 1.6
2014-09-28 22:04:30 +02:00
STRWarrior
76e0c592ef Added Granite, Diorite and Andesite to the NaturalPatches generator. 2014-09-28 19:27:08 +02:00
Howaner
4391b3fc09 Fixed SetDefaultRank() return value. 2014-09-28 19:08:33 +02:00
worktycho
80fe8d7789 Update Chunk.cpp 2014-09-28 17:57:01 +01:00
Tycho
f6979642e6 Use factory method to construct redstone simulator data 2014-09-28 15:36:00 +01:00