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

224 Commits

Author SHA1 Message Date
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
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 6444bc25ba Fixed security: Player cannot spawn in a disabled world. 2014-09-05 16:55:16 +02:00
Howaner d3b8100a7b Merge branch 'master' into Effects 2014-09-02 20:03:42 +02:00
madmaxoft 9a4e8bf83f Merge remote-tracking branch 'Hircine/Enchantments' 2014-09-01 14:03:39 +02:00
Jaume Aloy 6180f7df09 Fixed style 2014-08-31 11:28:42 +02:00
Howaner 0fdb177208 Fixed potion removing in creative mode. 2014-08-30 12:46:26 +02:00
Mattes D 8630b20c52 RankMgr: Default rank is applied to players without any rank. 2014-08-24 20:00:45 +02:00
Mattes D e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Mattes D 8acc883187 Removed cGroup and cGroupManager. 2014-08-21 15:29:54 +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 949aa2f383 cPlayer reads ranks from cRankManager. 2014-08-19 17:34:11 +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
Mattes D e4fc05574b Player: Silenced a few type conversion warnings. 2014-08-18 22:48:15 +02:00
Mattes D 80559406f9 Player saving creates the "players" folder, if needed. 
Fixes #1268.
 2014-08-17 22:47:00 +02:00
Howaner a68c70c900 Better OnPlayerMoving hook. 2014-08-16 18:44:14 +02:00
archshift a7eb4032ee Fixed tolua error with static initialization 2014-08-10 17:13:14 -07:00
archshift dba6723611 Player.cpp: change unnamed enum to constant integers 2014-08-10 15:06:59 -07:00
Tycho 07103ed9d7 Spaces 2014-08-10 21:26:28 +01:00
Tycho 63a07b7ffc Fixed potential crash in Player.cpp 
Fixes CID 71780
If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player
 2014-08-10 20:47:16 +01:00
Howaner ae61156391 Fixed swing arm animation when you ate. 2014-08-10 17:08:22 +02:00
archshift 9ecce2366e Code reduction and clarity fixes 2014-08-02 22:35:29 -07:00
archshift 3ffec92e79 Removed unused cPlayer::FoodPoison function 2014-08-02 22:27:27 -07:00
Mattes D 941a182d8a Merge pull request #1255 from mc-server/NameToUUID 
Name to UUID
 2014-08-01 22:35:12 +02:00
madmaxoft 6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
Howaner 84462ba8b2 Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. 2014-07-31 23:04:00 +02:00
madmaxoft ecb86935f8 Fixed UUIDs handling in cPlayer. 
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
 2014-07-31 22:52:06 +02:00
madmaxoft f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Tiger Wang 4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang 8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
Howaner a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
Tiger Wang 1156914dd6 Suggestions 2014-07-23 21:12:59 +01:00
Howaner 396739cc0f Fix item durability. 
Fixes #1181
 2014-07-23 16:32:09 +02:00
Tiger Wang a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
Tiger Wang 3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
Tiger Wang 8050a5b98a Suggestions 2014-07-21 22:49:06 +01:00
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft 6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
Tiger Wang 6ab9afd0fd Bug and crash fixes 
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
 2014-07-20 10:46:45 +01:00
archshift d5b163bd3d Removed references to deprecated cChatColor::Color 2014-07-19 11:12:34 -07:00
madmaxoft 08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
archshift 041bfd5860 Fixed clamping issues 2014-07-19 01:40:29 -07:00
Tiger Wang 719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang 37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
archshift ffe44c13d0 Moved ChatColor.h out of defines where it was not needed 2014-07-17 23:25:14 -07:00
archshift bc94ad4b5a Fixed NULL being passed instead of a double to AddEntityEffect 2014-07-17 14:34:58 -07:00
madmaxoft c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
archshift 488ecb6912 Player.cpp: Fixed compile error 2014-07-17 14:08:54 -07:00