daniel0916
3efd232829
Removed old include
2014-04-18 14:10:31 +02:00
Mattes D
b7e074b10b
Merge pull request #891 from mc-server/fixes
...
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
daniel0916
0086fcfef1
Fixed some Errors (not all)
2014-04-17 19:31:43 +02:00
daniel0916
f9343a8490
Modified many things
2014-04-17 13:15:35 +02:00
daniel0916
a0725747af
Fixed conflicting enchantments checking
2014-04-16 14:52:09 +02:00
daniel0916
a12a9117c2
Added deletions from merge conflict
2014-04-16 14:33:03 +02:00
madmaxoft
99e4225269
Attempted fix for the client crash with the new protocols.
2014-04-15 23:40:06 +02:00
madmaxoft
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
madmaxoft
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
daniel0916
b506a74076
Added Yggdrasil Authentication System
...
Code by Howaner. Fixes/Changes by me.
2014-04-13 13:04:56 +02:00
Tiger Wang
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
madmaxoft
d77ca77086
Merge branch 'master' into HTTPSizeT
2014-04-04 13:29:48 +02:00
madmaxoft
8825d30aab
Fixed some Clang warnings in protocols.
2014-04-04 10:13:25 +02:00
Tycho
1f5a4a39f2
Fixed All signedness warnings in HTTPServer.cpp
2014-04-02 06:36:25 -07:00
Tiger Wang
ee07b7ae3e
Simplified and fixed slabs, fixes #835
2014-03-31 20:34:11 +01:00
worktycho
5260146f3c
Merge pull request #838 from mc-server/lilypads
...
Lilypads
2014-03-30 15:17:35 +01:00
Tiger Wang
515e4bdb13
Compare for inequality in FACE_NONE checks
2014-03-29 13:18:26 +00:00
Tiger Wang
aefabfcafa
Removed leftover clienthandle code
2014-03-29 10:25:40 +00:00
Tiger Wang
fb16554322
Fixed players not updating after world change
...
Addendum to 6dea7993f2
2014-03-29 01:21:56 +00:00
Tiger Wang
aee1f8f9d1
Fixed block interaction rate check
2014-03-28 22:52:04 +00:00
Tiger Wang
f622f4317c
Implemented lilypad placement
2014-03-23 22:32:45 +00:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
Tycho
16b27c4b7a
Fixed a load of format string errors
2014-03-11 14:16:08 -07:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
Tycho
2eca30aebc
Removed Some unnessicary macros
2014-03-10 11:34:20 -07:00
Tiger Wang
1985a9c33e
Merge pull request #731 from mc-server/ballisticmissiles
...
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
Tiger Wang
77787fb719
!= FACE_NONE
2014-03-09 14:55:47 +00:00
Mattes D
d3c38c40e4
Merge pull request #777 from jfhumann/issue317
...
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
2014-03-09 15:13:27 +01:00
Mattes D
8a715db41f
Merge pull request #775 from worktycho/warnings
...
Fixed a few warnings
2014-03-09 15:04:12 +01:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
a2fb28dd08
Fixed data length issues
2014-03-09 12:48:59 +00:00
Tiger Wang
c05a1db88d
CheckBlockInteractionsRate() fixed & enabled
2014-03-09 12:48:52 +00:00
Tiger Wang
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
Jan-Fabian Humann
66970fe943
Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.
2014-03-08 17:55:53 +01:00
Tycho
307fad0f25
Fixed issues with int vs size_t and a few other warnings
2014-03-08 08:33:38 -08:00
Howaner
d4a5b16c52
Add data backsending, when the Client interacts a Block and the Interact is cancelled.
2014-03-05 15:10:20 +01:00
andrew
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
Mattes D
b17d04737d
Merge pull request #738 from xdot/master
...
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
andrew
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
Howaner
0274db0e14
Use switch in GetStepSound
2014-02-28 22:32:10 +01:00
Howaner
66c8425041
Fix Double Slabs, fix Slab Meta and add more things to burnable
2014-02-28 15:26:32 +01:00
Tiger Wang
f77720c43f
Merge pull request #669 from xdot/master
...
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
Howaner
084971424f
Use the ItemCategorie::IsSword() Method.
2014-02-23 20:31:58 +01:00
Howaner
cc34898e45
No Sword Block Destroying in Creative Mode
2014-02-23 20:02:44 +01:00
madmaxoft
27e77a28fa
cClientHandle manages the client-registered plugin channels.
...
Fixes #706 .
2014-02-20 23:24:39 +01:00
andrew
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
andrew
393ca0221d
Map decorators; Map clients
2014-02-18 20:50:08 +02:00
Tiger Wang
320cc74f0a
Implemented paintings, fixes #689
...
+ Implemented paintings
2014-02-18 00:16:03 +00:00
andrew
3b24bc870b
Map item handler; Fixed several bugs
2014-02-17 16:27:12 +02:00
madmaxoft
ea55a22a71
Links sent via chat messages are clickable.
...
Fixes #658 .
2014-02-16 23:51:32 +01:00
Howaner
48d28a0f94
Add Locale to ClientHandle
2014-02-16 13:26:07 +01:00
madmaxoft
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
andrew
cf96e69716
cMap::UpdateRadius
2014-02-15 20:06:47 +02:00
andrew
5b92b877bc
Send map when selected
2014-02-14 16:21:16 +02:00
andrew
92e85cc960
Implementation of in-game maps
2014-02-13 17:13:09 +02:00
Tiger Wang
f86f066615
Merge branch 'master' into playerimprovements
...
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
Tiger Wang
0f36d1c122
Added sender name to PM if prefixes disabled
...
* Also moved the PVP setting into Mechanics
2014-02-07 20:10:12 +00:00
Tiger Wang
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
Tiger Wang
aa8b46e947
Server internally uses new functions
2014-02-05 23:24:16 +00:00
Tiger Wang
99fdadd58e
Reduced max explosions per tick
2014-02-05 00:45:08 +00:00
Tiger Wang
94c343fe07
Fixed explosions bug
...
* Fixed bug where explosions would sometimes never be sent
2014-02-04 23:40:58 +00:00
Tycho
8464f689ea
Improved Type safety of eBlockFace
...
May Fix #640
2014-02-04 10:59:05 -08:00
Tiger Wang
6de8c09fe0
Fixed a crash bug
2014-02-03 22:24:22 +00:00
Tiger Wang
b5e898a608
Server now handles join messages also
...
* Revised as well hook documentation
2014-02-03 21:12:44 +00:00
Tycho
6e39ed3868
Changed Signiture of OnDigging
2014-02-01 08:35:48 -08:00
Tycho
cf3b4ec226
Changed Signiture of OnDestroyedByPlayer
2014-02-01 06:01:13 -08:00
Tycho
c6304b2b4f
Changed pointers to references
2014-02-01 05:06:32 -08:00
Tycho
25ec7750aa
Changed signitures of Several BLockHandler Methods
...
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
2014-01-31 15:17:41 -08:00
Tycho
bed2ee22e8
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockRail.h
src/World.h
2014-01-26 06:28:51 -08:00
Tycho
14e48ccb4b
Refactored cBlockHandler::OnUse and dependents
2014-01-26 06:20:39 -08:00
Mattes D
cdcad2237a
Merge pull request #587 from mc-server/mobimprovements
...
Mob improvements & rudimentary artificial intelligence
2014-01-25 13:36:32 -08:00
Tycho
15b92af166
First attempt at Implementing Interfaces
2014-01-25 11:14:14 -08:00
Tiger Wang
6fa3a0cf70
Two minor changes
2014-01-25 19:05:44 +00:00
madmaxoft
6c1d992eeb
Fixed a possible deadlock on client disconnect.
2014-01-24 22:23:58 +01:00
madmaxoft
8a254faaf7
Merge remote-tracking branch 'MikeHunsinger/master'
2014-01-24 08:55:41 +01:00
andrew
4ef61d8bf6
Command block fixes 2
2014-01-23 14:57:04 +02:00
Mike Hunsinger
41b05416c7
Split TossItem into three Toss functions (Held, Equipped and Pickup)
2014-01-23 00:27:39 -07:00
andrew
9bd8f74b59
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-01-21 20:40:41 +02:00
andrew
fa4750f015
Scoreboard SendTo()
2014-01-21 19:43:13 +02:00
andrew
aa61f55b74
Scoreboard protocol support
2014-01-21 15:58:17 +02:00
Mattes D
fde8b0be60
Merge pull request #565 from mc-server/commandblockfixes
...
Command block fixes
2014-01-19 13:47:52 -08:00
Tiger Wang
e4c3d799ff
Removed unneeded paramters
2014-01-19 19:42:25 +00:00
madmaxoft
3c0e8c8da0
Rewritten SocketThreads for proper shutdown scenario.
...
This fixes #560 and #390 .
2014-01-19 19:31:43 +01:00
Tiger Wang
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
Tiger Wang
a85b2897e0
Implemented MC|Brand response
2014-01-19 01:06:19 +00:00
Tiger Wang
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
andrew
a037172465
Command block fixes
2014-01-18 21:27:54 +02:00
andrew
02c9aa2b1e
Parse the MC|AdvCdm plugin message
2014-01-18 19:58:46 +02:00
Tiger Wang
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
Tiger Wang
3c31f2d8d8
Implemented Ctrl-Q drop stack
...
Also fixed an issue with TossItems not respecting count.
2014-01-15 22:36:19 +00:00
madmaxoft
fe978f0d1e
Added cClientHandle::SendPluginMessage().
...
It is not yet exported in the API, though.
2014-01-09 11:39:42 +01:00
madmaxoft
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
Tycho Bickerstaff
e41dec458c
fixed ClientHandle warnings
2013-12-31 09:16:41 +01:00
STRWarrior
e9d1352f6e
Implented BroadcastParticleEffect
2013-12-22 14:45:25 +01:00
madmaxoft
f5e6124ee0
Fixed the rest of constructor reorders.
2013-12-20 19:10:15 +01:00
Mattes D
39251bccd3
Merge pull request #450 from mc-server/redstonefixes
...
Multiple fixes
2013-12-19 13:58:49 -08:00
Tiger Wang
03a8dfc4a8
Fixed PlayerAbilities and creative
2013-12-19 20:53:47 +00:00
Tiger Wang
53e8c067ea
Fixed 1.7 arm swing animation
2013-12-19 16:03:43 +00:00
Tiger Wang
2dd823da09
Disconnection message no longer shown if ping
2013-12-18 22:06:36 +00:00
Tiger Wang
aaaa53ce9d
The "<>" of a player name is now coloured
2013-12-18 18:18:06 +00:00
Tiger Wang
26632bbb8a
Fixed 1.7 player disconnection not calling hook
...
This fixes #357
2013-12-18 18:17:17 +00:00
Tiger Wang
db5d7963e2
Renamed back EntityAnimation to PlayerAnimation
...
This fixes #411 and partially reverts
30ead79049
2013-12-18 16:11:15 +00:00
madmaxoft
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
madmaxoft
e024278b02
Fixed multiple player spawn broadcasts.
2013-12-16 10:41:50 +01:00
STRWarrior
9b8112dbc2
Merge pull request #437 from mc-server/ShootTo_function
...
Shoot to function
2013-12-15 12:05:18 -08:00
madmaxoft
4ee4cab2d3
Fixed calling OnPlayerJoined() in the wrong place.
...
This is the first part of a fix for #187 .
2013-12-15 20:12:55 +01:00
STRWarrior
0efd74f114
This adds a function that allows you to 'shoot' a player towards a direction.
2013-12-15 18:54:54 +01:00
STRWarrior
ffb5a69a9e
Moved reading flags to the protocol.
2013-12-15 15:11:59 +01:00
STRWarrior
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
STRWarrior
123799a4e0
Forgot to commit the ClientHandle.
2013-12-14 18:19:56 +01:00
madmaxoft
91587f63c4
Unknown packet type extended to 32 bits.
2013-12-12 23:05:23 +01:00
Tiger Wang
1d554677b4
Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
...
Conflicts:
src/Bindings/Bindings.cpp
src/Bindings/Bindings.h
src/Blocks/BlockHandler.cpp
2013-12-08 14:02:45 +00:00
madmaxoft
044fd237b6
Moved bindings-related to a Bindings subfolder.
...
Ref.: #407
2013-12-08 12:17:54 +01:00
Tiger Wang
1932cc38a1
Fixed trapdoors not toggling
...
The redstone simulator kept on resetting them.
2013-12-07 14:41:58 +00:00
Tiger Wang
30ead79049
Renamed animation function
...
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
Tiger Wang
a5dd0e2b88
Fixed bed leave animation
2013-12-06 22:45:55 +00:00
Tiger Wang
57b8b38511
Updated comments for slabs
2013-12-06 19:22:25 +00:00
Samuel Barney
050702eaa1
Switched to using provided ReadItem function.
...
Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
2013-12-02 09:32:28 -07:00
Tiger Wang
0e0baa940a
Properly fixed snow height, fixes #98 and #264
2013-11-30 00:31:21 +00:00
Alexander Harkness
0de95a215f
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
Alexander Harkness
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
