flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,323 Commits 1 Branch 0 Tags
3baacce51e05ea4cc6d7352475b08a35ba8bc2a0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Wang 79e9de8d67 Comment suggestions 2014-10-03 21:38:23 +01: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
Tiger Wang a9243257e5 Compilation fix 2014-09-28 13:11:41 +01:00
Tiger Wang ae36ba5d33 Compilation fix 2014-09-28 13:08:00 +01:00
Tiger Wang 1f8ee70d55 Bug fix 2014-09-27 22:13:37 +01:00
Tiger Wang 7b7225e50b Merge remote-tracking branch 'origin/master' into endofsupport 2014-09-27 19:20:02 +01:00
Tiger Wang 7ce09a9113 Suggestions 2014-09-27 19:19:28 +01:00
Tiger Wang d1814d2d67 Merge remote-tracking branch 'origin/master' into chestcarts 
Conflicts:
	src/Entities/Minecart.cpp
 2014-09-27 18:40:00 +01:00
Tiger Wang 28ebe11df2 Merge pull request #1461 from mc-server/RedstoneFix 
Redstone fix
 2014-09-27 18:06:26 +01:00
Tiger Wang 72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Tiger Wang a817243e3f Updated Core 2014-09-26 21:42:55 +01:00
Tiger Wang 4e2b838a69 Merge pull request #1455 from mc-server/includes 
Removed a few unnecessary includes
 2014-09-26 19:46:43 +01:00
Tiger Wang cb70925077 Fix crash in cLineBlockTracer 
* Fixes #1418
 2014-09-21 19:24:45 +01:00
Tiger Wang fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Tiger Wang 52d86728e6 Entities experience water resistance 2014-09-13 22:49:05 +01:00
Tiger Wang bc37b895bc e.t.c. -> etc. 
etcetera, not egg tray conglomerate :P
 2014-09-13 11:15:16 +01:00
Tiger Wang a8c7dadfd7 Added newlines 2014-09-13 11:14:17 +01:00
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
Tiger Wang 9c1fadd50c Updated Core 2014-08-29 15:13:47 +01: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
Tiger Wang a032594bf7 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-04 21:24:31 +01:00
Tiger Wang 0b9eb20b92 Fixed signs not staying on other signs 2014-08-04 21:22:08 +01:00
Tiger Wang de9d908792 Made AllToLua output consistent 2014-08-04 21:21:35 +01:00
Tiger Wang 01e9d6311a Updated submodules 2014-08-04 14:24:46 +01:00
Tiger Wang b5c0a4aa3a Fixed issues with autocomplete and time loading 
* Fixes #1274
 2014-08-01 22:15:34 +01:00
Tiger Wang c865fc8ca5 Improved endermen code a little 2014-08-01 22:15:32 +01:00
Tiger Wang 1094d91fba Merge pull request #1047 from mc-server/Enderman 
Enderman attacks a player if he's looking at him
 2014-07-31 22:20:05 +01:00
Tiger Wang ffd6797fe1 Comment suggestions 2014-07-31 18:17:21 +01:00
Tiger Wang 5a1f9e5044 Merge pull request #1267 from mc-server/RoofedForest 
Added RoofedForest trees.
 2014-07-31 13:23:50 +01:00
Tiger Wang 4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang cb77b39dc6 Detrailed whitespace 2014-07-29 16:36:24 +01:00
Tiger Wang 8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
Tiger Wang d3012d6904 Merge remote-tracking branch 'origin/master' 2014-07-24 21:38:46 +01:00
Tiger Wang 3a6002de5b Fixed block drops 
* Fixes #1242 (the issue addressed within)
 2014-07-24 21:38:25 +01:00
Tiger Wang 1156914dd6 Suggestions 2014-07-23 21:12:59 +01:00
Tiger Wang bc5db3274f Fix misguided comment on bits... 
...obviously written by someone very confused, also known as me
 2014-07-22 21:09:37 +01:00
Tiger Wang b5e5586ab0 Merge pull request #1216 from mc-server/saplingsandleaves 
Fixed issues relating to saplings and leaves
 2014-07-22 20:10:02 +01:00
Tiger Wang 18a0b60c12 Merge remote-tracking branch 'origin/master' into saplingsandleaves 
Conflicts:
	src/Defines.h
 2014-07-22 18:30:31 +01:00
Tiger Wang a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
Tiger Wang 0a15e1f420 Suggestion and failed merge fix 2014-07-22 10:33:16 +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
Tiger Wang 2823ee9026 Revert "Only one instance of server can be started" 
This reverts commit 6484e9814a.

* Fixes #1200
 2014-07-20 13:49:15 +01:00
Tiger Wang ba24f50e5e Line tracer invalid chunk fix 
* Fixes #1230
* Additionally improved speed in some scenarios
 2014-07-20 13:39:14 +01:00
Tiger Wang d0e7b2f18b Merge branch 'master' into saplingsandleaves 
Conflicts:
	src/Bindings/DeprecatedBindings.cpp
	src/Blocks/BlockSapling.h
 2014-07-20 12:02:23 +01:00
Tiger Wang f68b04e029 Proper comment for DropBlock() 2014-07-20 12:00:20 +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 88c877f79c Merge pull request #1231 from mc-server/ticks-alive 
Added m_TicksAlive to entities and allows projectiles to hit their creators
 2014-07-20 10:39:25 +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
Tiger Wang 0f8c24e04d Fixed issues relating to saplings and leaves 
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
 2014-07-17 22:26:53 +01: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
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
Tiger Wang c5d00f3ec5 Suggestions 2014-07-16 12:05:09 +01:00
Tiger Wang 2189f37c20 Resolved backwards compatibility issues 2014-07-16 11:38:52 +01:00
Tiger Wang ad247735fd Function rename 2014-07-16 11:23:26 +01:00
Tiger Wang f2c4f56ccd Unified functions 
Thanks @Howaner!
 2014-07-16 11:21:02 +01:00
Tiger Wang 1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang 1df5a1f237 Fixed a DropSpenser AddFace bug 2014-07-15 22:53:44 +01:00
Tiger Wang 74155f947c Merge pull request #1191 from Masy98/Blocks 
Removed stairs and carpet from IsSolid
 2014-07-15 21:09:41 +01:00
Tiger Wang 82fe5c05f0 Fixed redstone simulator crash 
* Fixes #1176
* Fixed #1186
 2014-07-14 23:03:30 +01:00
Tiger Wang 5b1552435f Fixed some meta resetting bugs 
* Fixes #1174
* Fixes #1171
 2014-07-14 21:57:44 +01:00
Tiger Wang ad6494fb36 Maybe improved arrow sinking 2014-07-14 21:56:40 +01:00
Tiger Wang f0187cc8f9 Fixed placing liquids over liquids 
* Fixes #1182
 2014-07-14 21:55:46 +01:00
Tiger Wang 4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Tiger Wang 6484e9814a Only one instance of server can be started 
This disallows the UDP multicasting that the original code enabled.

xoft deterrent, in PR #1151 you implied that this was unwanted behaviour
(but comments gone now as I force pushed - check emails?).

Revert at will if unsatisfactory :P
 2014-07-13 00:17:33 +01:00
Tiger Wang e11f41d048 Revert failed fix for #31 
This reverts commit 69dc9b4c9a.
 2014-07-13 00:17:31 +01:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests 
Implemented trapped chests & others
 2014-07-12 23:24:32 +01:00
Tiger Wang 945dfe75d7 Comment grammar correction 2014-07-12 22:52:45 +01:00
Tiger Wang 9f4348fb09 Simplified buckets code slightly 2014-07-12 22:50:28 +01:00
Tiger Wang 084dec6ccf Merge pull request #1162 from daniel0916/Fixes 
Fix for bucket placing
 2014-07-12 22:09:50 +01:00
Tiger Wang e71e432633 Suggestions and bug fix 
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
 2014-07-12 22:06:25 +01:00
Tiger Wang 416c160fb5 Suggestions 2014-07-11 19:40:33 +01:00
Tiger Wang 6a33fa84ae Suggestions 2014-07-11 12:43:24 +01:00
Tiger Wang df65e8b7bb Improved LinkedPowering speed 
* Additionally fixed wires powering other wires through blocks
 2014-07-11 12:06:16 +01:00
Tiger Wang da1d946b2b Fixed bow charge 2014-07-09 22:04:26 +01:00
Tiger Wang 74b6b398e7 Fixed arrow collection animation 
* Fixed piston extension non-solidness
 2014-07-09 19:56:50 +01:00
Tiger Wang 372dbbb994 Merge pull request #1135 from mc-server/fixes 
Fixes to projectiles and the undead
 2014-07-09 09:50:38 +01:00
Tiger Wang 164ffe50ad Made things consistent 2014-07-08 12:34:39 +01:00
Tiger Wang 7c7501abc5 Added extra space before comments 2014-07-07 21:14:15 +01:00
Tiger Wang 756c45d07b Fixed compilation and pressure plates 2014-07-07 21:12:25 +01:00
Tiger Wang 9e44b0aae1 Implemented trapped chests & others 
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
 2014-07-06 23:50:22 +01:00
Tiger Wang 460d6bd0cb Changed everything to callbacks 2014-07-05 22:59:22 +01:00
Tiger Wang f4e11d194e Crash and compile fix 2014-07-04 22:07:26 +01:00
Tiger Wang 25e9862206 Compile fix 2014-07-04 17:49:44 +01:00
Tiger Wang 79e558be34 Suggestions 2014-07-04 17:42:40 +01:00
Tiger Wang 2ead2538b1 MCS WebAdmin sockets rebinds instantly 
* Fixes #272
* Fixes #1150
 2014-07-04 16:52:52 +01:00
Tiger Wang f4e3c01a71 Various fixed 
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
 2014-07-04 16:49:24 +01:00