Howaner
3777873f22
Remove users.ini generation in Player.cpp and use the CheckUsers() Function
2014-02-21 15:10:31 +01:00
Howaner
21febaf4b3
Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini
2014-02-21 14:53:46 +01:00
andrew
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
Tiger Wang
a686656253
Merge branch 'master' into itemframes
...
Conflicts:
src/Entities/Entity.h
src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Tiger Wang
05789f9e66
Changed BlockFace type to eBlockFace
2014-02-18 21:33:33 +00:00
Tiger Wang
d5ee899d0e
Added a brace
...
====
{ }
{ __ }
{ | | }
====
REMOVE ALL THE BRACES!!
2014-02-18 11:44:09 +00:00
Tiger Wang
6788dbe7f2
Properly exported and documented paintings
2014-02-18 11:37:45 +00:00
Tiger Wang
320cc74f0a
Implemented paintings, fixes #689
...
+ Implemented paintings
2014-02-18 00:16:03 +00:00
Tiger Wang
464ec47eb7
Implemented item frames, a part of #689
...
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
2014-02-17 23:00: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
Tiger Wang
4908b6f500
Fixed minor formatting issues from #682
...
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
2014-02-16 13:37:36 +00:00
Howaner
707916b404
Replace random Float Generation and broadcast the Exp Pickup Sound
2014-02-16 01:25:39 +01:00
Howaner
f3bd288f02
Add Exp Bottle Effects
2014-02-16 01:19:30 +01:00
Howaner
d15d6acc58
Disable Hunger Death
2014-02-16 01:18:10 +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
Alexander Harkness
584f7bd806
Merge pull request #679 from mc-server/NotchDeath
...
NotchApple
2014-02-15 19:04:13 +00:00
STRWarrior
0040a88b9b
If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch
2014-02-15 19:51:05 +01:00
Tiger Wang
91ebb6cef0
Made player jump reset less ambiguous
2014-02-12 21:53:46 +00:00
Tiger Wang
06239c8336
Fixed #627
...
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
2014-02-11 22:09:56 +00:00
Tiger Wang
9d1c9097e3
Merge remote-tracking branch 'origin/master' into playerimprovements
...
Conflicts:
src/Root.cpp
src/Root.h
src/World.cpp
2014-02-09 00:14:42 +00: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
14b5054c95
Fixed a boat ASSERT
2014-02-08 23:02:50 +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
3450f0ca42
Added more chat functions
2014-02-05 23:24:02 +00:00
Mattes D
cd634ea138
Merge pull request #649 from mc-server/GroupsPermissions
...
Removed deprecated HasCommand function
2014-02-05 21:07:10 +01:00
STRWarrior
89ec774fd6
Removed deprecated HasCommand function
2014-02-05 20:20:11 +01:00
Tycho
8ba6f73169
Fixed most of the reordering warnings
2014-02-05 09:43:49 -08:00
Tiger Wang
ea2ce1595f
Fixed annoying creative on fire bug
2014-02-04 23:27:13 +00:00
Tiger Wang
9eeeb91fa6
Added more SendMessageXXX() functions
2014-02-04 22:39:57 +00:00
Tycho
8464f689ea
Improved Type safety of eBlockFace
...
May Fix #640
2014-02-04 10:59:05 -08:00
Tiger Wang
01c723e89e
Pickup constructor no longer exported
...
It didn't do anything without Initialize() exported, anyway, pickups are
spawned with cWorld.
2014-02-03 22:51:26 +00:00
Tiger Wang
3583a58cf7
Added SendMessageXXX() to cPlayer
...
As requested by @bearbin, one no longer needs to download a file that
links to Core. The server does it! Hopefully this encourages standards
compliance.
2014-02-03 22:46:56 +00:00
Tiger Wang
6de8c09fe0
Fixed a crash bug
2014-02-03 22:24:22 +00:00
Tiger Wang
a3759c1462
Merge remote-tracking branch 'origin/master' into playerimprovements
2014-02-03 21:25:42 +00:00
Tiger Wang
b5e898a608
Server now handles join messages also
...
* Revised as well hook documentation
2014-02-03 21:12:44 +00:00
Mattes D
b090547c17
Merge pull request #602 from mc-server/improvementsandfixes
...
Redstone crash fix and current console line replace function
2014-02-02 22:02:25 -08:00
Tiger Wang
b89419f603
Creative players take Plugin damage
2014-02-02 12:47:17 +00:00
Mattes D
33759197e9
Merge pull request #585 from daniel0916/hooks
...
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
daniel0916
dbbd47b96d
Removed "player destroying" hook
2014-02-01 13:27:44 +01:00
STRWarrior
5e3f7947ae
Removed debug message when a firework entity hit a solid block.
2014-01-29 13:28:08 +01:00
STRWarrior
374034e615
Bottle o' Enchanting spawns an experience orb.
2014-01-29 13:27:03 +01:00
Mattes D
09ee8a1bb6
Merge pull request #589 from mc-server/minecartimprovements
...
Minecart improvements
2014-01-26 05:13:54 -08:00
Tiger Wang
398e159f5f
Rail speed tweak
2014-01-25 20:33:23 +00:00
Tiger Wang
6fa3a0cf70
Two minor changes
2014-01-25 19:05:44 +00:00
Tiger Wang
7468ba0f10
Implemented fall damage for mobs
...
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
2014-01-25 19:02:13 +00:00
Tiger Wang
d9707a9291
Implemented pickup combining
...
* Fixes FS393
* Part of #131
2014-01-25 15:19:56 +00:00
daniel0916
bac750b24e
Added "player destroying" and "player destroyed" hooks
...
Hooks:
HOOK_PLAYER_DESTROYING
HOOK_PLAYER_DESTROYED
Idea from: https://github.com/mc-server/MCServer/issues/473
2014-01-25 11:25:22 +01:00
Tiger Wang
fd7fc7e59e
All mobs now drown ( fixes #54 )
...
* Implemented mob drowning
* Iron Golems and squids are excluded
2014-01-24 23:58:51 +00:00
Tiger Wang
a988063915
Miscellaneous improvements
2014-01-24 21:55:04 +00:00
Tiger Wang
2ce26574ef
Removed unused ReferenceManager
2014-01-24 19:46:45 +00:00
Tiger Wang
f39daabf7e
Added more minecart powered rail directions
2014-01-24 19:39:39 +00:00
madmaxoft
b02940209d
Fixed crash with failed entity-loading.
...
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
2014-01-24 09:57:12 +01:00
madmaxoft
8a254faaf7
Merge remote-tracking branch 'MikeHunsinger/master'
2014-01-24 08:55:41 +01:00
Mike Hunsinger
7c12247263
Fixed indentation once and for all.
2014-01-23 20:11:10 -07:00
Mike Hunsinger
9926ea58e8
Fixed indentation and doxygen comments... For real this time.
2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b
Fixed spacing and doxycomments.
2014-01-23 19:54:00 -07:00
Mike Hunsinger
41b05416c7
Split TossItem into three Toss functions (Held, Equipped and Pickup)
2014-01-23 00:27:39 -07:00
tonibm19
d59a0156ce
Fixed compilation on VC2008
2014-01-22 16:58:25 +01:00
andrew
aa61f55b74
Scoreboard protocol support
2014-01-21 15:58:17 +02:00
andrew
7728f4bcbe
Scoreboard deserialization
2014-01-20 16:10:39 +02:00
Tiger Wang
83cbe8c139
Begin implementing ascending rails
2014-01-19 19:31:17 +00:00
Tiger Wang
3700ad8546
Added one more direction into collision checks
...
* Added direction XM_XP
* Improved performance, thanks STR and xoft
2014-01-19 18:42:05 +00:00
Tiger Wang
9a580146e4
Minecart improvements and fixes
...
* Fixed curved rails
* Fixed detector rails in certain situations
* Fixed powered rails and others passing bad meta to SnapToRail()
2014-01-19 18:27:06 +00:00
Tiger Wang
8467f5dfae
Added more rail functionality
2014-01-19 14:52:45 +00:00
andrew
f321b5d224
Scoreboard improvements
2014-01-19 16:02:37 +02:00
Tiger Wang
82b2290b74
Merge remote-tracking branch 'origin/master' into minecartimprovements
2014-01-19 13:55:22 +00:00
andrew
2b94361059
Basic scoreboard implementation
2014-01-19 14:20:57 +02:00
STRWarrior
24df625fbd
Exported cFloater to the Lua API.
2014-01-19 00:04:46 +01:00
Tiger Wang
ddd03a050b
Minecart collision and general improvements
...
+ Implemented collision on one type of rail
* Improved curved rails somewhat
* Fixed a crash bug
2014-01-18 20:58:26 +00:00
Mattes D
79c1f6f438
Merge pull request #534 from mc-server/SpawnMinecart
...
Added cWorld::SpawnMinecart.
2014-01-17 02:27:56 -08:00
madmaxoft
aec5200893
Removed internal cEntity::GetRot() usage.
2014-01-17 11:11:17 +01:00
madmaxoft
ed1d336614
Merge remote-tracking branch 'origin/customnames'
2014-01-17 10:44:23 +01:00
madmaxoft
de4ac55398
Disabled excessive entity-related logging in Debug mode.
2014-01-16 20:31:06 +01:00
Tiger Wang
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
STRWarrior
ca835a0565
Changed GetContent function.
2014-01-16 16:54:22 +01:00
Tiger Wang
f3baf31563
OBSOLETE'd obsolete functions
2014-01-15 22:38:15 +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
STRWarrior
72dcd70f22
Furnace minecarts now stop being active after a while.
2014-01-15 14:38:54 +01:00
STRWarrior
bdfe31f917
First implementation for furnace minecarts.
2014-01-15 14:03:09 +01:00
Tiger Wang
e3b839b69f
Yes newline at end of file :D
2014-01-14 18:16:13 +00:00
Tiger Wang
a66e154b90
Final improvements to Minecarts
...
* Fixed curved rails being a little broken
+ Implemented detector rails
+ Implemented block collisions on rails
* Fixed snapping to rail
- Removed minecart physics conditions in Entity.cpp as minecarts use
their own simulator when on rails
Fixes #148 and #217 ; partially implemented #215 .
This is Cave Johnson, and we're done here.
2014-01-13 22:37:09 +00:00
Tiger Wang
edefa27a48
Detaching improvements
...
* Players now search for an area around themselves to teleport to when
detaching from something
2014-01-12 23:23:36 +00:00
STRWarrior
c7d556afaf
Fixed server crash.
2014-01-12 18:15:54 +01:00
STRWarrior
f11427e8cd
Renamed cEmptyMinecart to cRideableMinecart
2014-01-12 18:04:41 +01:00
STRWarrior
c5603ce064
EmptyMinecarts should be able to get a block inside of them.
2014-01-12 15:27:50 +01:00
Tiger Wang
ec6c510bd4
Multiple enhancements and fixes to minecarts
...
+ They are destroyed instantly by creative mode
* Physics is much improved
+ Basic implementation of powered rails
2014-01-12 13:28:37 +00:00
Morgan Redshaw
782818ffb5
Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.
2013-12-30 21:30:20 -07:00
madmaxoft
ee15d4e08e
Fixed compilation in VC2008.
...
Also removed an unused inline header file (yuck).
2013-12-30 17:41:59 +01:00
Tycho Bickerstaff
d724241407
converted commneted paramater names to the unused macro
2013-12-22 13:46:55 +00:00
Tycho Bickerstaff
94ca07cfbf
Merge branch 'master' of github.com:mc-server/MCServer
2013-12-22 13:19:27 +00:00
Tiger Wang
f1142af455
Server now handles death messages
2013-12-26 14:55:19 +00:00
Mattes D
e0e01d0615
Merge pull request #461 from mc-server/repeaters
...
Repeaters, pressure plates, and others
2013-12-25 23:57:02 -08:00
STRWarrior
5eacf327b7
Fixed Parentheses.
2013-12-25 18:14:00 +01:00
STRWarrior
17a84111ce
You are now able to sweep mobs to your position using fishing rods.
2013-12-25 17:26:17 +01:00
Tiger Wang
40c2826a21
Braced up some code
2013-12-25 14:05:37 +00:00
Tiger Wang
508e505ace
Used IsGamemodeCreative() function
2013-12-24 23:47:04 +00:00
Tiger Wang
ae6cb01e56
Fixed comments in main.cpp and Player.cpp
2013-12-24 15:16:30 +00:00
Tiger Wang
89f87f66a5
Improved knockback animation
...
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
2013-12-24 15:02:35 +00:00
Alexander Harkness
af6389ea7a
finally removed them all?
2013-12-24 10:30:36 +00:00
Tiger Wang
1014c737a4
Improved player fall particle positions
2013-12-23 21:18:01 +00:00
Tiger Wang
9c796bf6b4
Clarified some code in Player.cpp
2013-12-23 09:51:41 +00:00
Tiger Wang
d8221854d2
Fixed a comment in Entity.cpp
2013-12-23 09:41:45 +00:00
Tiger Wang
b02a81678c
Implemented knockback and critical hit
2013-12-22 20:04:17 +00:00
Tiger Wang
945ba36d1b
Implemented fall particles
2013-12-22 20:03:09 +00:00
STRWarrior
8d51c22b36
Fishing underground is slower and fishing while raining is faster.
2013-12-22 15:22:50 +01:00
STRWarrior
caccf72b46
Fixed compiler warnings.
2013-12-22 14:54:07 +01:00
STRWarrior
7a299f1ba6
Fishing now uses a countdown instead of a random number each tick.
2013-12-22 14:48:22 +01:00
STRWarrior
bd6574230a
Floater now dissapears when the player doesn't have an fishing rod equipped.
2013-12-21 17:31:05 +01:00
Tycho Bickerstaff
9f41761e8e
Root is now warnings clean
2013-12-21 15:38:37 +00:00
Tycho Bickerstaff
38f808ac3d
ChunkSender is now warnings clean
2013-12-21 15:00:31 +00:00
Tycho Bickerstaff
779aca6051
Merge branch 'master' into cmake
2013-12-21 13:32:40 +00:00
STRWarrior
128de10a2f
You could now only get fish from non-source blocks. Fixed it.
2013-12-21 14:11:21 +01:00
STRWarrior
8efde94e4e
Fixed bug where you could get fish from non-source blocks.
2013-12-21 14:07:32 +01:00
STRWarrior
af98fc6170
Fixed bug where the floater could pop in the water while you could already get a fish.
2013-12-20 18:34:08 +01:00
madmaxoft
8570d08eb4
More reordering fixes.
2013-12-20 17:11:51 +01:00
madmaxoft
d6de11da07
Sorted a few constructors to remove warnings.
2013-12-20 16:39:20 +01:00
Tycho Bickerstaff
32e6be002d
Merge branch 'master' into cmake
2013-12-20 15:33:04 +00:00
madmaxoft
8610d45ef1
Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).
2013-12-20 16:01:34 +01:00
Mattes D
39251bccd3
Merge pull request #450 from mc-server/redstonefixes
...
Multiple fixes
2013-12-19 13:58:49 -08:00
STRWarrior
a1ce0a6d73
Fixed #include in Floater.cpp.
2013-12-19 22:44:10 +01:00
STRWarrior
32d117a498
The floater now actualy dives under water.
2013-12-19 22:18:05 +01:00
Tiger Wang
03a8dfc4a8
Fixed PlayerAbilities and creative
2013-12-19 20:53:47 +00:00
STRWarrior
3d70d7198d
Implented IsFishing, SetIsFishing and GetFloaterID().
2013-12-19 17:33:21 +01:00
STRWarrior
86bfed735e
Added cFloater class.
2013-12-19 17:32:06 +01:00
Tycho Bickerstaff
0e6107bfdd
Merge branch 'master' into cmake
2013-12-19 16:16:35 +00:00
Tycho Bickerstaff
e627f2f98c
Merge branch 'master' into cmake
2013-12-18 19:06:11 +00:00
STRWarrior
199123d4f2
Boats drop a boat pickup when destroyed by hand. You can now actualy use boats.
2013-12-16 18:03:39 +01:00
STRWarrior
459d636948
Added HandleSpeedFromAttachee so an entity can override the function.
2013-12-16 18:02:33 +01: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
STRWarrior
007d668c1b
Server saves if a player is flying.
2013-12-15 21:25:13 +01:00
STRWarrior
9b8112dbc2
Merge pull request #437 from mc-server/ShootTo_function
...
Shoot to function
2013-12-15 12:05:18 -08:00
STRWarrior
5e75408b3b
Renamed ShootTo function to ForceSetSpeed.
2013-12-15 20:19:58 +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
madmaxoft
368b7a40b5
Fixed indentation.
2013-12-15 15:58:03 +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
9c2089dc5a
cPlayer is using the broadcast functions.
2013-12-15 10:52:54 +01:00
STRWarrior
8c04afe18a
Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h.
2013-12-14 22:34:49 +01:00
STRWarrior
71250b275f
Added E_EFFECT_<Effect>
2013-12-14 22:23:20 +01:00
STRWarrior
37069288d5
Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.
2013-12-14 18:03:00 +01:00
STRWarrior
78aca16d58
Exported the cTNTEntity
2013-12-14 16:28:17 +01:00
Mattes D
8a6c28b8f0
Merge pull request #423 from mc-server/redstoneimprovements
...
Redstone and configuration improvements
2013-12-14 06:41:00 -08:00
STRWarrior
483ef89503
Fixed not getting XP from mobs.
2013-12-14 12:50:08 +01:00
Tiger Wang
4622d4ac09
Improved player permissions logging
2013-12-14 02:54:08 +00:00
Tiger Wang
0aeece7fda
Fixes to redstone wire and torches
...
+ Wires now power blocks around the block beneath
* Torches no longer power off if it is on a linked powered block
* Enhanced code, split functions, etc.
2013-12-14 02:40:54 +00:00
Tiger Wang
4e11095441
Groups.ini and Users.ini are now generated
2013-12-14 02:02:26 +00:00
STRWarrior
39443c63ad
Using "a_ClosestPlayer != NULL" in cExpOrb.
2013-12-13 15:32:25 +01:00
STRWarrior
bba51755d4
ExpOrbs now move.
2013-12-11 16:14:08 +01:00
Tycho Bickerstaff
822a92a9b6
moved entities to globs
2013-12-10 23:09:16 +00:00
Tycho Bickerstaff
dd633d5a94
Merge branch 'master' into cmake
2013-12-10 23:01:35 +00:00
Tycho Bickerstaff
6cdc990884
more cmake
2013-12-10 21:39:20 +00:00
madmaxoft
3712ee7b11
Fixed angle normalization typo.
2013-12-08 18:54:04 +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
6785bb7c16
Fixed normalizing large angles.
2013-12-08 13:08:56 +01:00
madmaxoft
044fd237b6
Moved bindings-related to a Bindings subfolder.
...
Ref.: #407
2013-12-08 12:17:54 +01: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
ec226e00ab
Puking now uses GetEyeHeight()
2013-12-06 20:41:58 +00:00
Tiger Wang
289e8cba21
Fixed eating using wrong animation
2013-12-06 20:28:27 +00:00
Tiger Wang
44d5fd1e87
Tools make a sound when breaking, fixes #266
2013-12-06 19:59:14 +00:00
madmaxoft
2113ca3844
Fixed VC2008 compilation, normalized include paths.
2013-11-27 09:17:25 +01:00
Alexander Harkness
3b790bbf67
Fixed some of tiger's derpyness.
2013-11-27 07:27:19 +00:00
Tiger Wang
2ef9cf700d
Hopefully fixed last of the Linux compile errors
2013-11-26 22:50:33 +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
Tiger Wang
e3db69c4ae
Attempt to fix compilation
2013-11-24 18:44:22 +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
