1
0
Fork 0
Commit Graph

178 Commits

Author SHA1 Message Date
Howaner c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner 7e985f3c7d Add more documentation. 2014-06-17 13:44:07 +02:00
Howaner da88c98034 Add comment. 2014-06-17 13:25:36 +02:00
Howaner 1086b8ba05 Revert "Fix right click bugs."
This reverts commit 61b6fdde75.
2014-06-17 01:18:09 +02:00
Mattes D af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
madmaxoft 28b82d5bbb Proper fix for long interaction.
Fixes #1078 and #1038.
2014-06-08 11:32:52 +02:00
worktycho ae37dfec8d Fixed bad coordinate 2014-06-04 11:29:08 +01:00
Tiger Wang 5fc7592cba Merge remote-tracking branch 'origin/pistonfixes'
Conflicts:
	src/Chunk.cpp
2014-06-02 19:49:14 +01:00
Howaner 421588d25d Fix fire break. 2014-05-28 16:59:51 +02:00
Howaner 61b6fdde75 Fix right click bugs. 2014-05-28 16:07:51 +02:00
archshift c204735f38 ClientHandle.cpp: Process look before pos 2014-05-27 00:28:46 -07:00
archshift 0a3570bc9d ClientHandle.cpp: remove redundant code
HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
2014-05-26 14:15:32 -07:00
madmaxoft 6449b5d11b Revert "Add more move checks"
This reverts commit 989312c4e7.
2014-05-26 16:38:39 +02:00
Mattes D 6ad411a8b8 Merge pull request #1003 from Howaner/GlobalFixes
Add more move checks
2014-05-26 10:14:05 +02:00
Tiger Wang ee929793f0 Hopefully fixed piston duplication issues
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Alexander Harkness 1de4408a18 Merge pull request #1010 from mc-server/cactidamage
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Tiger Wang 6167c79e7a Implemented cacti damage
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
Mattes D ac00568183 Merge pull request #998 from mc-server/StatManager
Statistic Manager
2014-05-18 22:30:34 +02:00
Howaner 989312c4e7 Add more move checks
- Invalid X/Y/Z/Stance check (std::isnan)
- Illegal stance
- Illegal position (32.000.000 is the world size)
2014-05-16 22:04:19 +02:00
Mattes D 0e43f88668 Merge pull request #994 from Howaner/GlobalFixes
Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
2014-05-15 21:16:04 +02:00
Howaner 28a9c16db2 Fix compile error. 2014-05-15 19:59:52 +02:00
Howaner 6c5ff597bb Move radius check. 2014-05-15 19:58:48 +02:00
andrew e3c6c8f3dd Fixed stat serialization 2014-05-11 20:30:54 +03:00
andrew c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Howaner 5c9f89526a Rename HandleBlockDigCancel to FinishDigAnimtion. 2014-05-11 11:56:15 +02:00
Mattes D 28815252e6 Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
Howaner eb0f713b6a Add block place/break distance check. 2014-05-09 23:43:00 +02:00
Howaner c8631d9a9b Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. 2014-05-09 23:10:02 +02:00
Howaner 27f95454a9 Simplified the HandleAnvilItemName() code. 2014-05-06 17:31:02 +02:00
Howaner 8a6119437d Changed HandleAnvilItemName() length to size_t in ClientHandle.h 2014-05-05 17:34:38 +02:00
Howaner 7fe6e40bf7 Add clicks, exp subtraction, item check, ... 2014-05-05 17:34:29 +02:00
Howaner 6ac332cd06 Add MC|ItemName plugin message. 2014-05-05 17:34:24 +02:00
Tiger Wang 0d1804e439 Merge branch 'master' into redstoneimprovements
Conflicts:
	src/ClientHandle.cpp
	src/Entities/FallingBlock.cpp
	src/Mobs/AggressiveMonster.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
madmaxoft 4d704255de HOOK_DISCONNECT has cClientHandle as its first parameter.
Ref.: #655.
2014-05-02 12:35:34 +02:00
madmaxoft 6bdd3ee35e Merged branch 'master' into SslWebAdmin. 2014-05-01 23:20:00 +02:00
madmaxoft e24bdc9328 More ClientHandle fixes. 2014-05-01 23:03:23 +02:00
madmaxoft ed75d3a836 Fixed warnings in ClientHandle. 2014-05-01 22:58:58 +02:00
madmaxoft 60850fe3e8 Fixed crashes in the SSL HTTP connection. 2014-05-01 15:08:15 +02:00
madmaxoft 1dbdb8ed91 Delayed sending the KeepAlive packet for 3 seconds after login.
This should alleviate #889.
2014-04-29 23:10:50 +02:00
madmaxoft 8ab8fb344f Fixed braces. 2014-04-28 20:37:22 +02:00
madmaxoft f04957321d Fixed missing return value warning in MSVC. 2014-04-28 20:37:12 +02:00
Tiger Wang bbc5faa723 Redstone simulator now directly accesses cChunk
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
archshift 7841bad27a More small fixes. 2014-04-26 14:05:00 -07:00
archshift 5a0625eccc Moar alignment. 2014-04-26 11:00:59 -07:00
archshift aef2c8ec62 Further refactored, Reverted Minecart change
Other small changes.
2014-04-26 09:25:30 -07:00
archshift d64e46186f Merge remote-tracking branch 'upstream/master' 2014-04-25 10:50:10 -07:00
archshift 0f7bd9fc77 Oops, fixed that. 2014-04-24 19:14:00 -07:00
archshift b008ba5d98 Refactored SendChat(), placing the message-type formatting into its own function.
Removed default case warning in the process.
2014-04-24 18:03:49 -07:00
Howaner 9cbb3a339f Fix armor in survival mode. 2014-04-24 20:41:25 +02:00
Mattes D 6492aa000b Merge pull request #909 from jfhumann/fixes
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
2014-04-22 13:34:32 +02:00