flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,986 Commits 1 Branch 0 Tags 92 MiB
26a4845a99
Commit Graph

3116 Commits

Author SHA1 Message Date
madmaxoft
db663c7ee1 Fixed style. 2014-08-30 22:24:04 +02:00
madmaxoft
26b8471280 Merge branch 'master' into fixes 2014-08-30 22:17:49 +02:00
madmaxoft
fc7da22738 WSSAnvil: Removed leftover debugging code. 2014-08-30 22:11:52 +02:00
madmaxoft
b0a7d93ae1 Fixed MSVC2008 compilation. 
It was getting confused about which sqrt() overload to call.
 2014-08-30 22:11:09 +02:00
Howaner
3ee3a59e75 Changed the IsEnchantable() comment. 2014-08-30 15:06:43 +02:00
LO1ZB
ac95173e81 remove orphaned comment. 2014-08-30 00:45:05 +02:00
Jaume Aloy
4900645b28 Added a_Digger check 2014-08-30 00:27:33 +02:00
Mattes D
a2bee74a13 cChunk: Fixed the Coords param. 2014-08-29 23:21:58 +03:00
LO1ZB
5a6ef8b8e5 me being stupid 2014-08-29 20:27:58 +02:00
LO1ZB
e45a27add9 add comments 2014-08-29 20:26:19 +02:00
LO1ZB
75e1316386 fix chunk regenerating 2014-08-29 20:19:45 +02:00
Mattes D
22e3bbd0db Rewritten block entity loading. 
Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked.
The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't.
Fixes #1354.
 2014-08-29 19:19:47 +03:00
Tiger Wang
389614c959 A better hotfix for CraftingRecipies 2014-08-29 15:12:45 +01:00
Tiger Wang
431b7ed0b7 Merge branch 'master' of https://github.com/mc-server/MCServer 
Conflicts:
	src/Server.cpp
 2014-08-29 14:56:40 +01:00
Tiger Wang
618741f78e Added new console command with cleanup 2014-08-29 14:43:49 +01:00
Tiger Wang
21ff1d81ab Improved explosion damage 2014-08-29 13:44:10 +01:00
Tiger Wang
114b14faad Removed unused code 2014-08-29 13:44:01 +01:00
Tiger Wang
fca5a01145 Improved command block security 2014-08-29 13:41:50 +01:00
Mattes D
d0551e2e0a VanillaFluidSimulator: Fixed an invalid Y-coord query. 
This was causing a spam of console messages, along with possible server crash, when liquids passed below the world: http://forum.mc-server.org/showthread.php?tid=1508&pid=15632#pid15632
 2014-08-29 14:58:41 +03:00
Mattes D
97c4c057e4 Fixed conversion warning. 2014-08-29 11:20:33 +03:00
Mattes D
42570cbeef Fixed spaces. 2014-08-29 11:20:23 +03:00
Hownaer
c4d7f7996b Hotfixed recipe.txt loading. 2014-08-29 00:42:33 +02:00
Hownaer
4470ebffd7 Fire can be destroyed with the sword in creative-mode 2014-08-28 20:49:34 +02:00
Hownaer
c2260addf4 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-28 18:58:58 +02:00
Hownaer
eaf33e22cf Fixed anvil placing. 2014-08-28 18:57:56 +02:00
Hownaer
4ff34b9f10 APIDump: Added missing cItem things. 2014-08-28 18:18:21 +02:00
Mattes D
e931b649ac Merge pull request #1323 from mc-server/CraftingFixes 
Fixed a couple of issues in craftingRecipes.cpp
 2014-08-28 17:35:56 +03:00
Mattes D
1c136a6047 Fixed a typo. 2014-08-28 17:04:26 +03:00
Mattes D
d74e49ddc0 Final template keyword style fix. 2014-08-28 17:01:59 +03:00
Mattes D
0cc824d414 Merge pull request #1324 from ChriPiv/master 
Implement ability to push minecarts on curved rails
 2014-08-28 17:01:23 +03:00
Mattes D
271c8c0d32 More template keyword fixes. 2014-08-28 16:58:48 +03:00
Mattes D
52a6b30f32 Merge remote-tracking branch 'origin/master' into CraftingFixes 2014-08-28 16:53:36 +03:00
Mattes D
9b68ff2656 CheckBasicStyle: Added checking for the "template" keyword. 2014-08-28 16:53:26 +03:00
Mattes D
49ac6fadfc Fixed spaces after "template" keyword. 2014-08-28 16:44:36 +03:00
Hownaer
c0c4ac5236 Added comments. 2014-08-28 15:21:50 +02:00
Hownaer
f1470fcf9f Fixed bad values in the IsEnchantable() method. 2014-08-28 15:21:38 +02:00
Hownaer
6c3b80f04c Fixed crashes and use std::swap. 2014-08-28 14:58:03 +02:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Hownaer
0f1fd33123 Enchanting table improvements. 2014-08-28 01:21:54 +02:00
reiter
690e6cb6f8 Fixed mob burning. 
Fixes #1298
 2014-08-28 00:01:01 +02:00
Mattes D
e54c78923e DungeonRooms: Fixed an off-by-one error. 2014-08-27 20:55:28 +03:00
Mattes D
e54a7dc6c4 More basic style fixes. 2014-08-27 15:21:20 +03:00
Mattes D
d8527c5429 Fixed basic style violations. 2014-08-27 15:13:13 +03:00
Mattes D
bc44b96059 CheckBasicStyle: Relaxed the "space after comma". 
An apostrophe directly following a comma is not a violation.
 2014-08-27 15:12:49 +03:00
Mattes D
62e1c45ca5 DungeonRooms: Added a height probability distribution function. 2014-08-27 13:25:27 +03:00
Mattes D
c6beb9760b DungeonRooms: Added the spawner in the center of the room. 2014-08-27 08:12:26 +03:00
Mattes D
0c3c136c72 DungeonRooms: Chests are never placed next to each other. 2014-08-26 17:46:14 +03:00
Mattes D
a40f358064 DungeonRooms: Random pattern for floors. 2014-08-26 17:25:38 +03:00
Mattes D
2d569ce6dd DungeonRooms: Replaced explicit switch with CanBeTerraformed(). 2014-08-26 17:13:46 +03:00
Mattes D
98974412fa Merge remote-tracking branch 'origin/master' into DungeonRoomsFinisher 2014-08-26 17:09:16 +03:00
Mattes D
be32c0527c Merge pull request #1290 from mc-server/Ranks 
Rewriting permission system to use UUIDs and Ranks
 2014-08-26 15:23:21 +03:00
Mattes D
ac4d3a30ed Added initial dungeon rooms finisher. 2014-08-26 15:16:33 +03:00
Mattes D
bf16c5ed92 Type warning fixes. 2014-08-25 18:25:39 +03:00
Mattes D
8f20c359cd Fixed a type warning. 2014-08-25 07:28:45 +02:00
Mattes D
3977d53b83 RankMgr: Exported the default-rank functions. 2014-08-24 20:05:28 +02:00
Mattes D
8630b20c52 RankMgr: Default rank is applied to players without any rank. 2014-08-24 20:00:45 +02:00
Christophe Piveteau
a56634799e Change comment formatting 2014-08-24 15:03:02 +02:00
Mattes D
da67dd39ed RankMgr: Unified function signature comments in the bindings. 2014-08-23 17:56:23 +02:00
Alexander Harkness
d07134e621 Assume POWER is big-endian, so it compiles. 
[reference](http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros#POWER)

We may want to come back and figure out if the processor is running in little-endian mode, but for now assume they're big-endian.
 2014-08-23 16:06:34 +01:00
Mattes D
0daacd14d9 RankMgr: Implemented default rank, added defaults. 2014-08-23 03:44:04 +02:00
Howaner
8fa4ac9ad9 Fixed item drop. 
Fixes #1341
 2014-08-22 15:32:27 +02:00
Mattes D
e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Jaume Aloy
7d771953c0 More Enchantments 
- Added Thorns and Respiration enchantments
 2014-08-22 11:49:49 +02:00
Mattes D
33b5952532 Fixed a warning in FastRandom. 2014-08-22 11:12:44 +02:00
Mattes D
d2d63b8a05 World: Report chunk count for the spawn area. 2014-08-22 10:35:51 +02:00
Mattes D
2dfcd678c4 Fixed cPlugin::OnPlayerMoving signature. 2014-08-22 10:33:53 +02:00
Mattes D
51df169ad5 cLuaState: Fixed Vector3<> names pushed to Lua. 2014-08-22 10:33:15 +02:00
Mattes D
64fec204c4 Added initializers for class members. 
As reported by Coverity, these weren't initialized.
 2014-08-21 22:39:53 +02:00
Mattes D
4358421cd4 cSetChunkData: Added missing initializers. 2014-08-21 21:58:08 +02:00
Mattes D
81d238e080 Added cWorld initializers. 2014-08-21 21:53:25 +02:00
Mattes D
d471ee8a9d Fixed 1.7.2 login packet reading. 
Fixes #1317.
 2014-08-21 21:38:57 +02:00
Mattes D
c22261252f Sorted the generated param count. 2014-08-21 21:38:21 +02:00
Mattes D
1e5d770d7f Fixed a compile-time warning in MSVC. 2014-08-21 21:37:52 +02:00
Mattes D
0c04bf962e cMojangAPI updates cRankManager's playernames. 2014-08-21 20:47:52 +02:00
Mattes D
326dd7e4c6 RankMgr: Added cRankManager::RemovePlayerRank(). 2014-08-21 16:55:39 +02:00
Mattes D
263ea5464b Removed last remnant of cGroup. 2014-08-21 15:53:22 +02:00
Mattes D
b8d3ddb409 Removed Group.h from Bindings' dependencies. 2014-08-21 15:49:32 +02:00
Mattes D
8acc883187 Removed cGroup and cGroupManager. 2014-08-21 15:29:54 +02:00
Mattes D
936604ca95 cMojangAPI: Fixed MakeUUID___() bindings. 
ToLua would generate a shadow return value for the input strings.
 2014-08-21 15:19:30 +02:00
Jaume Aloy
19d1c976e7 Protection Enchantments, some fixes 
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
 2014-08-21 12:08:38 +02:00
Mattes D
bacfca7c20 Merge pull request #1314 from mc-server/Fire 
Fixed cancelled fire interact from all directions.
 2014-08-21 07:50:58 +02:00
STRWarrior
3a113e3a75 Merge pull request #1339 from mc-server/Hooks 
Added HOOK_SERVER_PING
 2014-08-20 22:57:48 +02:00
Howaner
f7774ec336 Merge branch 'master' into Fire 2014-08-20 22:25:05 +02:00
Howaner
4da61e67d7 Renamed a_Motd to a_ServerDescription. 2014-08-20 22:22:38 +02:00
Mattes D
2218f31cde Exported cServer:ShouldAuthenticate to Lua API. 2014-08-20 22:21:41 +02:00
Howaner
cf5ab14ca5 Added a_ClientHandle to the HOOK_SERVER_PING hook. 2014-08-20 22:19:50 +02:00
Mattes D
1b97e4e6ff cPlayer: Exported the LoadRank function to Lua API. 2014-08-20 20:37:51 +02:00
Mattes D
15a20b1d2a RankMgr bindings: fixed GetRankVisuals return value. 2014-08-20 18:09:13 +02:00
Mattes D
81979419ad RankMgr: Fixed an ignored return value in the API. 2014-08-20 17:56:30 +02:00
Howaner
cfdf39a75f Added "HOOK_SERVER_PING" call to older protocols 2014-08-20 16:12:05 +02:00
Howaner
2cca4d70c8 Cleaned up code. 2014-08-20 16:04:18 +02:00
Howaner
228dd61995 Added HOOK_SERVER_PING 2014-08-20 16:01:30 +02:00
Howaner
67fc19301e Removed old classes from the CMakeLists.txt 2014-08-20 12:14:56 +02:00
Howaner
b5ffe06f88 Code formatting fixes. 2014-08-19 22:14:37 +02:00
Jaume Aloy
5008eb8c83 Changed if in BlockHandler 2014-08-19 18:40:42 +02:00
Jaume Aloy
596203e692 Fixes 
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
 2014-08-19 17:57:32 +02:00
Mattes D
949aa2f383 cPlayer reads ranks from cRankManager. 2014-08-19 17:34:11 +02:00
Jaume Aloy
07350de514 Changed if for switch 2014-08-19 16:47:33 +02:00
Jaume Aloy
1897f678f9 Added more enchantments and some fixes 
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
 2014-08-19 16:08:17 +02:00
Jaume Aloy
d3fd63c9eb Added some Enchantments 
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
 2014-08-19 12:38:15 +02:00
Mattes D
e4fc05574b Player: Silenced a few type conversion warnings. 2014-08-18 22:48:15 +02:00
Christophe Piveteau
c70886a712 Adjust comment formatting 2014-08-18 01:57:44 +02:00
Mattes D
80559406f9 Player saving creates the "players" folder, if needed. 
Fixes #1268.
 2014-08-17 22:47:00 +02:00
STRWarrior
9522bd842e SwamplandM: Fixed sometimes having no mountains. 2014-08-18 12:53:36 +02:00
Howaner
a68c70c900 Better OnPlayerMoving hook. 2014-08-16 18:44:14 +02:00
Howaner
9395cf0bca First implementation of HOOK_SERVER_PING. 2014-08-16 18:02:16 +02:00
Christophe Piveteau
72c02ceb17 Added a lot of comments 2014-08-15 17:54:43 +02:00
Christophe Piveteau
c473d8cfb8 Clarify comment message 2014-08-15 14:00:51 +02:00
Christophe Piveteau
be03b84048 End of comment moved away from new line 2014-08-15 13:43:45 +02:00
Christophe Piveteau
0f631febfc Add some comments 2014-08-15 13:40:56 +02:00
Mattes D
e553d58eaf Merge pull request #1308 from mc-server/logger 
New Logging framework
 2014-08-15 07:20:37 +02:00
madmaxoft
1f4a1383c2 Removed an unneeded cast. 2014-08-15 07:19:13 +02:00
madmaxoft
3a7089539c RankMgr: Removed unneeded testing code. 2014-08-14 23:06:46 +02:00
Christophe Piveteau
e3a74f379f Further changes in coding style 2014-08-14 14:29:46 +02:00
madmaxoft
45068f9bf4 Merge branch 'master' into Ranks 2014-08-14 01:04:01 +02:00
madmaxoft
008c1cdaf4 CheckBasicStyle checks the src folder as well. 2014-08-14 01:03:30 +02:00
Christophe Piveteau
2d2d4ff33b Further fixing of coding style errors 2014-08-13 19:47:43 +02:00
Christophe Piveteau
3f117897fb Another intendation error 2014-08-13 19:18:11 +02:00
Christophe Piveteau
3698c5c829 Fixed braces and intendation errors 2014-08-13 19:16:00 +02:00
Christophe Piveteau
a544c0238b Implement ability to push minecarts on curved rails 2014-08-13 18:53:23 +02:00
Tycho
f4d268636a Fixed comments 2014-08-13 13:37:07 +01:00
Tycho
fecd607d74 Added missing header 2014-08-13 13:15:29 +01:00
Tycho
781e1e6264 Fixed Integer pasing warnings in CraftingRecipies.cpp 2014-08-13 13:03:56 +01:00
madmaxoft
36e918ce9b File logger prefixes are 4 chars wide. 2014-08-13 13:31:19 +02:00
madmaxoft
5921f78e52 Logger: Fixed windows debug ODS logger, fixed-size file prefixes. 2014-08-13 13:28:45 +02:00
madmaxoft
08c55ef983 Logger: Fixed missing timestamp in log messages. 2014-08-13 13:27:56 +02:00
Tycho
c3c3d3a72d Fixed type issues in CraftingRecipe.cpp 2014-08-13 12:14:55 +01:00
Tycho
8f7b9acb48 Fixed forgotten error checking 2014-08-13 12:10:21 +01:00
Tycho
2321d2af41 Fixed shadowing variable 2014-08-13 12:01:13 +01:00
Tycho
60ea4bb937 Removed unused method 2014-08-13 11:56:47 +01:00
madmaxoft
5e415c5b95 RankMgr: Fixed multithreading issues. 
Only one thread is allowed to interact with a SQLite::Database object at a time.
Additionally, improved performance of the migration by wrapping the entire thing in a transaction.
 2014-08-13 12:33:31 +02:00
madmaxoft
e110f72268 RankMgr: Initial migration code. 2014-08-13 09:53:33 +02:00
madmaxoft
10e58f04da Fixed windows compilation and style issues. 2014-08-12 22:43:04 +02:00
Tycho
01c50eb53a Fix messing rename 2014-08-12 17:32:08 +01:00
Tycho
9844368267 Renamed Loggers 2014-08-12 16:05:04 +01:00
Franz Reiter
8f0c4911f7 Merge pull request #1296 from mc-server/LuaAPI 
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
 2014-08-12 16:05:33 +02:00
madmaxoft
3020e8cc05 Merge remote-tracking branch 'origin/master' into Ranks 2014-08-12 11:10:32 +02:00
Howaner
cb98014582 Revert "Removes the fire if the block under the fire was broken." 
This reverts commit 01001d2a49.
 2014-08-11 23:12:32 +02:00
Howaner
01001d2a49 Removes the fire if the block under the fire was broken. 2014-08-11 22:37:28 +02:00
Howaner
74fabb079c Moved the clicked-through block check to the top of the function. 2014-08-11 22:34:33 +02:00
madmaxoft
e0b45c1893 Fixed unchecked return values. 2014-08-11 16:06:40 +02:00
madmaxoft
0a52ed6eb9 cProtocol172: Check return values. 
Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431
 2014-08-11 15:33:20 +02:00
Howaner
202a0d1c1d Fixed cancelled fire interact from all directions. 2014-08-11 14:24:36 +02:00
Mattes D
ef513720fb Merge pull request #1310 from mc-server/ChestFix 
Fixed potential null dereference
 2014-08-11 13:22:26 +02:00
Mattes D
54cf69a634 Merge pull request #1301 from mc-server/Ores 
Ore Tweaks
 2014-08-11 12:10:20 +02:00
archshift
a7eb4032ee Fixed tolua error with static initialization 2014-08-10 17:13:14 -07:00
Howaner
47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
archshift
92f67789fc Gave names to unnamed enums 2014-08-10 15:06:59 -07:00
archshift
dba6723611 Player.cpp: change unnamed enum to constant integers 2014-08-10 15:06:59 -07:00
Mattes D
0953bf403b Merge pull request #1311 from mc-server/CMakeFix 
Fixed circular dependecy luaState_Call.inc
 2014-08-10 23:19:54 +02:00