Merge remote-tracking branch 'refs/remotes/origin/dedicated-rewrite' into dedicated-rewrite

src/client/gui/screens/crafting/PaneCraftingScreen.cpp

@@ -467,35 +467,34 @@ void PaneCraftingScreen::craftSelectedItem()
 		if (minecraft->isOnline()) {
 			WantCreatePacket packet(minecraft->player->entityId, resultItem.count, resultItem.getAuxValue(), resultItem.id);
 			minecraft->raknetInstance->send(packet);
-		} else {
-			// Remove all items required for the recipe and ...
-			for (unsigned int i = 0; i < currentItem->neededItems.size(); ++i) {
-				CItem::ReqItem& req = currentItem->neededItems[i];
-
-				// If the recipe allows any aux-value as ingredients, first deplete
-				// aux == 0 from inventory. Since I'm not sure if this always is
-				// correct, let's only do it for ingredient sandstone for now.
-				ItemInstance toRemove = req.item;
-
-				if (Tile::sandStone->id == req.item.id
-				&& Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
-					toRemove.setAuxValue(0);
-					toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
-					toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
-				}
-
-				if (toRemove.count > 0) {
-					minecraft->player->inventory->removeResource(toRemove);
-				}
-			}
-			// ... add the new one! (in this order, to fill empty slots better)
-			// if it doesn't fit, throw it on the ground!
-			if (!minecraft->player->inventory->add(&resultItem)) {
-				minecraft->player->drop(new ItemInstance(resultItem), false);
-			}
-
-			recheckRecipes();
 		}
+		// Remove all items required for the recipe and ...
+		for (unsigned int i = 0; i < currentItem->neededItems.size(); ++i) {
+			CItem::ReqItem& req = currentItem->neededItems[i];
+
+			// If the recipe allows any aux-value as ingredients, first deplete
+			// aux == 0 from inventory. Since I'm not sure if this always is
+			// correct, let's only do it for ingredient sandstone for now.
+			ItemInstance toRemove = req.item;
+
+			if (Tile::sandStone->id == req.item.id
+			&& Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
+				toRemove.setAuxValue(0);
+				toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
+				toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
+			}
+
+			if (toRemove.count > 0) {
+				minecraft->player->inventory->removeResource(toRemove);
+			}
+		}
+		// ... add the new one! (in this order, to fill empty slots better)
+		// if it doesn't fit, throw it on the ground!
+		if (!minecraft->player->inventory->add(&resultItem)) {
+			minecraft->player->drop(new ItemInstance(resultItem), false);
+		}
+
+		recheckRecipes();
 	}
 }
 

src/network/ClientSideNetworkHandler.cpp

@@ -1,6 +1,7 @@
 
 #include "ClientSideNetworkHandler.h"
 #include "client/Options.h"
+#include "network/packet/LoginStatusPacket.h"
 #include "packet/PacketInclude.h"
 #include "RakNetInstance.h"
 #include "../world/level/chunk/ChunkSource.h"
@@ -131,6 +132,12 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginSta
 		LOGI("Disconnect! Server is outdated!\n");
 #ifndef STANDALONE_SERVER
 		minecraft->setScreen(new DisconnectionScreen("Could not connect: Outdated server!"));
+#endif
+	}
+	if (packet->status == LoginStatus::Failed_TakenNickname) {
+		LOGI("Disconnect! Nickname is taken!\n");
+#ifndef STANDALONE_SERVER
+		minecraft->setScreen(new DisconnectionScreen("Could not connect: Nickname is taken!"));
 #endif
 	}
 }

src/network/ServerSideNetworkHandler.cpp

@@ -6,6 +6,7 @@
 #include "../world/Container.h"
 #include "../world/inventory/BaseContainerMenu.h"
 #include "network/packet/ContainerSetSlotPacket.h"
+#include "network/packet/LoginStatusPacket.h"
 #include "network/packet/RemoveBlockPacket.h"
 #include "network/packet/SendInventoryPacket.h"
 #include "network/packet/UpdateBlockPacket.h"
@@ -206,6 +207,14 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	if (oldClient || oldServer)
 		loginStatus = oldClient? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
 
+	for (int i = 0; i < level->players.size(); i++) {
+		ServerPlayer* player = (ServerPlayer*) level->players.at(i);
+		
+		if (player->name == packet->clientName.C_String()) {
+			loginStatus = packet->newProto ? LoginStatus::Failed_TakenNickname : LoginStatus::Failed_ClientOld;
+		}
+	}
+
 	RakNet::BitStream bitStream;
 	LoginStatusPacket(loginStatus).write(&bitStream);
 	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
@@ -654,14 +663,14 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, WantCrea
 			}
 		}
 
-		for (int i = 0; i < items.size(); i++) {
-			RemoveItemPacket removePacket(packet->playerId, items.at(i).count, items.at(i).getAuxValue(), items.at(i).id);
-			raknetInstance->send(source, removePacket);
+		// for (int i = 0; i < items.size(); i++) {
+		// 	RemoveItemPacket removePacket(packet->playerId, items.at(i).count, items.at(i).getAuxValue(), items.at(i).id);
+		// 	raknetInstance->send(source, removePacket);
 
-			p->inventory->removeResource(ItemInstance(items.at(i).id, items.at(i).count, items.at(i).getAuxValue()));
-		}
-		TakeItemPacket itemAdd(p->entityId, wantCreate.count, wantCreate.getAuxValue(), wantCreate.id);
-		raknetInstance->send(source, itemAdd);
+		// 	p->inventory->removeResource(ItemInstance(items.at(i).id, items.at(i).count, items.at(i).getAuxValue()));
+		// }
+		// TakeItemPacket itemAdd(p->entityId, wantCreate.count, wantCreate.getAuxValue(), wantCreate.id);
+		// raknetInstance->send(source, itemAdd);
 
 		p->inventory->add(new ItemInstance(wantCreate.id, wantCreate.count, wantCreate.getAuxValue()));
 	}

src/network/packet/LoginStatusPacket.h

@@ -3,10 +3,12 @@
 
 #include "../Packet.h"
 
+// wtf why not enum
 namespace LoginStatus {
 	const int Success = 0;
 	const int Failed_ClientOld = 1;
 	const int Failed_ServerOld = 2;
+	const int Failed_TakenNickname = 3;
 }
 
 class LoginStatusPacket : public Packet {