Comparing changes
Open a pull request
- +1 −1 .gitmodules
- +1 −0 CONTRIBUTORS
- +11 −0 MCServer/Plugins/APIDump/APIDesc.lua
- +3 −2 MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua
- +1 −1 MCServer/Plugins/Core
- +17 −1 MCServer/Plugins/Debuggers/Debuggers.lua
- +1 −0 MCServer/crafting.txt
- +9 −3 MCServer/items.ini
- +603 −0 MCServer/lang/items_de.ini
- +0 −209 Nightbuild2008.cmd
- +4 −4 README.md
- +1 −0 Tools/.gitignore
- +0 −4 Tools/BiomeVisualiser/.gitignore
- +0 −338 Tools/BiomeVisualiser/BiomeCache.cpp
- +0 −96 Tools/BiomeVisualiser/BiomeCache.h
- +0 −114 Tools/BiomeVisualiser/BiomeColors.cpp
- +0 −15 Tools/BiomeVisualiser/BiomeColors.h
- +0 −119 Tools/BiomeVisualiser/BiomeRenderer.cpp
- +0 −55 Tools/BiomeVisualiser/BiomeRenderer.h
- +0 −37 Tools/BiomeVisualiser/BiomeSource.h
- +0 −247 Tools/BiomeVisualiser/BiomeViewWnd.cpp
- +0 −69 Tools/BiomeVisualiser/BiomeViewWnd.h
- +0 −52 Tools/BiomeVisualiser/BiomeVisualiser.cpp
- +0 −31 Tools/BiomeVisualiser/BiomeVisualiser.h
- +0 −23 Tools/BiomeVisualiser/BiomeVisualiser.sln
- +0 −527 Tools/BiomeVisualiser/BiomeVisualiser.vcproj
- +0 −42 Tools/BiomeVisualiser/GeneratorBiomeSource.h
- +0 −120 Tools/BiomeVisualiser/Pixmap.cpp
- +0 −39 Tools/BiomeVisualiser/Pixmap.h
- +0 −40 Tools/BiomeVisualiser/Timer.h
- +0 −143 Tools/BiomeVisualiser/WndProcThunk.h
- +0 −70 Tools/BiomeVisualiser/profile_run.cmd
- +2 −0 Tools/QtBiomeVisualiser/.gitignore
- +427 −0 Tools/QtBiomeVisualiser/BiomeView.cpp
- +100 −0 Tools/QtBiomeVisualiser/BiomeView.h
- +126 −0 Tools/QtBiomeVisualiser/ChunkCache.cpp
- +72 −0 Tools/QtBiomeVisualiser/ChunkCache.h
- +29 −0 Tools/QtBiomeVisualiser/ChunkLoader.cpp
- +45 −0 Tools/QtBiomeVisualiser/ChunkLoader.h
- +421 −0 Tools/QtBiomeVisualiser/ChunkSource.cpp
- +107 −0 Tools/QtBiomeVisualiser/ChunkSource.h
- +159 −0 Tools/QtBiomeVisualiser/GeneratorSetup.cpp
- +64 −0 Tools/QtBiomeVisualiser/GeneratorSetup.h
- +386 −0 Tools/QtBiomeVisualiser/Globals.h
- +310 −0 Tools/QtBiomeVisualiser/MainWindow.cpp
- +96 −0 Tools/QtBiomeVisualiser/MainWindow.h
- +20 −0 Tools/QtBiomeVisualiser/QtBiomeVisualiser.cpp
- +100 −0 Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
- +35 −0 Tools/QtBiomeVisualiser/QtChunk.cpp
- +40 −0 Tools/QtBiomeVisualiser/QtChunk.h
- +1 −1 lib/SQLiteCpp
- +1 −1 lib/polarssl
- +2 −0 src/Bindings/CMakeLists.txt
- +0 −5 src/Bindings/DeprecatedBindings.cpp
- +0 −1 src/Bindings/LuaChunkStay.cpp
- +1 −0 src/Bindings/LuaChunkStay.h
- +0 −1 src/Bindings/LuaState.h
- +0 −1 src/Bindings/LuaWindow.cpp
- +0 −2 src/Bindings/ManualBindings.cpp
- +8 −6 src/Bindings/Plugin.h
- +3 −1 src/Bindings/PluginLua.cpp
- +0 −2 src/Bindings/PluginManager.cpp
- +3 −3 src/Bindings/PluginManager.h
- +0 −1 src/Bindings/WebPlugin.cpp
- +0 −1 src/Bindings/WebPlugin.h
- +2 −3 src/BlockEntities/BlockEntity.h
- +6 −7 src/BlockEntities/BlockEntityWithItems.h
- +0 −1 src/BlockEntities/ChestEntity.cpp
- +0 −2 src/BlockEntities/ChestEntity.h
- +2 −4 src/BlockEntities/CommandBlockEntity.cpp
- +4 −3 src/BlockEntities/CommandBlockEntity.h
- +2 −5 src/BlockEntities/DispenserEntity.cpp
- +0 −1 src/BlockEntities/DropSpenserEntity.cpp
- +0 −1 src/BlockEntities/DropSpenserEntity.h
- +0 −2 src/BlockEntities/DropperEntity.cpp
- +2 −2 src/BlockEntities/EnderChestEntity.cpp
- +1 −2 src/BlockEntities/EnderChestEntity.h
- +0 −1 src/BlockEntities/FlowerPotEntity.cpp
- +1 −1 src/BlockEntities/FlowerPotEntity.h
- +0 −2 src/BlockEntities/FurnaceEntity.cpp
- +0 −1 src/BlockEntities/FurnaceEntity.h
- +0 −3 src/BlockEntities/HopperEntity.cpp
- +2 −2 src/BlockEntities/JukeboxEntity.cpp
- +0 −1 src/BlockEntities/JukeboxEntity.h
- +0 −1 src/BlockEntities/MobHeadEntity.cpp
- +1 −1 src/BlockEntities/MobHeadEntity.h
- +1 −1 src/BlockEntities/NoteEntity.cpp
- +1 −1 src/BlockEntities/RedstonePoweredEntity.h
- +2 −2 src/BlockEntities/SignEntity.cpp
- +28 −28 src/BlockID.cpp
- +39 −1 src/BlockID.h
- +68 −43 src/BlockInfo.cpp
- +28 −3 src/BlockInfo.h
- +9 −0 src/Blocks/BlockBed.cpp
- +5 −3 src/Blocks/BlockBed.h
- +4 −4 src/Blocks/BlockBigFlower.h
- +2 −2 src/Blocks/BlockDirt.h
- +0 −1 src/Blocks/BlockDoor.cpp
- +44 −1 src/Blocks/BlockDoor.h
- +1 −1 src/Blocks/BlockFenceGate.h
- +45 −41 src/Blocks/BlockHandler.cpp
- +5 −5 src/Blocks/BlockHandler.h
- +2 −2 src/Blocks/BlockMobHead.h
- +1 −0 src/Blocks/BlockPiston.cpp
- +2 −1 src/Blocks/BlockPiston.h
- +1 −1 src/Blocks/BlockPortal.h
- +3 −3 src/Blocks/BlockPumpkin.h
- +1 −1 src/Blocks/BlockRedstoneRepeater.h
- +30 −0 src/Blocks/BlockSeaLantern.h
- +4 −1 src/Blocks/BlockSlab.h
- +1 −1 src/Blocks/BlockVine.h
- +133 −0 src/Blocks/ChunkInterface.cpp
- +15 −51 src/Blocks/ChunkInterface.h
- +91 −0 src/Blocks/GetHandlerCompileTimeTemplate.h
- +4 −3 src/Blocks/WorldInterface.h
- +47 −1 src/ByteBuffer.cpp
- +3 −0 src/ByteBuffer.h
- +9 −5 src/Chunk.cpp
- +11 −13 src/Chunk.h
- +3 −3 src/ChunkMap.cpp
- +1 −1 src/ChunkMap.h
- +1 −0 src/ChunkSender.cpp
- +115 −51 src/ClientHandle.cpp
- +84 −68 src/ClientHandle.h
- +178 −0 src/CompositeChat.cpp
- +6 −0 src/CompositeChat.h
- +2 −0 src/Defines.h
- +0 −1 src/Entities/ArrowEntity.cpp
- +2 −0 src/Entities/Boat.cpp
- +1 −1 src/Entities/EnderCrystal.cpp
- +41 −32 src/Entities/Entity.cpp
- +7 −1 src/Entities/Entity.h
- +89 −2 src/Entities/EntityEffect.cpp
- +8 −0 src/Entities/EntityEffect.h
- +18 −1 src/Entities/ExpBottleEntity.cpp
- +5 −0 src/Entities/ExpBottleEntity.h
- +23 −2 src/Entities/HangingEntity.cpp
- +1 −1 src/Entities/HangingEntity.h
- +3 −1 src/Entities/ItemFrame.cpp
- +47 −44 src/Entities/Minecart.cpp
- +2 −1 src/Entities/Minecart.h
- +6 −3 src/Entities/Pawn.cpp
- +76 −18 src/Entities/Player.cpp
- +18 −0 src/Entities/Player.h
- +5 −5 src/Entities/ThrownEggEntity.cpp
- +2 −2 src/Entities/ThrownSnowballEntity.cpp
- +103 −80 src/Generating/BioGen.cpp
- +1 −1 src/Generating/Caves.cpp
- +1 −0 src/Generating/FinishGen.cpp
- +2 −2 src/Generating/Noise3DGenerator.cpp
- +31 −1 src/Globals.h
- +1 −0 src/Items/ItemBucket.h
- +16 −1 src/Items/ItemDoor.h
- +5 −2 src/Items/ItemFood.h
- +1 −0 src/Items/ItemGoldenApple.h
- +59 −28 src/Items/ItemHandler.cpp
- +0 −1 src/Items/ItemHoe.h
- +6 −2 src/Items/ItemMilk.h
- +53 −0 src/Items/ItemMushroomSoup.h
- +6 −2 src/Items/ItemPotion.h
- +28 −28 src/Items/ItemSpawnEgg.h
- +10 −11 src/LineBlockTracer.cpp
- +4 −4 src/Map.cpp
- +50 −50 src/MobSpawner.cpp
- +6 −6 src/MobSpawner.h
- +1 −1 src/Mobs/AggressiveMonster.cpp
- +1 −1 src/Mobs/AggressiveMonster.h
- +117 −59 src/Mobs/Monster.cpp
- +38 −43 src/Mobs/Monster.h
- +41 −0 src/Mobs/MonsterTypes.h
- +1 −1 src/Mobs/Mooshroom.cpp
- +1 −1 src/Mobs/PassiveAggressiveMonster.cpp
- +1 −1 src/Mobs/PassiveAggressiveMonster.h
- +1 −1 src/Mobs/PassiveMonster.cpp
- +1 −1 src/Mobs/PassiveMonster.h
- +3 −1 src/Mobs/Sheep.cpp
- +3 −3 src/Mobs/Villager.cpp
- +1 −1 src/Mobs/Villager.h
- +7 −7 src/OSSupport/File.cpp
- +1 −1 src/OSSupport/IsThread.h
- +2 −0 src/Protocol/CMakeLists.txt
- +77 −2 src/Protocol/ChunkDataSerializer.cpp
- +4 −2 src/Protocol/ChunkDataSerializer.h
- +75 −70 src/Protocol/Protocol.h
- +77 −33 src/Protocol/Protocol125.cpp
- +74 −70 src/Protocol/Protocol125.h
- +9 −2 src/Protocol/Protocol132.cpp
- +0 −6 src/Protocol/Protocol14x.cpp
- +2 −2 src/Protocol/Protocol15x.cpp
- +1 −1 src/Protocol/Protocol15x.h
- +131 −214 src/Protocol/Protocol17x.cpp
- +83 −80 src/Protocol/Protocol17x.h
- +3,270 −0 src/Protocol/Protocol18x.cpp
- +337 −0 src/Protocol/Protocol18x.h
- +73 −10 src/Protocol/ProtocolRecognizer.cpp
- +76 −71 src/Protocol/ProtocolRecognizer.h
- +2 −2 src/Root.cpp
- +7 −0 src/Server.cpp
- +8 −0 src/Server.h
- +0 −1 src/Simulator/CMakeLists.txt
- +11 −0 src/Simulator/FireSimulator.cpp
- +1 −1 src/Simulator/FireSimulator.h
- +1 −0 src/Simulator/FloodyFluidSimulator.cpp
- +4 −3 src/Simulator/FluidSimulator.h
- +15 −2,207 src/Simulator/IncrementalRedstoneSimulator.cpp
- +3 −310 src/Simulator/IncrementalRedstoneSimulator.h
- +2,588 −0 src/Simulator/IncrementalRedstoneSimulator.inc
- +2 −2 src/Simulator/NoopRedstoneSimulator.h
- +0 −19 src/Simulator/RedstoneSimulator.cpp
- +14 −3 src/Simulator/RedstoneSimulator.h
- +1 −0 src/Simulator/SandSimulator.cpp
- +5 −4 src/Simulator/SandSimulator.h
- +4 −41 src/Simulator/Simulator.cpp
- +6 −12 src/Simulator/Simulator.h
- +45 −0 src/Simulator/Simulator.inc
- +1 −1 src/Simulator/SimulatorManager.cpp
- +2 −2 src/Simulator/SimulatorManager.h
- +28 −0 src/StringUtils.cpp
- +5 −0 src/StringUtils.h
- +2 −2 src/Tracer.cpp
- +28 −0 src/UI/Window.cpp
- +2 −1 src/UI/Window.h
- +57 −11 src/UI/WindowOwner.h
- +105 −21 src/VoronoiMap.cpp
- +37 −7 src/VoronoiMap.h
- +103 −16 src/World.cpp
- +40 −32 src/World.h
- +1 −1 src/WorldStorage/FastNBT.cpp
- +4 −4 src/WorldStorage/FastNBT.h
- +9 −9 src/WorldStorage/MapSerializer.cpp
- +2 −2 src/WorldStorage/MapSerializer.h
- +75 −45 src/WorldStorage/NBTChunkSerializer.cpp
- +2 −0 src/WorldStorage/NBTChunkSerializer.h
- +82 −14 src/WorldStorage/WSSAnvil.cpp
- +1 −0 tests/CMakeLists.txt
- +10 −0 tests/Redstone/CMakeLists.txt
- +164 −0 tests/Redstone/creatable.cpp
Showing you all comments on commits in this comparison.
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
Will this change world generation? |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
madmaxoft
Sep 16, 2014
Member
I hope not, I was careful to make the defaults work the same as before.
But it will allow me to make a better biome generator, I already have a working prototype that has some nice properties, but want to polish it up first.
|
I hope not, I was careful to make the defaults work the same as before. But it will allow me to make a better biome generator, I already have a working prototype that has some nice properties, but want to polish it up first. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
Howaner
Sep 17, 2014
Contributor
But the authenticator replaces the given uuid with the offline uuid, right?
- Authenticator.cpp:59
- ClientHandle.cpp:315
|
But the authenticator replaces the given uuid with the offline uuid, right?
|
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
madmaxoft
Sep 17, 2014
Member
Oh. You're right. But for some reason it did seem to work for me - the player even had the correct skin.
I'll fix the authenticator, then.
|
Oh. You're right. But for some reason it did seem to work for me - the player even had the correct skin. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
Howaner
Sep 17, 2014
Contributor
1.7.10 clients displays his own skin without any server operations. (It's not for other players or 1.8)
|
1.7.10 clients displays his own skin without any server operations. (It's not for other players or 1.8) |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
Howaner
Sep 17, 2014
Contributor
What if a player fakes this packet?
He could change his UUID, right?
|
What if a player fakes this packet? |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
madmaxoft
Sep 17, 2014
Member
That's an interesting attack vector. I wonder if the original server is vulnerable, too.
So we need a setting to explicitly allow this parsing, hmmmm.
|
That's an interesting attack vector. I wonder if the original server is vulnerable, too. So we need a setting to explicitly allow this parsing, hmmmm. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
I tested with 2 clients on the same server. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
md-5
Sep 18, 2014
Can I just double check you have some sort of toggle / IP whitelist for this? Wouldn't want users spoofing their details :p
md-5
commented on 8231770
Sep 18, 2014
|
Can I just double check you have some sort of toggle / IP whitelist for this? Wouldn't want users spoofing their details :p |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
md-5
Sep 18, 2014
Nevermind, seems you discussed it:
3406957#commitcomment-7819995
Ideally you have either a boolean configuration value, bungeecord: false, or an IP whitelist similar to what webservers do for X-Forwarded-For. Since BungeeCord requires offline mode and the server should be firewalled, a boolean is probably good enough.
md-5
commented on 8231770
Sep 18, 2014
|
Nevermind, seems you discussed it: Ideally you have either a boolean configuration value, bungeecord: false, or an IP whitelist similar to what webservers do for X-Forwarded-For. Since BungeeCord requires offline mode and the server should be firewalled, a boolean is probably good enough. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
tigerw
Sep 23, 2014
Member
Does a wolf's colour need to be an integer in the first place?
Also, whoops, I think I might have written this originally.
|
Does a wolf's colour need to be an integer in the first place? Also, whoops, I think I might have written this originally. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
We need a list of all the compatibility code we have :P |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
Error checking yey~ |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
madmaxoft
Sep 24, 2014
Member
I think the color follows the minecraft 16-item palette so even 4 bits should be enough.
|
I think the color follows the minecraft 16-item palette so even 4 bits should be enough. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
Builds failing, |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
Why?? This just caused me a whole file merge conflict. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
tigerw
Sep 25, 2014
Member
Haven't you realised by now? You're giving him a run for his money with regards to most knowledgeable developer, so he is subtly trying to make life hard for you.
So the redstone simulator isn't that complex, no? You figured out enough of it to fix a crash.
|
Haven't you realised by now? You're giving him a run for his money with regards to most knowledgeable developer, so he is subtly trying to make life hard for you. So the redstone simulator isn't that complex, no? You figured out enough of it to fix a crash. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
Howaner
Sep 25, 2014
Contributor
You broke the login :(
Now HandlePluginMessage() and ReadItem() need a change.
|
You broke the login :( |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
Actually without this change I cannot even ping the server. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
madmaxoft
Sep 25, 2014
Member
I just figured out there was a coord mismatch and this function seemed simple enough for me to fix it. I had a crash in here, so I needed to fix it, sorry @worktycho.
|
I just figured out there was a coord mismatch and this function seemed simple enough for me to fix it. I had a crash in here, so I needed to fix it, sorry @worktycho. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
@madmaxoft Its fine |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
*apostrophe |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
tigerw
Sep 25, 2014
Member
I can't think in binary and have no idea what this does, perchance a comment?
|
I can't think in binary and have no idea what this does, perchance a comment? |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
parabyte
commented on 6b260f0
Sep 25, 2014
|
nice please keep adding the comments ! |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
Can fail. Need to check the return value. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
madmaxoft
Sep 28, 2014
Member
We should check CompressedSize against PacketLen instead (to prevent Heartbleed-like errors)
|
We should check |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
Done. |

Will this change world generation?