438a9b04cb
Changed Kick message
2014-11-29 16:05:22 -08:00
9caa3b19c1
removed extra space and fixed some formatting in cCallback
2014-11-29 15:59:48 -08:00
72797b14fe
Uses callback for players already in World.
2014-11-29 15:44:38 -08:00
a7bf2725c8
fixed naming of strings and changed from i to I
2014-11-29 11:22:03 -08:00
61e761fdc2
issue 1253 - prevent multiple logins with same username
2014-11-29 00:36:15 -08:00
c1a52dc9fb
ClientHandle: Fixed max block place distance check.
...
Fixes #1492
2014-11-25 21:24:25 +01:00
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
9ece37e8f1
Merge pull request #1598 from mc-server/SignEditor
...
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
ae15c2f78e
Fixed a wrong assert in cClientHandle::SetViewDistance().
2014-11-17 12:34:14 +01:00
277151582f
Use LastPlacedSign instead of LastPlacedBlock.
2014-11-15 22:36:31 +01:00
09cea625fc
Renamed m_UsedViewDistance to m_CurrentViewDistance
2014-11-15 22:26:54 +01:00
927d8d7702
Renamed m_SetViewDistance to m_RequestedViewDistance
2014-11-15 15:33:42 +01:00
78fb789631
Fixed a security problem with signs.
2014-11-15 15:16:52 +01:00
83d3f3347b
Use m_UsedViewDistance and m_SetViewDistance.
2014-11-14 22:53:12 +01:00
a0e1e43fc1
Merge branch 'master' into ViewDistance
2014-11-14 22:33:54 +01:00
d93acb841f
Fixed m_SentChunks list chunk removing.
2014-10-30 22:04:04 +01:00
9c7661f50f
Added a MaxViewDistance option.
2014-10-30 21:24:10 +01:00
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
9af58a81d6
Use 3 priorities.
2014-10-23 21:19:43 +02:00
72bb299a4a
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
2014-10-23 14:59:42 +02:00
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
b0988e65aa
Use two lists and 2 chunk send prioritys.
2014-10-21 17:35:23 +02:00
a07456d712
New c++11 stuff.
2014-10-21 17:00:41 +02:00
44514e53fc
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
aa19a3afb0
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
2874bf73be
Merge pull request #1502 from mc-server/furnaces
...
Improved furnaces
2014-10-18 21:33:55 +01:00
8c2a99711e
Merged branch 'fix_chunks'.
2014-10-16 21:12:26 +02:00
eeb580a74e
Functions in cPluginManager get references instead of pointers.
2014-10-15 19:09:09 +02:00
c6725f8d28
Usernames are lowercased before generating offline UUID.
...
This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization.
2014-10-15 13:41:23 +02:00
97623fc634
Added distance check.
2014-10-07 21:36:01 +02:00
b493beb3bb
Stream 4 chunks per tick. Added priority.
2014-10-06 21:27:53 +02:00
a59f2d15fb
Merge branch 'master' into ChunkLoader
2014-10-06 17:38:42 +02:00
5a6b86180e
Better StreamNextChunk() method
2014-10-06 17:38:17 +02:00
a8aeceab9d
cClientHandle: Added protocol version knowledge.
2014-10-05 20:19:21 +02:00
b5a2c6667a
Improved furnaces
...
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
382e014ebc
Optimized chunk loader
2014-10-02 23:50:41 +02:00
d7066f43d3
Rewritten plugin messages, vanilla are being parsed directly.
...
This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
2014-09-30 13:33:57 +02:00
5a44be13b7
Fixed trailing whitespace.
2014-09-28 22:17:29 +02:00
8d55cd409e
Merge pull request #1466 from mc-server/endofsupport
...
Removed protocols 1.2 to 1.6
2014-09-28 22:04:30 +02:00
79110b29db
Combined conditions
2014-09-27 21:49:03 +02:00
fc22ba0ce8
Added barriers correctly
2014-09-27 21:07:52 +02:00
72c087cfd3
Dropped support for <1.7.x
2014-09-27 14:28:14 +01:00
d83d6456e8
Fixed players custom name in 1.8
2014-09-26 17:37:19 +02:00
4b38e077cf
Merge branch 'master' into EntityCustomName
...
Conflicts:
src/ClientHandle.cpp
src/ClientHandle.h
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/World.cpp
src/World.h
2014-09-23 14:39:49 +02:00
4398156b2e
Merge branch 'master' into 1.8-Protocol
2014-09-19 14:31:18 +02:00
43ed690520
Exported player list states to extra functions.
2014-09-18 18:50:17 +02:00
010879e43f
BungeeCord compatibility: don't overwrite UUID / properties.
2014-09-17 16:01:14 +02:00
92e7e5c615
Merge branch 'master' into 1.8-Protocol
2014-09-14 14:16:17 +02:00
5b63a7fe98
Merge pull request #1353 from mc-server/Effects
...
Added speed entity effect.
2014-09-13 17:05:59 +02:00
b462416e1f
1.8: Fixed maps.
2014-09-13 02:20:04 +02:00
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
1223a24d3c
Merge branch 'master' into Effects
2014-09-12 19:13:46 +02:00
20f3757d54
Play placesound from the middle of the block.
2014-09-12 18:14:32 +02:00
010ac1e5f7
Fixed block place sounds.
2014-09-12 18:12:42 +02:00
a1716bb415
Players in survival mode are not allowed to break a bedrock.
2014-09-12 15:57:37 +02:00
bee615b75b
Merge branch 'master' into 1.8-Protocol
2014-09-12 13:28:06 +02:00
f2c5d8a761
Fixed many right click issues.
2014-09-12 13:19:33 +02:00
4e2d75bde5
1.8: Fixed eating.
2014-09-12 01:37:19 +02:00
3bd3ac2200
1.8: Added ParticleEffect packet.
2014-09-11 17:03:09 +02:00
71c3369e08
1.8: Added MultiBlockChange packet.
2014-09-09 18:27:31 +02:00
acae3c9c65
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
2014-09-09 16:00:26 +02:00
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
6fb0a76b1e
Merge branch 'master' into 1.8-Protocol
2014-09-09 01:55:21 +02:00
4b1f4e8d7e
1.8: Added new uuid field.
2014-09-09 01:52:51 +02:00
76fa3a7ccd
More fixes.
2014-09-08 20:12:43 +02:00
8f8693a71e
Fixed more 1.8 packets.
2014-09-08 17:02:54 +02:00
c140ba2367
Merge pull request #1351 from LO1ZB/remove-a_RelY
...
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
e431bb4e63
Merge branch 'master' into Inventory
2014-09-02 20:11:38 +02:00
1bb4d79412
Added SetCustomName() to players.
2014-09-02 19:12:35 +02:00
240ec9b4bd
Added speed entity effect.
2014-08-28 23:02:20 +02:00
4470ebffd7
Fire can be destroyed with the sword in creative-mode
2014-08-28 20:49:34 +02:00
6c3b80f04c
Fixed crashes and use std::swap.
2014-08-28 14:58:03 +02:00
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
8fa4ac9ad9
Fixed item drop.
...
Fixes #1341
2014-08-22 15:32:27 +02:00
64fec204c4
Added initializers for class members.
...
As reported by Coverity, these weren't initialized.
2014-08-21 22:39:53 +02:00
f7774ec336
Merge branch 'master' into Fire
2014-08-20 22:25:05 +02:00
cb98014582
Revert "Removes the fire if the block under the fire was broken."
...
This reverts commit 01001d2a49
2014-08-11 23:12:32 +02:00
01001d2a49
Removes the fire if the block under the fire was broken.
2014-08-11 22:37:28 +02:00
74fabb079c
Moved the clicked-through block check to the top of the function.
2014-08-11 22:34:33 +02:00
202a0d1c1d
Fixed cancelled fire interact from all directions.
2014-08-11 14:24:36 +02:00
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
42bad0edec
Added a comment and simplified code.
2014-08-10 20:06:03 +02:00
4271d719b6
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
...
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
ff7171fc5a
Resending fire to the client when the interact cancelled.
2014-08-06 14:04:25 +02:00
3b4255dbfe
Fixed a bug who can used from hacked clients.
2014-08-02 00:14:05 +02:00
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
86d84bcb73
Compile fix.
2014-08-01 17:29:17 +02:00
160fa3a9a9
Import Statistics.h
2014-07-31 23:56:49 +02:00
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
6b1f7e7a45
Renamed "select..." methods to "set..." and better IsValidEffect() function.
2014-07-31 18:15:39 +02:00
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
89b1bbdc5f
Added beacon.
2014-07-30 21:59:35 +02:00
17a94b16ea
MojangAPI: Implemented UUID shortening and dashing.
2014-07-30 13:56:30 +02:00
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
7f9f46c911
Fixed group color's.
2014-07-27 13:47:21 +02:00
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
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
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
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
52add840cf
Fixed attempts to call c_str on ChatColors
2014-07-19 11:15:21 -07:00
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
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
9529a42559
Fixed creative players not being able to drink
...
Fixes #1215
2014-07-18 01:56:26 -07:00
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
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
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
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
1f6854792c
Store properties as Json::Value
2014-07-16 00:03:47 +01:00
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
e11f41d048
Revert failed fix for #31
...
This reverts commit 69dc9b4c9a
2014-07-13 00:17:31 +01:00
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
4ded58bfd1
Unnecessary return
2014-06-30 14:19:31 +02:00
b9d4431f6f
Fixed respawning
...
* Fixes #1103
2014-06-29 22:44:16 +01:00
3c631fc0f9
Fixed offline UUID generator.
...
It generated invalid UUIDs, too many hex chars.
2014-06-29 18:27:41 +02:00
50e112788b
Send statistics to the player, when he logged in.
2014-06-29 01:40:15 +02:00
1b89b997ff
Merge pull request #1132 from mc-server/RemoveMD5
...
Removed the md5 library, obsoleted by PolarSSL.
2014-06-29 00:46:11 +02:00
5e66d9aeab
Fixed issue with breaking blocks at -1 coordinates
2014-06-28 20:45:05 +01:00
9926abd4f5
Added generic entity-collecting.
...
Now any cEntity can be collected, not only cPickups.
This should help PR #1098 .
2014-06-27 20:56:44 +02:00
563f706422
Removed the md5 library, obsoleted by PolarSSL.
...
Fixes #1130 .
2014-06-27 19:34:53 +02:00
bd5df3d3b9
Merge branch 'master' of https://github.com/mc-server/MCServer into portals
2014-06-24 21:15:48 +01:00
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
08fed2a213
Added cClientHandle::IsUUIDOnline function.
...
Ref.: #771
2014-06-21 22:13:35 +02:00
3766ac96d7
ItemHandler: changed IsDrinkable() to take a short argument
2014-06-17 11:39:20 -07:00
2185c72c2c
Implemented drinkable potions, noeffect entity effect,
...
Clears entity effects on death
2014-06-17 11:39:20 -07:00
1eb04a48ee
Implemented milk, added documentation to Pawn.h
2014-06-17 11:39:19 -07:00
c60ba8a52d
Merge branch 'master' into GlobalFixes
2014-06-17 19:03:56 +02:00
7e985f3c7d
Add more documentation.
2014-06-17 13:44:07 +02:00
da88c98034
Add comment.
2014-06-17 13:25:36 +02:00
1086b8ba05
Revert "Fix right click bugs."
...
This reverts commit 61b6fdde75
2014-06-17 01:18:09 +02:00
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
28b82d5bbb
Proper fix for long interaction.
...
Fixes #1078 and #1038 .
2014-06-08 11:32:52 +02:00
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
ae37dfec8d
Fixed bad coordinate
2014-06-04 11:29:08 +01:00
5fc7592cba
Merge remote-tracking branch 'origin/pistonfixes'
...
Conflicts:
src/Chunk.cpp
2014-06-02 19:49:14 +01:00
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
421588d25d
Fix fire break.
2014-05-28 16:59:51 +02:00
61b6fdde75
Fix right click bugs.
2014-05-28 16:07:51 +02:00
c204735f38
ClientHandle.cpp: Process look before pos
2014-05-27 00:28:46 -07:00
0a3570bc9d
ClientHandle.cpp: remove redundant code
...
HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
2014-05-26 14:15:32 -07:00
6449b5d11b
Revert "Add more move checks"
...
This reverts commit 989312c4e7
2014-05-26 16:38:39 +02:00
6ad411a8b8
Merge pull request #1003 from Howaner/GlobalFixes
...
Add more move checks
2014-05-26 10:14:05 +02:00
ee929793f0
Hopefully fixed piston duplication issues
...
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
1de4408a18
Merge pull request #1010 from mc-server/cactidamage
...
Implemented cacti damage
2014-05-19 14:01:50 +01:00
6167c79e7a
Implemented cacti damage
...
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
ac00568183
Merge pull request #998 from mc-server/StatManager
...
Statistic Manager
2014-05-18 22:30:34 +02:00
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
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
28a9c16db2
Fix compile error.
2014-05-15 19:59:52 +02:00
6c5ff597bb
Move radius check.
2014-05-15 19:58:48 +02:00
e3c6c8f3dd
Fixed stat serialization
2014-05-11 20:30:54 +03:00
c7c3724a3e
Statistic Manager
2014-05-11 14:57:06 +03:00
5c9f89526a
Rename HandleBlockDigCancel to FinishDigAnimtion.
2014-05-11 11:56:15 +02:00
28815252e6
Merge branch 'master' into SslWebAdmin
2014-05-10 21:27:57 +02:00
eb0f713b6a
Add block place/break distance check.
2014-05-09 23:43:00 +02:00
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
27f95454a9
Simplified the HandleAnvilItemName() code.
2014-05-06 17:31:02 +02:00
8a6119437d
Changed HandleAnvilItemName() length to size_t in ClientHandle.h
2014-05-05 17:34:38 +02:00
7fe6e40bf7
Add clicks, exp subtraction, item check, ...
2014-05-05 17:34:29 +02:00
6ac332cd06
Add MC|ItemName plugin message.
2014-05-05 17:34:24 +02:00
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
4d704255de
HOOK_DISCONNECT has cClientHandle as its first parameter.
...
Ref.: #655 .
2014-05-02 12:35:34 +02:00
6bdd3ee35e
Merged branch 'master' into SslWebAdmin.
2014-05-01 23:20:00 +02:00
e24bdc9328
More ClientHandle fixes.
2014-05-01 23:03:23 +02:00
ed75d3a836
Fixed warnings in ClientHandle.
2014-05-01 22:58:58 +02:00
60850fe3e8
Fixed crashes in the SSL HTTP connection.
2014-05-01 15:08:15 +02:00
1dbdb8ed91
Delayed sending the KeepAlive packet for 3 seconds after login.
...
This should alleviate #889 .
2014-04-29 23:10:50 +02:00
8ab8fb344f
Fixed braces.
2014-04-28 20:37:22 +02:00
f04957321d
Fixed missing return value warning in MSVC.
2014-04-28 20:37:12 +02:00
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
7841bad27a
More small fixes.
2014-04-26 14:05:00 -07:00
5a0625eccc
Moar alignment.
2014-04-26 11:00:59 -07:00
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
d64e46186f
Merge remote-tracking branch 'upstream/master'
2014-04-25 10:50:10 -07:00
0f7bd9fc77
Oops, fixed that.
2014-04-24 19:14:00 -07:00
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
9cbb3a339f
Fix armor in survival mode.
2014-04-24 20:41:25 +02:00
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
4dd7610381
Declared one mutex as mutable in order to allow for const correct get accessors.
2014-04-19 17:53:02 +02:00
fde1555352
Small style changes
2014-04-18 22:20:24 +02:00
67344a3782
Merge remote-tracking branch 'origin/master' into fixes
...
Conflicts:
src/Authenticator.cpp
src/ClientHandle.cpp
src/Entities/Minecart.cpp
src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
b239de66db
Merge branch 'master' into Enchanting
2014-04-18 15:04:32 +02:00
3efd232829
Removed old include
2014-04-18 14:10:31 +02:00
b7e074b10b
Merge pull request #891 from mc-server/fixes
...
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
0086fcfef1
Fixed some Errors (not all)
2014-04-17 19:31:43 +02:00
f9343a8490
Modified many things
2014-04-17 13:15:35 +02:00
a0725747af
Fixed conflicting enchantments checking
2014-04-16 14:52:09 +02:00
a12a9117c2
Added deletions from merge conflict
2014-04-16 14:33:03 +02:00
99e4225269
Attempted fix for the client crash with the new protocols.
2014-04-15 23:40:06 +02:00
d12d7b6715
Implemented the 1.7.6 protocol and authenticator.
...
Server works both in online and offline modes with 1.7.9.
2014-04-14 22:52:59 +02:00
d505ffc704
A client UUID is generated when the server is in offline mode.
...
1.7.9 client works with these changes in offline mode.
2014-04-14 20:21:00 +02:00
b506a74076
Added Yggdrasil Authentication System
...
Code by Howaner. Fixes/Changes by me.
2014-04-13 13:04:56 +02:00
c0c47d33c5
Entities handle chunks properly again
...
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
2014-04-12 13:16:48 +01:00
d77ca77086
Merge branch 'master' into HTTPSizeT
2014-04-04 13:29:48 +02:00
8825d30aab
Fixed some Clang warnings in protocols.
2014-04-04 10:13:25 +02:00
1f5a4a39f2
Fixed All signedness warnings in HTTPServer.cpp
2014-04-02 06:36:25 -07:00
ee07b7ae3e
Simplified and fixed slabs, fixes #835
2014-03-31 20:34:11 +01:00
5260146f3c
Merge pull request #838 from mc-server/lilypads
...
Lilypads
2014-03-30 15:17:35 +01:00
515e4bdb13
Compare for inequality in FACE_NONE checks
2014-03-29 13:18:26 +00:00
aefabfcafa
Removed leftover clienthandle code
2014-03-29 10:25:40 +00:00
fb16554322
Fixed players not updating after world change
...
Addendum to 6dea7993f2
2014-03-29 01:21:56 +00:00
aee1f8f9d1
Fixed block interaction rate check
2014-03-28 22:52:04 +00:00
f622f4317c
Implemented lilypad placement
2014-03-23 22:32:45 +00:00
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
16b27c4b7a
Fixed a load of format string errors
2014-03-11 14:16:08 -07:00
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
2eca30aebc
Removed Some unnessicary macros
2014-03-10 11:34:20 -07:00
1985a9c33e
Merge pull request #731 from mc-server/ballisticmissiles
...
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
77787fb719
!= FACE_NONE
2014-03-09 14:55:47 +00:00
d3c38c40e4
Merge pull request #777 from jfhumann/issue317
...
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
2014-03-09 15:13:27 +01:00
8a715db41f
Merge pull request #775 from worktycho/warnings
...
Fixed a few warnings
2014-03-09 15:04:12 +01:00
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
a2fb28dd08
Fixed data length issues
2014-03-09 12:48:59 +00:00
c05a1db88d
CheckBlockInteractionsRate() fixed & enabled
2014-03-09 12:48:52 +00:00
8d2ebf8e19
Slight plugin messaging changes
...
- Clients are not allowed to register duplicate channels
- Clients are not allowed to use channels that were not registered
2014-03-09 00:36:02 +00:00
66970fe943
Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.
2014-03-08 17:55:53 +01:00
307fad0f25
Fixed issues with int vs size_t and a few other warnings
2014-03-08 08:33:38 -08:00
d4a5b16c52
Add data backsending, when the Client interacts a Block and the Interact is cancelled.
2014-03-05 15:10:20 +01:00
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
b17d04737d
Merge pull request #738 from xdot/master
...
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
0274db0e14
Use switch in GetStepSound
2014-02-28 22:32:10 +01:00
66c8425041
Fix Double Slabs, fix Slab Meta and add more things to burnable
2014-02-28 15:26:32 +01:00
f77720c43f
Merge pull request #669 from xdot/master
...
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
084971424f
Use the ItemCategorie::IsSword() Method.
2014-02-23 20:31:58 +01:00
cc34898e45
No Sword Block Destroying in Creative Mode
2014-02-23 20:02:44 +01:00
27e77a28fa
cClientHandle manages the client-registered plugin channels.
...
Fixes #706 .
2014-02-20 23:24:39 +01:00
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
393ca0221d
Map decorators; Map clients
2014-02-18 20:50:08 +02:00
320cc74f0a
Implemented paintings, fixes #689
...
+ Implemented paintings
2014-02-18 00:16:03 +00:00
3b24bc870b
Map item handler; Fixed several bugs
2014-02-17 16:27:12 +02:00
ea55a22a71
Links sent via chat messages are clickable.
...
Fixes #658 .
2014-02-16 23:51:32 +01:00
48d28a0f94
Add Locale to ClientHandle
2014-02-16 13:26:07 +01:00
0f1f7583ae
Implemented cCompositeChat.
...
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678 .
2014-02-15 23:17:49 +01:00
cf96e69716
cMap::UpdateRadius
2014-02-15 20:06:47 +02:00
5b92b877bc
Send map when selected
2014-02-14 16:21:16 +02:00
92e85cc960
Implementation of in-game maps
2014-02-13 17:13:09 +02:00
f86f066615
Merge branch 'master' into playerimprovements
...
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
vincentleung1
Mattes D
Tiger Wang
Howaner
Masy98
LO1ZB
archshift
worktycho
Alexander Harkness
andrew
jfhumann
daniel0916
Tycho