Added dinnerbone property
This commit is contained in:
		
							parent
							
								
									ec1d4445e3
								
							
						
					
					
						commit
						adac982128
					
				
					 3 changed files with 9 additions and 3 deletions
				
			
		| 
						 | 
					@ -47,6 +47,7 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
 | 
				
			||||||
        registerType("skin", SkinDescriptor.class);
 | 
					        registerType("skin", SkinDescriptor.class);
 | 
				
			||||||
        registerType("name", Component.class);
 | 
					        registerType("name", Component.class);
 | 
				
			||||||
        registerType("look", false);
 | 
					        registerType("look", false);
 | 
				
			||||||
 | 
					        registerType("dinnerbone", false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // TODO: make all of these bukkit itemstack classes so api users wont have to add packetevents as a dependency
 | 
					        // TODO: make all of these bukkit itemstack classes so api users wont have to add packetevents as a dependency
 | 
				
			||||||
        registerType("helmet", ItemStack.class);
 | 
					        registerType("helmet", ItemStack.class);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -85,6 +85,7 @@ public class NpcTypeImpl implements NpcType {
 | 
				
			||||||
            allowedProperties.add(propertyRegistry.getByName("using_item"));
 | 
					            allowedProperties.add(propertyRegistry.getByName("using_item"));
 | 
				
			||||||
            allowedProperties.add(propertyRegistry.getByName("potion_color"));
 | 
					            allowedProperties.add(propertyRegistry.getByName("potion_color"));
 | 
				
			||||||
            allowedProperties.add(propertyRegistry.getByName("potion_ambient"));
 | 
					            allowedProperties.add(propertyRegistry.getByName("potion_ambient"));
 | 
				
			||||||
 | 
					            allowedProperties.add(propertyRegistry.getByName("dinnerbone"));
 | 
				
			||||||
            if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9))
 | 
					            if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9))
 | 
				
			||||||
                allowedProperties.add(propertyRegistry.getByName("glow"));
 | 
					                allowedProperties.add(propertyRegistry.getByName("glow"));
 | 
				
			||||||
            if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_14))
 | 
					            if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_14))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -187,9 +187,13 @@ public class V1_8PacketFactory implements PacketFactory {
 | 
				
			||||||
            add(data, metadataFactory.creeperState(properties.getProperty(propertyRegistry.getByName("creeper_state", CreeperState.class))));
 | 
					            add(data, metadataFactory.creeperState(properties.getProperty(propertyRegistry.getByName("creeper_state", CreeperState.class))));
 | 
				
			||||||
            add(data, metadataFactory.creeperCharged(properties.getProperty(propertyRegistry.getByName("creeper_charged", Boolean.class))));
 | 
					            add(data, metadataFactory.creeperCharged(properties.getProperty(propertyRegistry.getByName("creeper_charged", Boolean.class))));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (properties.hasProperty(propertyRegistry.getByName("name"))) {
 | 
					        if (properties.getProperty(propertyRegistry.getByName("dinnerbone", Boolean.class))) {
 | 
				
			||||||
            add(data, metadataFactory.name(PapiUtil.set(textSerializer, player, properties.getProperty(propertyRegistry.getByName("name", Component.class)))));
 | 
					            add(data, metadataFactory.name(Component.text("Dinnerbone")));
 | 
				
			||||||
            add(data, metadataFactory.nameShown());
 | 
					        } else {
 | 
				
			||||||
 | 
					            if (properties.hasProperty(propertyRegistry.getByName("name"))) {
 | 
				
			||||||
 | 
					                add(data, metadataFactory.name(PapiUtil.set(textSerializer, player, properties.getProperty(propertyRegistry.getByName("name", Component.class)))));
 | 
				
			||||||
 | 
					                add(data, metadataFactory.nameShown());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        return data;
 | 
					        return data;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue