flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,302 Commits 1 Branch 0 Tags
8050a5b98a3003c2a4bed39b896b4a3a4c1068c0
Commit Graph
6302 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Wang 8050a5b98a Suggestions 2014-07-21 22:49:06 +01: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
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
Tiger Wang f1be1eb674 Monster fixes 
* Fixes #1203
* Fixes #627
 2014-07-18 10:47:00 +01:00
archshift 38aeaa64ed MCServer supports Minecraft v1.7.10 2014-07-18 02:02:28 -07:00
archshift 9529a42559 Fixed creative players not being able to drink 
Fixes #1215
 2014-07-18 01:56:26 -07:00
madmaxoft 204b591172 CheckBasicStyle: Proper spaces with commas. 2014-07-18 09:58:29 +02:00
madmaxoft 2df5e26d3b Fixed spaces before commas. 2014-07-18 09:57:34 +02:00
madmaxoft d52a51f7b6 Removed duplicate IPvX labels. 2014-07-18 09:18:11 +02:00
Mattes D 35d0a0009e Merge pull request #1208 from Howaner/MobInventory 
Spawns skeletons with a bow in their hands
 2014-07-18 09:06:59 +02:00
archshift ffe44c13d0 Moved ChatColor.h out of defines where it was not needed 2014-07-17 23:25:14 -07:00
Mattes D 000ec7a96f Merge pull request #1210 from Howaner/API 
Removed special character in APIDump
 2014-07-18 08:10:00 +02:00
Mattes D 79a5c90c02 Merge pull request #1212 from mc-server/never-read 
ProtocolRecognizer.cpp: removed unused NumBytesRead
 2014-07-18 08:09:32 +02:00
archshift 33b0a719da ProtocolRecognizer.cpp: removed unused NumBytesRead 2014-07-17 18:39:44 -07:00
archshift 32b25ec7f7 Generator: removed rnd definitions that are never read 2014-07-17 18:34:47 -07:00
archshift 5729b9489d Merge pull request #1209 from Howaner/GlobalFixes 
Added Howaner to the CONTRIBUTORS list.
 2014-07-17 18:20:56 -07:00
Howaner fc6a5878df Removed special character in APIDump 2014-07-18 01:45:45 +02:00
Howaner 57d415e38b Added me to the CONTRIBUTORS list. I hope it is ok. 2014-07-18 01:28:56 +02:00
Howaner 33bd78dcdd Skeletons should spawn with a bow in the hand. 
Fixes #1184
 2014-07-18 01:26:27 +02:00
archshift bc94ad4b5a Fixed NULL being passed instead of a double to AddEntityEffect 2014-07-17 14:34:58 -07:00
madmaxoft b2716c720e Fixed code style in Trees.cpp. 
The src folder now has zero BasicStyle violations.
 2014-07-17 23:25:21 +02: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
archshift 5c0789e15e Player.cpp: Added Wither death message 2014-07-17 14:08:21 -07:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft 7a9f9ab744 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-07-17 22:23:08 +02:00
madmaxoft a02509ff4b Initial version of a script to check basic style. 
This script reports basic violations of the style, such as indentation using spaces, alignment using tabs, trailing whitespace etc. Passing this script does NOT mean that the style is clean, it's only for fast-checking purposes.
 2014-07-17 22:19:52 +02:00
madmaxoft 2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02:00
Alexander Harkness 4fd9ac60e0 Merge pull request #1204 from Howaner/Blocks 
Fix sapling drop.
 2014-07-17 20:40:14 +01:00
Howaner 68cc9c6f91 Fix sapling drop. 2014-07-17 21:35:34 +02:00
madmaxoft 7fff12bfac Fixed spaces around single-line comments. 
There should be at least two spaces in front and one space after //-style comments.
 2014-07-17 19:13:23 +02:00
madmaxoft 993fd14ddf Fixed basic whitespace problems. 
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
 2014-07-17 16:33:09 +02:00
Tiger Wang 3dd9649665 Fixed mob knockback 
* Fixes #901
 2014-07-17 14:32:52 +01:00
Tiger Wang db36f1a9fa Fixed crash with entities in unloaded chunks 
* Fixes #1190
 2014-07-17 13:54:28 +01:00
Tiger Wang c3b4b70a73 Merge pull request #1183 from Howaner/Sounds 
Reset meta to zero when the blocks explode
 2014-07-17 10:39:38 +01:00
Mattes D ec77cf1b06 Merge pull request #1079 from mc-server/potions 
Added potions and entity effect accessors
 2014-07-17 11:23:09 +02:00
madmaxoft 70f304a96b Fixed 3 MSVC warnings in SplashPotionEntity. 2014-07-17 11:07:33 +02:00
madmaxoft 430d8b42a5 Updated cPawn::KilledBy signature for custom death messages. 2014-07-17 11:07:10 +02:00
madmaxoft 7d0fc85d00 Merge branch 'master' into potions 2014-07-17 11:01:26 +02:00
madmaxoft 64c8b0d51b Reformatted cItemPotionHandler. 2014-07-17 10:51:44 +02:00
madmaxoft cd1e6f8ef0 Fixed formatting for cWitherSkullEntity 2014-07-17 10:24:29 +02:00
Mattes D 98244e96d1 Merge pull request #1193 from mc-server/deathmessages 
Death messages
 2014-07-17 10:12:22 +02:00
madmaxoft e66b81b395 Merge remote-tracking branch 'origin/master' into potions 2014-07-17 10:06:13 +02:00
Tiger Wang 174906efca Another fix for excessive food drain 2014-07-16 22:22:45 +01:00
Tiger Wang 960fcaa90c Fixed a bug with buckets 
* Additionally fixed cLineBlockTracer's EntryFace parameter when a block
was hit on the first iteration along the projected line
 2014-07-16 22:22:00 +01:00
Tiger Wang 9194438fb5 Fixed another redstone simulator crash 2014-07-16 22:21:00 +01:00
Mattes D e444106d09 Merge pull request #1192 from mc-server/skinuuid 
Skins
 2014-07-16 13:30:57 +02:00
Tiger Wang c5d00f3ec5 Suggestions 2014-07-16 12:05:09 +01:00