9ece37e8f1
Merge pull request #1598 from mc-server/SignEditor
...
Fixed a security problem with signs.
2014-11-18 08:52:48 +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
8c3c11d6b3
Renamed GetSettedViewDistance() to GetRequestedViewDistance()
2014-11-15 14:27:50 +01:00
83d3f3347b
Use m_UsedViewDistance and m_SetViewDistance.
2014-11-14 22:53:12 +01:00
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
44514e53fc
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
2334c8dd9d
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-10-20 19:01:53 +01:00
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
cf73fee7e3
Fixed minor style issues.
2014-10-19 18:45:42 +02: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
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
e65e0f1795
cClientHandle: Alpha-sorted the sending functions.
2014-10-01 12:14:38 +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
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
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
82317709f8
Full BungeeCord compatibility.
...
Fixes #1392 .
Fixes SpigotMC/BungeeCord#1211 .
2014-09-17 11:07:42 +02:00
b462416e1f
1.8: Fixed maps.
2014-09-13 02:20:04 +02:00
3bd3ac2200
1.8: Added ParticleEffect packet.
2014-09-11 17:03:09 +02:00
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
c5cd75fae8
Exported cClientHandle:GetIPString() to Lua API.
2014-09-07 22:35:22 +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
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
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
4271d719b6
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
...
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +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
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
997a643977
Moar view distance!
...
Let's blow up our computers! :D
2014-07-23 20:28:56 +02:00
4044d0a6e6
Export SendEntityAnimation to ToLua
2014-07-22 13:10:12 -07: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
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
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
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
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
b9d4431f6f
Fixed respawning
...
* Fixes #1103
2014-06-29 22:44:16 +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
bd5df3d3b9
Merge branch 'master' of https://github.com/mc-server/MCServer into portals
2014-06-24 21:15:48 +01:00
08fed2a213
Added cClientHandle::IsUUIDOnline function.
...
Ref.: #771
2014-06-21 22:13:35 +02:00
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
b904223b9d
Added queue for adding entities to cWorld.
...
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02: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
3a9543178a
cCompositeChat message type is now formatted
2014-05-19 21:16:29 +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
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
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
6ac332cd06
Add MC|ItemName plugin message.
2014-05-05 17:34:24 +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
60850fe3e8
Fixed crashes in the SSL HTTP connection.
2014-05-01 15:08:15 +02:00
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -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
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
5a9acb7eb6
Merge branch 'master' into Enchanting
2014-04-16 14:31:02 +02:00
2cb8538e2e
Code Optimization
2014-04-15 22:03:15 +02:00
fb3c755c0a
Modified names
2014-04-15 20:55:37 +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
fce9ea65c3
Fixed invisibility enchantments
2014-04-13 22:15:10 +02:00
b506a74076
Added Yggdrasil Authentication System
...
Code by Howaner. Fixes/Changes by me.
2014-04-13 13:04:56 +02:00
e6e702e7fd
Added complete Enchanting System
...
http://minecraft.gamepedia.com/Enchantment_mechanics
2014-04-12 14:58:46 +02:00
296d0acbff
Added deleted things for merging
2014-04-07 20:13:45 +02: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
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
1985a9c33e
Merge pull request #731 from mc-server/ballisticmissiles
...
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
c05a1db88d
CheckBlockInteractionsRate() fixed & enabled
2014-03-09 12:48:52 +00:00
66970fe943
Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.
2014-03-08 17:55:53 +01:00
f77720c43f
Merge pull request #669 from xdot/master
...
Implementation of in-game maps :D
2014-02-24 10:28:34 +00: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
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
32b465b8e1
IDCount Serialization
2014-02-13 21:36:24 +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
88a64ec40d
Improved chat messaging functions
...
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
2014-02-07 18:58:52 +00:00
94c343fe07
Fixed explosions bug
...
* Fixed bug where explosions would sometimes never be sent
2014-02-04 23:40:58 +00:00
8464f689ea
Improved Type safety of eBlockFace
...
May Fix #640
2014-02-04 10:59:05 -08:00
9bd8f74b59
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-01-21 20:40:41 +02:00
aa61f55b74
Scoreboard protocol support
2014-01-21 15:58:17 +02:00
e4c3d799ff
Removed unneeded paramters
2014-01-19 19:42:25 +00:00
1af89a8b50
Changed SendBlockEntity format slightly
...
* Writing NBT is now in Protocol, not BlockEntity files
* Fixed a last output bug
2014-01-19 13:25:35 +00:00
f8c8dcc7f3
Improved command blocks
...
* Their command and previous output are displayed on the client
* They have a BlockHandler implementation, so you can't place blocks on
them anymore
+ As a side effect, implemented UpdateBlockEntity
2014-01-19 00:54:38 +00:00
02c9aa2b1e
Parse the MC|AdvCdm plugin message
2014-01-18 19:58:46 +02:00
ada54b79d7
Added handshake processing to protocol 1.7.
...
This fixes #495
2014-01-13 20:32:15 +01:00
fe978f0d1e
Added cClientHandle::SendPluginMessage().
...
It is not yet exported in the API, though.
2014-01-09 11:39:42 +01:00
e353f29d4a
Plugin messages are received and handed to plugins.
...
Note that MCS doesn't currently handle any channel registrations, this will come later on.
2014-01-07 17:47:20 +01:00
e9d1352f6e
Implented BroadcastParticleEffect
2013-12-22 14:45:25 +01:00
f5e6124ee0
Fixed the rest of constructor reorders.
2013-12-20 19:10:15 +01:00
3e6fd5c6e5
Removed some old cRedstone remnants
2013-12-16 17:35:20 +00:00
f521cbeb31
Fixed cClientHandle::Tick() being called from two threads.
...
When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread.
Final fix for #187 .
2013-12-16 10:41:51 +01:00
ffb5a69a9e
Moved reading flags to the protocol.
2013-12-15 15:11:59 +01:00
b10d0b95cb
Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function
2013-12-15 14:48:17 +01:00
123799a4e0
Forgot to commit the ClientHandle.
2013-12-14 18:19:56 +01:00
91587f63c4
Unknown packet type extended to 32 bits.
2013-12-12 23:05:23 +01:00
30ead79049
Renamed animation function
...
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
0de95a215f
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
Mattes D
Howaner
Tiger Wang
LO1ZB
tonibm19
archshift
andrew
daniel0916
Tycho
Jan-Fabian Humann
STRWarrior
Alexander Harkness