From 237ff18841a426558063d7a8edc4a37d94ae2421 Mon Sep 17 00:00:00 2001 From: Jascha Starke Date: Wed, 18 Jan 2012 15:06:22 +0100 Subject: [PATCH] Version-Number increase Fixed Copyright-Header (*shame*) Workaround for the Integer/Short conversation bug on bukkit upgrade --- plugin.yml | 2 +- .../minecraft/limitedcreative/Commands.java | 2 +- .../limitedcreative/Configuration.java | 2 +- .../minecraft/limitedcreative/Inventory.java | 2 +- .../limitedcreative/LimitedCreativeCore.java | 2 +- .../minecraft/limitedcreative/Listener.java | 2 +- .../minecraft/limitedcreative/PlayerCore.java | 2 +- .../limitedcreative/WorldGuardIntegration.java | 2 +- .../limitedcreative/serialize/Armor.java | 2 +- .../limitedcreative/serialize/Items.java | 4 ++-- .../limitedcreative/serialize/Storeable.java | 2 +- src/de/jaschastarke/minecraft/utils/Locale.java | 2 +- src/de/jaschastarke/minecraft/utils/Util.java | 17 +++++++++++++++++ 13 files changed, 30 insertions(+), 13 deletions(-) diff --git a/plugin.yml b/plugin.yml index 4abd447..3fe156f 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: LimitedCreative main: de.jaschastarke.minecraft.limitedcreative.LimitedCreativeCore -version: 0.1-beta +version: 0.2-beta softdepend: [WorldGuard] commands: limitedcreative: diff --git a/src/de/jaschastarke/minecraft/limitedcreative/Commands.java b/src/de/jaschastarke/minecraft/limitedcreative/Commands.java index dc95678..bcdf51b 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/Commands.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/Commands.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/Configuration.java b/src/de/jaschastarke/minecraft/limitedcreative/Configuration.java index 8463ee0..b315df5 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/Configuration.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/Configuration.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/Inventory.java b/src/de/jaschastarke/minecraft/limitedcreative/Inventory.java index 9b95b42..2ed1585 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/Inventory.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/Inventory.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/LimitedCreativeCore.java b/src/de/jaschastarke/minecraft/limitedcreative/LimitedCreativeCore.java index a5dfc0f..437d397 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/LimitedCreativeCore.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/LimitedCreativeCore.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/Listener.java b/src/de/jaschastarke/minecraft/limitedcreative/Listener.java index c3cc944..04ecd32 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/Listener.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/Listener.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/PlayerCore.java b/src/de/jaschastarke/minecraft/limitedcreative/PlayerCore.java index e323f41..f208b1c 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/PlayerCore.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/PlayerCore.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/WorldGuardIntegration.java b/src/de/jaschastarke/minecraft/limitedcreative/WorldGuardIntegration.java index 3e0fc01..98ed071 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/WorldGuardIntegration.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/WorldGuardIntegration.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/serialize/Armor.java b/src/de/jaschastarke/minecraft/limitedcreative/serialize/Armor.java index 2e7b974..a8276ed 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/serialize/Armor.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/serialize/Armor.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/limitedcreative/serialize/Items.java b/src/de/jaschastarke/minecraft/limitedcreative/serialize/Items.java index ab14e1e..03224be 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/serialize/Items.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/serialize/Items.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ public class Items implements Storeable { Map serialize = s.getValues(false); if (s.contains("enchantments")) serialize.put("enchantments", s.getConfigurationSection("enchantments").getValues(false)); - if (s.contains("damage")) + if (s.contains("damage") && LimitedCreativeCore.serializeFallBack) serialize.put("damage", new Integer(s.getInt("damage")).shortValue()); return ItemStack.deserialize(serialize); } diff --git a/src/de/jaschastarke/minecraft/limitedcreative/serialize/Storeable.java b/src/de/jaschastarke/minecraft/limitedcreative/serialize/Storeable.java index 990e002..50ef3b0 100644 --- a/src/de/jaschastarke/minecraft/limitedcreative/serialize/Storeable.java +++ b/src/de/jaschastarke/minecraft/limitedcreative/serialize/Storeable.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/utils/Locale.java b/src/de/jaschastarke/minecraft/utils/Locale.java index ab5a1e0..1780570 100644 --- a/src/de/jaschastarke/minecraft/utils/Locale.java +++ b/src/de/jaschastarke/minecraft/utils/Locale.java @@ -1,6 +1,6 @@ /* * Limited Creative - (Bukkit Plugin) - * Copyright (C) 2011 Essentials Team + * Copyright (C) 2012 jascha@ja-s.de * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/de/jaschastarke/minecraft/utils/Util.java b/src/de/jaschastarke/minecraft/utils/Util.java index fc866ce..7cb44c2 100644 --- a/src/de/jaschastarke/minecraft/utils/Util.java +++ b/src/de/jaschastarke/minecraft/utils/Util.java @@ -1,3 +1,20 @@ +/* + * Limited Creative - (Bukkit Plugin) + * Copyright (C) 2012 jascha@ja-s.de + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.jaschastarke.minecraft.utils; import java.io.File;