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

3448 Commits

Author SHA1 Message Date
Tiger Wang
3e74113427 Implemented Chest Minecarts 2014-09-12 23:18:02 +01:00
Tiger Wang
4019847857 Fixed friction being applied whilst airborne 
Reported by tonibm9 in #1300.
 2014-09-12 20:50:24 +01:00
Howaner
d5306f265b Only drop flint or gravel, not both. 2014-09-12 19:38:00 +02:00
Howaner
96e03fc3ea Added extra mushroom handler. 2014-09-12 19:34:19 +02:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Howaner
fcf558173e Fixed farmland issues. 2014-09-12 19:07:20 +02:00
Howaner
80b0631c43 Only place farmland if no block is upper than dirt/grass. 2014-09-12 18:21:11 +02:00
Howaner
a40eb93c33 Added hoe interact sound. 2014-09-12 18:15:49 +02:00
Howaner
20f3757d54 Play placesound from the middle of the block. 2014-09-12 18:14:32 +02:00
Howaner
010ac1e5f7 Fixed block place sounds. 2014-09-12 18:12:42 +02:00
Masy98
5cf114da39 Added Sea Lantern drops 2014-09-12 17:01:03 +02:00
Masy98
7f42ba9fc1 Fixed 1.8 Item stacking and block harvesting 2014-09-12 16:48:37 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
3f000deb3b Disabled mobspawner itemdrop. 2014-09-12 15:59:46 +02:00
Howaner
a1716bb415 Players in survival mode are not allowed to break a bedrock. 2014-09-12 15:57:37 +02:00
Howaner
fb68382d9b Merge branch 'master' into 1.8-Protocol 2014-09-12 14:09:07 +02:00
Howaner
abcae75992 Fixed iron ore drop. 2014-09-12 14:08:56 +02:00
Howaner
009d9bbe46 Merge branch 'master' into 1.8-Protocol 2014-09-12 13:49:23 +02:00
Howaner
1849e620fc Added flint drop and fence gate meta reset. 2014-09-12 13:49:08 +02:00
Howaner
bee615b75b Merge branch 'master' into 1.8-Protocol 2014-09-12 13:28:06 +02:00
Howaner
f2c5d8a761 Fixed many right click issues. 2014-09-12 13:19:33 +02:00
Howaner
0d34fc9f31 Fixed wrong buffer length in the 1.8 protocol. 2014-09-12 13:01:23 +02:00
Howaner
34bcd3dd58 1.8: Fixed ReadItem() 2014-09-12 02:42:04 +02:00
Howaner
eb19eff5ac 1.8: Added difficulty sending 2014-09-12 02:00:28 +02:00
Howaner
8151c79a87 1.8: Fixed block entities. 2014-09-12 01:44:20 +02:00
Howaner
4e2d75bde5 1.8: Fixed eating. 2014-09-12 01:37:19 +02:00
Howaner
85ec697d32 1.8: Fixed workbench, enchanting and anvil window. 2014-09-12 01:15:21 +02:00
Howaner
e10237fb4d 1.8: Enderman, byte -> short 2014-09-12 00:41:07 +02:00
Howaner
a02d96d1f5 1.8: Fixed enderman spawning. 2014-09-12 00:36:46 +02:00
Howaner
c7044fa1dd 1.8: Fixed inventory open packet. 2014-09-11 23:17:27 +02:00
Howaner
6d5a5eb665 Removed GetProtocolVersion() from the protocols. 2014-09-11 22:27:35 +02:00
Howaner
d815aeaefd 1.8: Fixed sign placing. 2014-09-11 22:21:53 +02:00
Howaner
c45bf7cf55 1.8: Fixed hangings. 2014-09-11 20:06:28 +02:00
Tycho
b87585977f Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST mode 2014-09-11 17:57:34 +01:00
Tycho
0b044e1c83 Possibly decoupled IncrementalRedstoneSimulator from the rest of the server 
THis wil hopefully allow for unit testing
 2014-09-11 17:48:21 +01:00
Howaner
3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Masy98
d4641576c0 Added new doors in ItemDoor.h 2014-09-11 16:33:52 +02:00
Masy98
a01994389d Fixed mutton name in Sheep.cpp 2014-09-11 16:24:16 +02:00
Masy98
b185e7f4e6 Fixed mutton name in ItemHandler 2014-09-11 16:11:03 +02:00
Masy98
741791ecfc Added barrier block 2014-09-11 16:07:54 +02:00
Masy98
8c3cd18cdd Added 1.8 food to the food list 2014-09-11 15:57:36 +02:00
Masy98
5f2e850b0f Added blocks to the fire simulator 2014-09-11 15:48:26 +02:00
Masy98
e34767b265 Fixed incorrect handlers 2014-09-11 15:39:37 +02:00
Mattes D
9fd5df26d0 Fixed a redstone sim failure with droppers. 2014-09-11 10:28:48 +02:00
Masy98
214cc0f15d Added stone slab in BlockSlab.h 2014-09-10 21:50:46 +02:00
Masy98
c0e86e7360 Fixed typo 2014-09-10 21:47:15 +02:00
Masy98
a9b4b60c80 Added new blocks to the BlockInfo 2014-09-10 21:44:04 +02:00
Masy98
f173cfe430 Added new blocks to the BlockHandler 2014-09-10 21:15:06 +02:00
Masy98
074dcbf950 Added iron trapdoor, fence gates and doors to the redstone simulator 2014-09-10 21:07:37 +02:00
Masy98
c967633d0a Added 1.8 Blocks and Items 2014-09-10 21:02:15 +02:00
Alexander Harkness
32002694b0 Grammar fixes. 2014-09-10 18:47:59 +01:00
Tycho
27be179939 Added abilty to set build info 
build info is displayed at startup
Fixes #1410
 2014-09-10 16:07:00 +01:00
Mattes D
76d5aa1d51 Merge pull request #1402 from Masy98/Sounds 
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
 2014-09-10 08:36:33 +02:00
Masy98
65e6b1e50e Removed old sound-configuration for SignPosts 2014-09-09 20:10:37 +02:00
Masy98
a171a6ce93 Removed old sound-configuration for Repeaters 2014-09-09 19:50:35 +02:00
Masy98
27edb7f0d0 Removed old sound-configuration for Trapdoors 2014-09-09 19:37:07 +02:00
Howaner
71c3369e08 1.8: Added MultiBlockChange packet. 2014-09-09 18:27:31 +02:00
Masy98
6cc4ac0bca Removed old sound-configuration for doors 2014-09-09 16:28:08 +02:00
Masy98
acae3c9c65 Moved sound-configs into BlockID.h and fixed/ added loads of sounds 2014-09-09 16:00:26 +02:00
Mattes D
feb408424c Merge pull request #1399 from mc-server/warnings 
Warnings
 2014-09-09 14:32:58 +02:00
worktycho
1f0b6eeaf3 Actually set default 2014-09-09 12:18:20 +01:00
Howaner
f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Howaner
6fb0a76b1e Merge branch 'master' into 1.8-Protocol 2014-09-09 01:55:21 +02:00
Howaner
d1d4f2146e PlayerSpawn packet: Send the correct uuid. 2014-09-09 01:54:40 +02:00
Howaner
4b1f4e8d7e 1.8: Added new uuid field. 2014-09-09 01:52:51 +02:00
worktycho
bd810b80a6 use the correct ASSERT 2014-09-08 21:31:47 +01:00
Tycho
fb20c2eb85 FIxed a couple more warnings 2014-09-08 19:15:29 +01:00
Howaner
76fa3a7ccd More fixes. 2014-09-08 20:12:43 +02:00
Tycho
2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
Tycho
4bdf9256f2 Fixed a few compile warnings 2014-09-08 18:56:27 +01:00
Howaner
e740739d04 Recoded cProtocol180 class. 2014-09-08 19:24:33 +02:00
worktycho
64071aeda9 capitalisation error 2014-09-08 17:45:23 +01:00
Howaner
fa2b69b3f3 1.8: Fixed tab complete. 2014-09-08 17:08:28 +02:00
Howaner
8f8693a71e Fixed more 1.8 packets. 2014-09-08 17:02:54 +02:00
worktycho
4613fabd45 derp 2014-09-08 15:15:31 +01:00
worktycho
5f207c8bb7 If server fails init, save any changed or generated settings. 2014-09-08 14:57:58 +01:00
Howaner
38124bcce3 Updated chunk sending to 1.8 2014-09-08 12:24:06 +02:00
Howaner
10a30a03e3 Added GetProtocolVersion() to cProtocol. 2014-09-08 11:35:21 +02:00
Howaner
09ff17b71e Implemented packet compression. 
ChunkData packet needs this.
 2014-09-08 00:36:30 +02:00
Mattes D
c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D
d2c1518145 Webadmin: Added default ports to auto-generated ini file. 
Fixes #1382.
 2014-09-07 19:45:15 +02:00
Mattes D
a0feff2734 WebAdmin: Added HTTPS instructions when cert / key is missing. 2014-09-07 19:42:35 +02:00
Mattes D
e1a9a6291b Removed chunk's unused Y coord. 
This fixes the second issue of #1313.
 2014-09-06 19:01:30 +02:00
Mattes D
0a651b9fd8 Added Y-wise asserts to signs. 
This should help detect #1313's second case.
 2014-09-06 18:59:17 +02:00
Mattes D
868723ce50 Alpha-sorted protocol 1.7 senders. 2014-09-06 18:57:57 +02:00
Mattes D
9e1f67932b Fixed player spawning in unknown world. 
This may happen if the admin removes a world.
 2014-09-06 15:26:20 +02:00
Mattes D
9f9302f470 Anvil: Fixed an off-by-one error in the loader. 
Fixes #1307.
 2014-09-06 13:32:16 +02:00
Mattes D
dd0aa22d2e Fixed scoreboard loader type checks. 
Fixes scoreboard loading error reported on the Dropper map in #1307.
 2014-09-06 13:11:08 +02:00
Mattes D
b1cc1451d4 Merge pull request #1361 from mc-server/WebAdmin 
Webadmin improvements
 2014-09-06 11:12:18 +02:00
Alexander Harkness
15d4e543b1 Xoft fixes. 2014-09-06 09:56:22 +01:00
Mattes D
103fa8812d WorldStorage no longer queues chunks into generator. 2014-09-05 23:26:00 +02:00
Mattes D
4230eb3d92 Fixed loading empty chunks. 
Reported on the Dropper map in #1307.
 2014-09-05 22:55:39 +02:00
Mattes D
137b021d26 Rewritten chunk status to specify whether the chunk is in queue. 
This fixes #1370.
 2014-09-05 22:16:48 +02:00
Mattes D
e15b8600a6 BiomeMultiCache is not used for simple generators. 2014-09-05 22:08:00 +02:00
Mattes D
60e235362c Fixed style. 2014-09-05 22:07:13 +02:00
Mattes D
6444bc25ba Fixed security: Player cannot spawn in a disabled world. 2014-09-05 16:55:16 +02:00
Mattes D
254c8c9154 Anvil: Fixed loading block entities with invalid Y coord. 2014-09-05 16:40:03 +03:00
Mattes D
e9dda864ea Merge pull request #1375 from mc-server/EntitiesInBox 
Implemented ForEachEntityInBox
 2014-09-04 22:25:19 +02:00
Howaner
da28c70def Fixed client errors. 2014-09-04 19:03:21 +02:00
Mattes D
b590eed42f Merge pull request #1371 from DayBr3ak/master 
issue381, multicache for cBioGen
 2014-09-04 14:09:54 +02:00
madmaxoft
7ab4c078b8 Fixed compilation after chunk Y removal. 2014-09-04 14:05:42 +02:00
madmaxoft
3297a39c27 Merge remote-tracking branch 'origin/master' into EntitiesInBox 2014-09-04 14:02:18 +02:00
madmaxoft
d77221c715 Anvil: Cleanly refuse to store data that is too large. 
Each chunk in MCA needs to be less than 1 MiB compressed; chunks that are larger will be refused with a log message.
 2014-09-04 14:01:06 +02:00
Howaner
07fba5c98e Added more 1.8 protocol things. 2014-09-04 03:22:35 +02:00
archshift
e1206568ec Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" 
This reverts commit 472efa8174.

Apparently we don't support some of these features quite yet (darn you C++98!)
 2014-09-03 16:23:03 -07:00
archshift
19067b27de In 1.8, carrots and potatoes yield one less hunger point. 2014-09-03 16:18:58 -07:00
archshift
472efa8174 Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc 
Snow Golems must also be above 64Y to spawn snow (as of 1.8).
 2014-09-03 16:12:43 -07:00
Howaner
157f1c6688 Started implementing of the 1.8 protocol. 2014-09-04 00:29:36 +02:00
madmaxoft
014a55a15a LuaState: Fixed class value-getting off the stack. 2014-09-03 23:05:22 +02:00
madmaxoft
06c66a08cd LuaState: Fixed referenced function pushing. 
The references are no longer destroyed by the call.
 2014-09-03 23:05:03 +02:00
madmaxoft
bae928fd27 ChunkGenerator: Log world seed when creating a new one. 2014-09-03 23:02:00 +02:00
Mattes D
c140ba2367 Merge pull request #1351 from LO1ZB/remove-a_RelY 
remove y-coord from chunks
 2014-09-03 21:47:00 +02:00
madmaxoft
44c1d9c248 Anvil: switched inflate to stream mode. 
This removes the fixed-size buffer which could have caused #1307 and #1366.
 2014-09-03 19:36:53 +02:00
DayBr3ak
d2bacc34f6 change to linear calculation 2014-09-03 18:48:47 +02:00
madmaxoft
a9ed5baba3 Exported ForEachEntityInBox() to Lua API. 2014-09-03 17:01:23 +02:00
madmaxoft
a51c1e0b73 Added cWorld::ForEachEntityInBox() 2014-09-03 17:00:26 +02:00
madmaxoft
9eb07f483a cBoundingBox: Added accessors. 2014-09-03 16:56:59 +02:00
LO1ZB
42fb71f261 commit 2014-09-03 13:52:32 +02:00
madmaxoft
1cc65b6264 Fixed style and alpha-sorting. 2014-09-03 10:29:10 +02:00
archshift
34d6f0713e Added mutton, which sheep now drop when killed 2014-09-02 23:21:08 -07:00
archshift
b414e91883 EntityEffect.cpp: Enable 1.8's leaping potion 2014-09-02 22:56:39 -07:00
DayBr3ak
5a608dc279 adapting format 2014-09-03 02:53:21 +02:00
LO1ZB
554f585017 re-add the missing "s" too cChunkCoordsWithBoolList 2014-09-03 00:28:08 +02:00
LO1ZB
a600e3bdfe hopefully the last commit for removing y-coord from chunks. :) 2014-09-03 00:14:51 +02:00
madmaxoft
a0687b42e4 Clang wants volatile... 2014-09-02 23:05:24 +02:00
madmaxoft
92a60bf4d5 Added strict error reporting to chunk loading. 
This should help with #1307.
 2014-09-02 22:41:02 +02:00
Howaner
c19b2befa8 Changed the IsEnchantable() comment again. 2014-09-02 20:17:31 +02:00
Howaner
e431bb4e63 Merge branch 'master' into Inventory 2014-09-02 20:11:38 +02:00
Howaner
38e824dbcf Renamed SetWalkSpeed() to SetRelativeWalkSpeed() 2014-09-02 20:10:41 +02:00
Howaner
d3b8100a7b Merge branch 'master' into Effects 2014-09-02 20:03:42 +02:00
Howaner
017235e15c [WebAdmin] Code improvements. 2014-09-02 20:02:52 +02:00
Howaner
b8769e3fb4 Merge branch 'master' into WebAdmin 2014-09-02 19:37:03 +02:00
Howaner
42dcd534df Merge branch 'master' into EntityCustomName 2014-09-02 19:36:14 +02:00
Howaner
5c53608dd0 Added CustomName saving. 2014-09-02 19:34:58 +02:00
Howaner
079634d18c Added the new functions to APIDump. 2014-09-02 19:20:59 +02:00
Howaner
1bb4d79412 Added SetCustomName() to players. 2014-09-02 19:12:35 +02:00
DayBr3ak
b8636ee53a forgot this one 2014-09-02 18:18:43 +02:00
DayBr3ak
82911f3662 opting for size_t 2014-09-02 18:13:24 +02:00
DayBr3ak
29811c4f21 fixing memory leak 2014-09-02 18:05:53 +02:00
DayBr3ak
ac4ec5117d changing implem, using vectors 2014-09-02 10:54:26 +02:00
DayBr3ak
d9afe6dd65 adding config file entry #381 2014-09-02 01:19:52 +02:00
DayBr3ak
77409d47eb adding the multicache behavior 2014-09-02 01:13:19 +02:00
madmaxoft
b1da567f3d Pickups combine only within one chunk. 
This greatly improves performance of the tick thread.
 2014-09-01 21:43:03 +02:00
DayBr3ak
7695471ff9 added multicache class definition 2014-09-01 21:37:36 +02:00
madmaxoft
6f18d01b51 Fixed off-by-one errors in cChunkDef asserts. 2014-09-01 21:17:22 +02:00
Howaner
dfed6f94ca Added name tag 2014-09-01 21:05:45 +02:00
Mattes D
3093f3d180 Merge pull request #1368 from mc-server/coverityFixes 
Make sure packets are valid
 2014-09-01 20:57:55 +02:00
Howaner
7c4cb9a385 Added CustomName to cMonster. 2014-09-01 20:12:56 +02:00
worktycho
de30a8c8c6 Make sure packets are valid 
Fixes CID 66408, 66409 and 72045
 2014-09-01 18:18:07 +01:00
madmaxoft
022f5f141d Fixed Bindings regeneration under MSVC. 2014-09-01 16:10:40 +02:00
LO1ZB
4c9abab2d1 fix possibility of a twice generated chunk 2014-09-01 15:01:56 +02:00
madmaxoft
8821c476bb Fixed previous commit's wrong assumptions. 
The equipment-getting functions return a copy already, so we can't take a pointer, really.
 2014-09-01 14:35:52 +02:00
madmaxoft
7d8a474f13 Fixed MSVC compilation, improved performance. 
We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
 2014-09-01 14:31:05 +02:00
madmaxoft
f22f67a63c Fixed MSVC warning. 2014-09-01 14:29:13 +02:00
madmaxoft
9a4e8bf83f Merge remote-tracking branch 'Hircine/Enchantments' 2014-09-01 14:03:39 +02:00
madmaxoft
ea39c1d21c Avoid false positive in style check. 2014-09-01 13:43:10 +02:00
Mattes D
74204aed6c Merge pull request #1365 from mc-server/coverityFixes 
Coverity fixes
 2014-09-01 13:41:20 +02:00
madmaxoft
1e60265a90 Fixed style. 2014-09-01 13:33:17 +02:00
worktycho
468c2558d6 Removed isDone check 
The same data is returned by executeStep so why execute a call when you have the data.
 2014-08-31 21:26:02 +01:00
worktycho
361b7d5379 Changed null check to assert 
Changed the null check to clarify that the function should not be called before the entity has been attached to a world.
 2014-08-31 21:14:42 +01:00
Howaner
af125d2a61 Use std::auto_ptr 2014-08-31 22:04:52 +02:00
worktycho
3e7332c70c Delete the entity before removing from the list 
Old code was calling dereference on invalid iterator
 2014-08-31 20:28:41 +01:00
worktycho
b6d77d9679 Init RankMgr pointer to NULL 2014-08-31 20:26:08 +01:00
Howaner
0d392f53ed Fixed compile warnings. 2014-08-31 20:53:41 +02:00
Howaner
66417f7a48 Fixed wrong doxy-comment. 2014-08-31 19:29:54 +02:00
Howaner
0beed83ae9 Rewrited furnace.txt loading. 2014-08-31 19:00:36 +02:00
Howaner
e67bb7f431 WebAdmin: Stop webadmin if template can't load. 2014-08-31 15:03:23 +02:00
Howaner
7e5f22141f WebAdmin: Added "files" folder and load the login template from login_template.html 2014-08-31 12:59:04 +02:00
Jaume Aloy
6180f7df09 Fixed style 2014-08-31 11:28:42 +02:00
worktycho
365d2447d0 Check range of y in HasNearLog 
Fixes #803
 2014-08-31 00:15:48 +01:00
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
Howaner
0fdb177208 Fixed potion removing in creative mode. 2014-08-30 12:46:26 +02:00
Howaner
003206b1b0 Added slowness effect and added entity support. 2014-08-30 12:45:39 +02:00
Howaner
d7ee2245e8 Added SetWalkSpeed() to cMonster. 2014-08-30 12:44:54 +02:00
Howaner
80bd0a5457 Merge branch 'master' into Effects 2014-08-30 12:21:39 +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
240ec9b4bd Added speed entity effect. 2014-08-28 23:02:20 +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